| Commit message (Collapse) | Author | Age | Files | Lines |
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
compilation breakage introduced in 6c1d7e57.
The fix in fc7a43cce did fix the failure, but created another one
because qhostinfo_win.cpp also had a copy of qt_sockaddr_in6
Reviewed-by: Jason McDonald
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/corelib/kernel/qsharedmemory_unix.cpp
|
| |
| |
| |
| |
| |
| |
| | |
On Windows, QT_NO_IPV6 isn't defined, but the necessary includes were
missing. So #include winsock2.h and also use our own structures.
Reviewed-By: Trust Me
|
| |
| |
| |
| |
| | |
Task-number: 254333
Reviewed-by: Andy Shaw <qt-info@nokia.com>
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This case it was possible to fix by using a union of the types when we
actually declare the variable.
Besides, this avoids a bunch of #ifdef for IPv6 functionality.
Reviewed-By: Oswald Buddenhagen
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| | |
Usually, "the the" is not proper English
Reviewed-By: Thiago Macieira
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When expiring cache files use a QMultiMap, when using a QMap not all
files are put into the map because often many files (downloaded or
updated at the same time) will have the same creation QDateTime and
so only one will go into the QMap who's key is QDateTime.
Reviewed-By: Thiago Macieira
Reviewed-By: Peter Hartmann
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
src/corelib/kernel/qobject.cpp
src/corelib/kernel/qobject_p.h
src/network/access/qhttpnetworkconnection.cpp
|
| |
| |
| |
| |
| |
| |
| | |
return error upon receiving an unknown authentication method (e.g.
WSSE); before we were just silently returning.
Reviewed-by: Thiago Macieira
|
|\ \
| |/
| |
| |
| | |
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
|