| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| | |
Conflicts:
tools/macdeployqt/shared/shared.cpp
|
| |
| |
| |
| |
| |
| |
| |
| | |
responses to POST might be cacheable, but are not cacheable by default;
responses to PUT or DELETE are never cacheable.
Reviewed-by: Thiago Macieira
Task-number: 252281
|
|\ \
| |/
| |
| |
| | |
Conflicts:
tests/auto/qgraphicsview/tst_qgraphicsview.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
There's no need for using QByteArrayMatcher for one single character,
so avoid the overhead.
Also validate the message header a bit more: we require the status
line to start with "HTTP/n.m " where n and m are positive integers
less than 10.
Task-number: 248838
Reviewed-by: Markus Goetz
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
proper HTTP reply.
If the server's reply doesn't start with "HTTP/", then the reply is
not valid. This could happen if we connected via HTTP to an HTTPS
server. It could also happen with an Icecast server (reply ICY/x.y).
Task-number: 248838
Reviewed-by: Markus Goetz
|
| |
| |
| |
| |
| | |
Reviewed-by: Peter Hartmann
Reviewed-by: Thiago Macieira
|
| |
| |
| |
| |
| | |
Reviewed-by: Peter Hartmann
Reviewed-by: Thiago Macieira
|
| |
| |
| |
| |
| | |
Reviewed-by: Thiago Macieira
Reviewed-by: Peter Hartmann
|
| |
| |
| |
| |
| | |
Reviewed-by: Peter Hartmann
Reviewed-by: Thiago Macieira
|
| |
| |
| |
| | |
Reviewed-by: Thiago Macieira
|
| | |
|
| |
| |
| |
| | |
Reviewed-by: Kavindra
|
|\ \
| |/ |
|
| |
| |
| |
| |
| | |
Task-number: 236925
Reviewed-by: Tor Arne Vestbø
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
src/gui/painting/qbackingstore.cpp
src/gui/painting/qwindowsurface_raster.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
original patch by Benjamin Meyer.
Handle multiple cookies split by new lines in a cleaner way.
Parsing the combined string was error prone. Splitting them and
sending each line through our header parser is more robust, and has
more obvious code paths.
Tested by logging into wordpress.com, facebook.com etc.
Reviewed-by: Thiago
Task-number: 251959
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
OpenBSD's OpenSSL libraries are linked in a bizarre way: libssl.so
doesn't link to libcrypto.so, even though it depends on it. I don't
claim to understand why, but they do it. So make sure we export its
symbols for libssl to see and we load libcrypto first.
Task-number: 252042
Patch by: Marc Espie <espie@openbsd.org>
Reviewed-by: Peter Hartmann
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If you write:
QNetworkProxy proxy;
proxy.setType(QNetworkProxy::HttpProxy);
Then now QNetworkProxy will set the capabilities to the default value
for the new proxy type. Previously, it wouldn't do that: default
values were set only for the type passed in the constructor.
Reviewed-by: Peter Hartmann
|
| |
| |
| |
| |
| |
| | |
name resolution
Task-number: 252761
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
src/gui/kernel/qcocoaview_mac_p.h
src/gui/widgets/qmainwindow.cpp
|
| |
| |
| |
| |
| |
| |
| |
| | |
In QNetworkDiskCache::prepare() When QTemporaryFile::open fails,
delete the cache item and return 0 rather then returning a closed
device. And a spelling mistake in a qWarning()
Reviewed-by: Peter Hartmann
|
| |
| |
| |
| |
| | |
Task-number: 252298
Reviewed-by: Peter Hartmann
|
| |
| |
| |
| |
| |
| |
| |
| | |
the domain attribute in cookies must always contain one embedded dot,
according to RFC 2109 section 4.3.2
Reviewed-by: Thiago
Task-number: 251467
|
| |
| |
| |
| |
| |
| |
| | |
When QT_LOCALSOCKET_TCP is defined we cannot call setEnabled on the
socket notifier.
Reviewed-by: ossi
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
this makes it much less arcane and buggy, specifically it resolves the
internal thread-unsafety.
Reviewed-by: thiago
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/gui/itemviews/qabstractitemview.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
According to the (old) cookie RFC 2109, the domain attribute must
always contain a leading dot. Some servers do not have that, but all
browsers accept those cookies anyway, so we should do that as well.
Reviewed-by: Olivier
Reviewed-by: Denis
Task-number: 228974
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| | |
Don't setfault when setting 0 for the network cache such as when you
want to disable it.
Reviewed-by: Peter Hartmann
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This fixes the "QAbstractSocket::connectToHost() called when already
connecting/connected to <hostname>". The issue was that we were trying
to call connect on a socket that was in a Closing state. We have to
wait for the disconnected signal before we try to connect again.
Reviewed-by: Prasanth
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts (version number change in 4.5):
src/corelib/global/qglobal.h
src/qbase.pri
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
|
| |
| |
| |
| | |
Reviewed-by: thiago
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
about the only error case for a PeekNamedPipe() which does not actually
want to read anything is some kind of disconnect. so ignore the error
code and just handle the error as a close.
Task-number: 247144
Reviewed-by: thiago
|
|\ \
| |/
| |
| |
| | |
Conflicts:
tests/auto/qpainterpath/tst_qpainterpath.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QProcessPrivate and QNativeSocketEnginePrivate were reporting a wrong
number of bytes available on 64-bit machines, due to use of size_t in
ioctl. That was required by Irix, which we dropped support for, so we
can also drop size_t
Reviewed-by: Thiago
Task-number: 249537
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Right now, we print this warning if connectToHost() is called when
we're in ConnectingState (waiting for remote to SYN,ACK) or in
ConnectedState. This also means connectToHost() allows interruption of
the HostLookupState cleanly (I think).
But if you called connectToHost() right after disconnectFromHost() and
there were data to write, the connectToHost() could discard the
pending outgoing data and reconnect. Or not, depending on whether the
DNS resolution ended first. In other words, race condition.
Reviewed-by: Peter Hartmann
|
| |
| |
| |
| |
| |
| |
| |
| | |
emit disconnected() if we were in ConnectedState or in ClosingState
before
Reviewed-by: Thiago
Task-number: 250976
|
| |
| |
| |
| |
| |
| |
| |
| | |
emit disconnected() if we were in ConnectedState or in ClosingState
before
Reviewed-by: Thiago
Task-number: 250976
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This regression probably happened because of the fix to task 244485
(see 8d500381), which made QFile follow a rename. This means that
QTemporaryFile removes its target when it is deleted.
This fixes a number of caching autotests that are failing.
Reviewed-by: Markus Goetz
BT: yes
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Using #ifndef QT_NO_OPENSSL without first #include'ing something will
never work. Which means we always include qsslsocket.h. The problem
is: if OpenSSL isn't enabled, then that file is a no-op and we never
include qabstractsocket.h.
Reviewed-by: Markus Goetz
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/painting/qtransform.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When the connection is established, the socket notifier is deleted,
but not the connection timer, so the opened connection will be closed
after 30 seconds.
Task-number: none
Reviewed-by: Andreas
Reviewed-by: Thiago
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The compile under OS-X was failing due to unfound symbols.
Given that the implementation of these functions is not in
the header file, they should not have inline keywords.
Removing the inline keywords allowed compilation to succeed.
Reviewed-by: Rhys Weatherley
|
| |
| |
| |
| |
| |
| |
| | |
QT_BEGIN_NAMESPACE is not defined until qglobal.h is included,
but some of the QtNetwork headers were listing it before.
Reviewed-by: Ian Walters
|
| |
| |
| |
| | |
RevBy: Thiago
|
| |
| |
| |
| | |
(cherry picked from commit fd9b788bd6a99630b06cffee4c9fa9f4c06b0ef1)
|