summaryrefslogtreecommitdiffstats
path: root/src/network
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5'Thiago Macieira2009-05-231-15/+0
|\
| * Fix another compilation breakage introduced by the fix to theThiago Macieira2009-05-231-15/+0
| | | | | | | | | | | | | | | | | | 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
* | Merge branch '4.5'Thiago Macieira2009-05-227-49/+40
|\ \ | |/ | | | | | | Conflicts: src/corelib/kernel/qsharedmemory_unix.cpp
| * Fix compilation breakage on Windows caused by 6c1d7e57.Thiago Macieira2009-05-223-41/+32
| | | | | | | | | | | | | | 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
| * Fixed compilation with -qtnamespaceMarkus Goetz2009-05-224-8/+8
| | | | | | | | | | Task-number: 254333 Reviewed-by: Andy Shaw <qt-info@nokia.com>
* | Merge branch '4.5'Thiago Macieira2009-05-222-41/+29
|\ \ | |/
| * Fixed strict aliasing breaks with sockaddr_XXX structs.Thiago Macieira2009-05-222-41/+29
| | | | | | | | | | | | | | | | | | 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
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-194-6/+6
|\ \ | |/
| * Fix some typos in the documentation.Frederik Schwarzer2009-05-183-3/+3
| | | | | | | | | | | | Usually, "the the" is not proper English Reviewed-By: Thiago Macieira
| * Fix QNetworkDiskCache to expire the oldest files first.Benjamin C Meyer2009-05-181-3/+3
| | | | | | | | | | | | | | | | | | | | 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
* | Fixed typo.jasplin2009-05-191-1/+1
| | | | | | | | Reviewed-by: TrustMe
* | Fix compilation after mergeOlivier Goffart2009-05-181-0/+1
| |
* | Merge commit 'origin/4.5'Olivier Goffart2009-05-181-19/+27
|\ \ | |/ | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp src/corelib/kernel/qobject_p.h src/network/access/qhttpnetworkconnection.cpp
| * HTTP authentication: return error if authentication cannot be handledPeter Hartmann2009-05-151-5/+15
| | | | | | | | | | | | | | return error upon receiving an unknown authentication method (e.g. WSSE); before we were just silently returning. Reviewed-by: Thiago Macieira
* | Merge branch '4.5'Thiago Macieira2009-05-141-12/+30
|\ \ | |/ | | | | | | Conflicts: tools/macdeployqt/shared/shared.cpp
| * HTTP backend / network cache: only cache responses to GET by defaultPeter Hartmann2009-05-131-12/+30
| | | | | | | | | | | | | | | | 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
* | Merge branch '4.5'Thiago Macieira2009-05-133-22/+55
|\ \ | |/ | | | | | | Conflicts: tests/auto/qgraphicsview/tst_qgraphicsview.cpp
| * Improve the HTTP status line parsing and catch more errors.Thiago Macieira2009-05-132-23/+37
| | | | | | | | | | | | | | | | | | | | | | | | 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
| * Fix handling of garbage data sent by the HTTP server instead of aThiago Macieira2009-05-132-3/+22
| | | | | | | | | | | | | | | | | | | | | | 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
* | QNAM: Upload architecture change: Changed all QNAM backendsMarkus Goetz2009-05-138-371/+198
| | | | | | | | | | Reviewed-by: Peter Hartmann Reviewed-by: Thiago Macieira
* | QNAM: ContentReSendErrorMarkus Goetz2009-05-132-0/+5
| | | | | | | | | | Reviewed-by: Peter Hartmann Reviewed-by: Thiago Macieira
* | QNAM: Upload architecture change: Backend and QNetworkReplyImpl changesMarkus Goetz2009-05-135-134/+188
| | | | | | | | | | Reviewed-by: Thiago Macieira Reviewed-by: Peter Hartmann
* | QNAM: Upload architecture change: HTTP implementationMarkus Goetz2009-05-136-126/+144
| | | | | | | | | | Reviewed-by: Peter Hartmann Reviewed-by: Thiago Macieira
* | QNAM: Added DoNotBufferUploadDataAttributeMarkus Goetz2009-05-132-0/+8
| | | | | | | | Reviewed-by: Thiago Macieira
* | QSsl: Renamed testConnection to startHandshakeMarkus Goetz2009-05-122-7/+7
| |
* | Small documentation fix for QSslSocketMarkus Goetz2009-05-121-2/+2
| | | | | | | | Reviewed-by: Kavindra
* | Merge branch '4.5'Thiago Macieira2009-05-111-0/+9
|\ \ | |/
| * Document that we don't support NTLM version 2.Thiago Macieira2009-05-111-0/+9
| | | | | | | | | | Task-number: 236925 Reviewed-by: Tor Arne Vestbø
* | Merge branch '4.5'Thiago Macieira2009-05-074-27/+38
|\ \ | |/ | | | | | | | | Conflicts: src/gui/painting/qbackingstore.cpp src/gui/painting/qwindowsurface_raster.cpp
| * fix parsing cookies in multiple linesPeter Hartmann2009-05-072-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | 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
| * Fix OpenSSL dynamic loading on OpenBSD.Thiago Macieira2009-05-071-3/+6
| | | | | | | | | | | | | | | | | | | | | | 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
| * Make QNetworkProxy calculate the capabilities for a new proxy typeThiago Macieira2009-05-071-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | 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
| * Clarify documentation in QNetworkProxy about SOCKS5 supporting domainThiago Macieira2009-05-071-4/+5
| | | | | | | | | | | | name resolution Task-number: 252761
* | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-05-063-3/+14
|\ \ | |/ | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac_p.h src/gui/widgets/qmainwindow.cpp
| * QNetworkDiskCache: check if opening file succeedsBenjamin C Meyer2009-05-061-2/+6
| | | | | | | | | | | | | | | | 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
| * Moved the QT_BEGIN_NAMESPACE macro to the right place in qsslcipher.cppThiago Macieira2009-05-061-1/+1
| | | | | | | | | | Task-number: 252298 Reviewed-by: Peter Hartmann
| * QNetworkCookieJar: do not allow cookies for domains like ".com"Peter Hartmann2009-05-041-0/+7
| | | | | | | | | | | | | | | | 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
* | fix compilation of QLocalServer when QT_LOCALSOCKET_TCP is definedJoerg Bornemann2009-05-061-0/+2
| | | | | | | | | | | | | | When QT_LOCALSOCKET_TCP is defined we cannot call setEnabled on the socket notifier. Reviewed-by: ossi
* | standardize on one name for the socket connection slotOswald Buddenhagen2009-05-063-12/+4
| |
* | rewrite QLocalServer native Windows implementation.Oswald Buddenhagen2009-05-064-178/+112
| | | | | | | | | | | | | | this makes it much less arcane and buggy, specifically it resolves the internal thread-unsafety. Reviewed-by: thiago
* | Merge commit 'origin/4.5'Olivier Goffart2009-05-041-5/+4
|\ \ | |/ | | | | | | Conflicts: src/gui/itemviews/qabstractitemview.cpp
| * QNetworkCookieJar: allow cookies with wrong domain attributePeter Hartmann2009-04-301-5/+4
| | | | | | | | | | | | | | | | | | | | 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
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-291-1/+2
|\ \ | |/
| * QNetworkAccessManager: do not segfault when using a network cacheBenjamin C Meyer2009-04-291-1/+2
| | | | | | | | | | | | | | Don't setfault when setting 0 for the network cache such as when you want to disable it. Reviewed-by: Peter Hartmann
* | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-04-251-0/+8
|\ \ | |/
| * Re-send network request properly when the socket is in Closing state.Denis Dzyubenko2009-04-241-0/+8
| | | | | | | | | | | | | | | | | | 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
* | Merge branch '4.5'Thiago Macieira2009-04-241-2/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | 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
| * don't complain about invalid socket on server shutdownOswald Buddenhagen2009-04-241-2/+4
| | | | | | | | Reviewed-by: thiago
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-231-1/+1
|\ \ | |/
| * correctly handle remote disconnectsOswald Buddenhagen2009-04-231-1/+1
| | | | | | | | | | | | | | | | | | 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