summaryrefslogtreecommitdiffstats
path: root/src/network
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-172-18/+3
|\ \ | |/ | | | | | | Conflicts: tests/auto/qpainterpath/tst_qpainterpath.cpp
| * fix reading problem on 64-bit machines in QProcess and socket enginePeter Hartmann2009-04-161-17/+2
| | | | | | | | | | | | | | | | | | | | 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
| * Add a warning for trying to connectToHost() when disconnecting.Thiago Macieira2009-04-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * BT: QAbstractSocket: fix check for closing state (typo)Peter Hartmann2009-04-151-1/+1
| | | | | | | | | | | | | | | | emit disconnected() if we were in ConnectedState or in ClosingState before Reviewed-by: Thiago Task-number: 250976
* | BT: QAbstractSocket: fix check for closing state (typo)Peter Hartmann2009-04-151-1/+1
| | | | | | | | | | | | | | | | emit disconnected() if we were in ConnectedState or in ClosingState before Reviewed-by: Thiago Task-number: 250976
* | Merge commit 'origin/4.5'Olivier Goffart2009-04-152-7/+6
|\ \ | |/ | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| * Don't remove the cache file if you have successfully added it.Thiago Macieira2009-04-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | 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
| * Fix compilation if SSL is not enabled.Thiago Macieira2009-04-071-6/+4
| | | | | | | | | | | | | | | | | | 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
* | Merge commit 'origin/4.5'Bjoern Erik Nilsen2009-04-0711-1250/+1675
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp src/gui/painting/qtransform.cpp
| * QLocalSocket will disconnect 30 seconds after a successful delayed connectBradley T. Hughes2009-04-072-13/+16
| | | | | | | | | | | | | | | | | | | | 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
| * Remove inline keywords, fix compile bugIan Walters2009-04-071-3/+3
| | | | | | | | | | | | | | | | | | | | 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
| * Move QT_BEGIN_NAMESPACE to after the usual Qt header includesRhys Weatherley2009-04-073-8/+8
| | | | | | | | | | | | | | 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
| * De-inlined 2 functions in QHttpNetworkHeaderMarkus Goetz2009-04-061-2/+2
| | | | | | | | RevBy: Thiago
| * Splitted qhttpnetworkconnection* files into individual filesMarkus Goetz2009-04-069-1237/+1659
| | | | | | | | (cherry picked from commit fd9b788bd6a99630b06cffee4c9fa9f4c06b0ef1)
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-061-17/+27
|\ \ | |/
| * Fix QNetworkReply's automatic pushing of a cache when the cache isThiago Macieira2009-04-061-17/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more than 64k. This issue was found by Warwick: the copyReadyRead() slot is called only once as a result of readyRead(), but since there's no more data to be received (the source QIODevice is a QBuffer), we'll never get a readyRead() again. So, if we don't have a limited buffer size, we should read everything. This applies to QFile as well. The side-effect is that we cause the entire QFile to be loaded to memory, so if you had a 2 GB cache entry, you'll probably run out of memory. Future optimisations: - don't memcpy the data from a QBuffer into another buffer - find a way to avoid loading the entire contents of the file (probably not possible with the default QNetworkDiskCache since that may compress the data, so we won't know the size and thus can't fake finished()) Reviewed-by: Warwick Allison
* | Merge branch '4.5'Thiago Macieira2009-04-031-1/+1
|\ \ | |/
| * Use the standard 'type name = value' variable declaration for PODThiago Macieira2009-04-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | types. C++ is nice, but we don't have to use confusing syntax when plain old C works (and is correct). This apparently fixes a compilation error on MSVC 6, that doesn't like the constructor-like initialisation for POD types. Reviewed-by: Trust Me BT: yes
| * make relative #include relative to the current fileOswald Buddenhagen2009-04-021-1/+1
| | | | | | | | i.e., use "", not <> and thus rely on the include path
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-014-69/+445
|\ \ | |/ | | | | | | Conflicts: src/gui/inputmethod/qximinputcontext_x11.cpp
| * QNetworkInterface: fix listing of all interfacesPeter Hartmann2009-04-011-3/+3
| | | | | | | | | | | | | | | | Before, we returned 0 for many interfaces because we picked up the IPv6 address regardless whether it was 0 or not. Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com> Task-number: 249312
| * Subject: Mention setProxy() should be called before setHost() in the docAndy Shaw2009-04-011-1/+5
| | | | | | | | Reviewed-by: Kavindra Devi Palaraja <kavindra.palaraja@nokia.com>
| * Fix the parsing of October dates.Benjamin C Meyer2009-03-301-3/+4
| | | | | | | | | | | | | | The code was looking for a 't' to detect GMT-nnnn. It should really be checking for 'gmt'. Signed-off-by: Thiago Macieira <thiago.macieira@nokia.com>
| * Fix parsing of multiple cookies that are separated by a newlineThiago Macieira2009-03-301-1/+1
| | | | | | | | Signed-off-by: Peter Hartmann <peter.hartmann@trolltech.com>
| * Fix accesses past-the-end of the byte arrayThiago Macieira2009-03-301-2/+3
| | | | | | | | Signed-off-by: Peter Hartmann <peter.hartmann@trolltech.com>
| * Fix parsing of dates: if the month is followed by a dash, it's not the ↵Thiago Macieira2009-03-301-0/+2
| | | | | | | | | | | | | | | | negative sign. I don't know why, but this only triggers for the month of October Signed-off-by: Peter Hartmann <peter.hartmann@trolltech.com>
| * When doing date comparisons, force to the same timezone.Thiago Macieira2009-03-301-1/+1
| | | | | | | | | | | | It's the logical time that matters, not the exact date representation. Signed-off-by: Peter Hartmann <peter.hartmann@trolltech.com>
| * Fix a few issues introduced by Ben's last patch.Thiago Macieira2009-03-301-15/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Test if we're not past the end of the array before we attempt to read it. Dates without timezone information are taken to be UTC, so merge the code. If the date parsing failed, don't add a malformed cookie. Better to have no cookie than to have it for past its expiration date. Also update the autotests, since we now can cope with some of the invalid cookies seen on the net. Signed-off-by: Peter Hartmann <peter.hartmann@trolltech.com>
generated by cgit v0.12 at 2024-10-26 15:26:45 (GMT)