summaryrefslogtreecommitdiffstats
path: root/src/network
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'e4bec39a139363d1ee4cf3fb15a3fe4499215e77' into 4.6Thiago Macieira2009-11-0212-25/+91
|\
| * Merge branch '4.6' into core-4.6Thiago Macieira2009-10-292-55/+54
| |\
| * | QLocalServer: block indefinitely when timeout value is -1Peter Hartmann2009-10-281-16/+6
| | | | | | | | | | | | | | | | | | | | | | | | ... as described in the documentation. Furthermore: * use qt_safe_select to timeout correctly * return immediately when timeout value is 0 Reviewed-by: Oswald Buddenhagen
| * | Merge remote branch 'origin/4.6' into core-4.6Thiago Macieira2009-10-281-0/+6
| |\ \
| * | | QAbstractSocket: insert timer to prevent timeoutPeter Hartmann2009-10-273-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a timeout that occurred on Mac with the gui event dispatcher: we were waiting for a write notification, but timed out when we were in closing state and still waiting for the socket engine to complete writing. Now we close the socket anyway after 2 seconds. Reviewed-by: Thiago Macieira
| * | | QAbstractSocket: wait with closing until all bytes have been writtenPeter Hartmann2009-10-279-7/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | only disconnect from host when all bytes have been written; i.e. not only check whether the write buffer is empty, but also check whether the socket engine has still bytes to write. This is necessary for HTTP and SOCKS5 socket engine, because they both contain an inner TCP socket which also does buffering. For the native socket engine, there is no difference with this patch. Reviewed-by: Markus Goetz Reviewed-by: Thiago Macieira
* | | | Fix LIBRARY and ICONJørgen Lind2009-10-291-2/+2
| |_|/ |/| | | | | | | | | | | | | | However, compiling with QT_NO_ICON will still not work :( Reviewed-by: tom
* | | QSslError: Actually make strings show up in the ts fileMarkus Goetz2009-10-281-29/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | I suspect because of missing quotation marks those strings were not showing up. Also, wrapping QT_TRANSLATE_NOOP inside a tr() call makes no sense. Also changed the class from QObject to QSslSocket. Task-number: QTBUG-5059 Reviewed-by: ossi
* | | QNativeSocketEngine: Actually use translationsMarkus Goetz2009-10-281-26/+26
| |/ |/| | | | | | | Task-number: QTBUG-4984 Reviewed-by: Thiago
* | QSslSocket: Add \reimp to the socket option functionsMarkus Goetz2009-10-261-0/+6
|/ | | | Reviewed-by: Thiago
* QHttp: Fix bug related to SSL and big POST dataMarkus Goetz2009-10-222-0/+31
| | | | | | | | QHttp is deprecated, but let's be nice and fix this. POST/PUT now properly works over HTTPS without buffering the whole data when it is not needed. Reviewed-by: Peter Hartmann
* QSslSocket: Trigger a SSL transmission when reading from the socket.Markus Goetz2009-10-223-0/+17
| | | | | | | | | In certain cases a SSL transfer stalled when a readBufferSize was set. This change triggers a SSL transmission when there is data on the socket waiting to be decrypted. Task-number: QTBUG-3860 Reviewed-by: Thiago
* QSslSocket: Also handle setSocketOptionMarkus Goetz2009-10-193-0/+33
| | | | | | | Handle setSocketOption and forward it to the plainSocket that QSslSocket is using internally. Reviewed-by: Thiago
* Merge branch '4.5' into 4.6Thiago Macieira2009-10-161-1/+6
|\ | | | | | | | | Conflicts: src/gui/egl/qegl_symbian.cpp
| * QNetworkProxyFactory: Never return empty list on windowsMarkus Goetz2009-10-161-1/+6
| | | | | | | | | | Task-number: Salesforce 00062670 Reviewed-by: Thiago
| * QNAM HTTP Code: Backport a fix related to aborting repliesMarkus Goetz2009-10-141-1/+4
| | | | | | | | | | | | | | | | Backport af71faf8cb2c9cbf34c408b81ce7ae1ef6c6403e from 4.6 to 4.5. Task-number: 261999 Reviewed-by: Peter Hartmann
* | Networking documentation: Small improvementMarkus Goetz2009-10-163-3/+5
| | | | | | | | | | Task-number: 262144 Reviewed-by: TrustMe
* | QSslSocket: Documentation enhancementMarkus Goetz2009-10-151-0/+7
| | | | | | | | | | | | Clarify about bytesWritten() and encryptedBytesWritten() Reviewed-by: David Boddie
* | QNAM HTTP Code: Proceed POSTing on encryptedBytesWritten()Markus Goetz2009-10-152-0/+13
| | | | | | | | | | | | ... not only on bytesWritten() Reviewed-by: Peter Hartmann
* | QHttpNetworkConnectionChannel: Limit the socket read bufferMarkus Goetz2009-10-121-0/+5
| | | | | | | | Reviewed-by: Peter Hartmann
* | Fix qdoc warning about undocumented parameterSimon Hausmann2009-10-091-1/+1
| | | | | | | | Reviewed-by: Trust me
* | Add a way to allow tracking the originating object with QNetworkRequest.Simon Hausmann2009-10-093-0/+35
| | | | | | | | | | | | | | | | Added setOriginatingObject() and originatingObject() to QNetworkRequest that internally tracks the QObject using a QWeakPointer. Reviewed-by: Lars Knoll Rubberstamped-by: Thiago
* | Fix QHostInfo IP resolution when there's no reverse for the IP.Thiago Macieira2009-10-092-50/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you try to resolve 10.3.4.6, you're probably going to get that it doesn't exist. On some systems, getnameinfo will return the IP address in string form (Linux, without NI_NAMEREQD). On some others, it will fail (Mac, Windows). So harmonise by gracefully handling the case in which getnameinfo fails. Possible behaviour change: we don't try the forward resolution any more, after completing the reverse one. Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
* | API review: change function name to setUseSystemConfiguration.Thiago Macieira2009-10-062-3/+3
| | | | | | | | Requested-By: Volker Hilsheimer
* | Fixing the compile bug for Symbian when using ARMV5Aleksandar Sasha Babic2009-10-062-0/+5
| | | | | | | | | | | | Explicit destructor was needed by compiler. Reviewed-by: Thiago Macieira
* | QAbstractSocket::setSocketOption: Make const referenceMarkus Goetz2009-10-062-3/+3
| | | | | | | | | | | | After 4.6 API review. Reviewed-by: Volker Hilsheimer
* | OpenSSL wrapping: compile when configured with -openssl-linkedPeter Hartmann2009-10-053-8/+2
| | | | | | | | | | | | we were calling sk_pop_free from OpenSSL with a wrong signature. Reviewed-by: Olivier Goffart
* | Dealing with socket that was signalized on exception fds setAleksandar Sasha Babic2009-10-021-3/+5
| | | | | | | | | | | | | | | | | | | | | | It turns out that if socket was signalized via exception fds set, we should signalize only write notifier in the case where both read and write notifiers exist. If in this case we send signal to read notification socket will prematurely be closed. x#Reviewed-by: Janne Antilla
* | Workaround for Open C bugAleksandar Sasha Babic2009-10-021-1/+1
| | | | | | | | Workaorund for SO_REUSEPORT / SO_REUSEADDR regression bug.
* | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-10-011-0/+9
|\ \ | |/
| * QNAM HTTP Code: Always send an Accept-Language headerMarkus Goetz2009-10-011-0/+9
| | | | | | | | | | | | | | | | Send a header that we accept every language. Works around a bug in some broken websites and is hopefully of no harm for us. Task-number: QT-952 Reviewed-by: Thiago
* | Fix tr-Errors/remove QObject::tr(), mainly in ScriptToolsFriedemann Kleint2009-09-291-1/+1
| | | | | | | | | | | | Note: Those messages are to be translated in Qt 4.6 for the first time. Reviewed-by: Kent Hansen <khansen@trolltech.com>
* | HTTP backend: store the date header in the cached resourcePeter Hartmann2009-09-291-5/+8
| | | | | | | | | | | | | | | | | | | | we need the date header to calculate the age of the page, although this increases disk usage when using a QNetworkDiskCache. A solution to reduce the disk access of QNetworkDiskCache will be considered for a later version of Qt. Reviewed-by: Markus Goetz Reviewed-by: Aleksandar Sasha Babic
* | Merge commit 'origin/4.5' into 4.6Andreas Aardal Hanssen2009-09-281-0/+3
|\ \ | |/ | | | | | | | | | | | | | | Reviewed-by: Joao Conflicts: src/gui/graphicsview/qgraphicsview.cpp src/gui/widgets/qspinbox.cpp tests/auto/qgraphicsview/tst_qgraphicsview.cpp
| * QHostAddress: Clarification about DNSMarkus Goetz2009-09-251-0/+3
| | | | | | | | Task-number: QT-1683
* | QNAM HTTP Code: Properly remove aborted requests from processingMarkus Goetz2009-09-234-4/+41
| | | | | | | | | | | | | | | | This fixes a crash that occured because aborted requests were not properly removed from the channel.alreadyPipelinedRequests. Task-number: QTBUG-4507 Reviewed-by: Peter Hartmann
* | QNetworkReplyImpl: Delete the outgoingDataBuffer in destructorMarkus Goetz2009-09-221-0/+2
| | | | | | | | | | | | Fixes a memleak Reviewed-by: Peter Hartmann
* | Removed a debug output that was a bit annoyingThorbjørn Lindeijer2009-09-151-2/+1
| | | | | | | | Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
* | QNativeSocketEngine on Windows: don't bail out on non-fatal errorPeter Hartmann2009-09-151-3/+9
| | | | | | | | | | | | | | | | receiving the WSAEMSGSIZE error means we could not read all the data because the buffer was too small, but still we should return the number of bytes read and not return -1 Reviewed-by: Marius Storm-Olsen
* | Merge branch '4.5' into 4.6Thiago Macieira2009-09-121-4/+6
|\ \ | |/ | | | | | | | | Conflicts: tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro
| * Only reset the backend pointer after we're done with itJoão Abecasis2009-09-101-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | Since 925912ebf552417306a5bd20fd986afda6a582be QNetworkReplyImplPrivate no longer holds its own pointer to the network cache and relies on the backend to get it. Since the cache is used in our call to finished, we must reset the backend only after that. This fixes a crash I was seeing in Arora... Reviewed-by: Markus Goetz Reviewed-by: Peter Hartmann
| * Update license headers again.Jason McDonald2009-09-08127-508/+508
| | | | | | | | Reviewed-by: Trust Me
* | QLocalSocket (Win) emit readChannelFinished only onceJoerg Bornemann2009-09-111-1/+2
| | | | | | | | | | | | | | If pipeClosed is true, then we've already emitted the readChannelFinished signal. We must not do this in close() in that case. Reviewed-by: ossi
* | QLocalSocket::readData (Windows) must return -1 on EOFJoerg Bornemann2009-09-101-1/+4
| | | | | | | | | | | | | | | | If we've detected a broken pipe and we have no more data in the read buffer, then we return -1 to signal EOF. Additionally, we close the QLocalSocket. Reviewed-by: ossi
* | QLocalSocket Windows: emit readChannelFinished if broken pipe detectedJoerg Bornemann2009-09-101-0/+4
| | | | | | | | | | | | | | If we detect in a read operation that the pipe has been closed, we must emit the readChannelFinished signal. Reviewed-by: ossi
* | Some unneeded semicolons lessAlessandro Portale2009-09-092-2/+2
| |
* | Fix unresolved reference to q_sk_free with openssl 1.0Bernhard Rosenkraenzer2009-09-093-3/+10
| | | | | | | | | | | | | | Previous fix introduced an unresolved reference in the lib Merge-request: 1409 Reviewed-by: Peter Hartmann <peter.hartmann@trolltech.com>
* | Fix build with openssl 1.0.0 betasBernhard Rosenkraenzer2009-09-091-1/+2
| | | | | | | | | | | | | | | | | | The recent addition of sk_pop_free to src/network/ssl/qsslsocket_openssl_symbols.cpp broke the build with openssl 1.0.0 betas; this commit fixes it Merge-request: 1409 Reviewed-by: Peter Hartmann <peter.hartmann@trolltech.com>
* | Resolved ordinals for Qt/4.6 added OpenSSL symbols for Symbian OS.Janne Anttila2009-09-091-0/+2
| | | | | | | | | | This fix gets rid of warnings/errors such as: QWARN : cannot call unresolved function sk_pop_free
* | Update license headers again.Jason McDonald2009-09-09135-540/+540
| | | | | | | | Reviewed-by: Trust Me
generated by cgit v0.12 at 2024-12-12 05:37:46 (GMT)