summaryrefslogtreecommitdiffstats
path: root/src/network
Commit message (Collapse)AuthorAgeFilesLines
* Fix warnings for QtNetwork on mingwThierry Bastian2009-07-151-46/+27
|
* Fix warnings in mingwThierry Bastian2009-07-151-1/+1
|
* Fix Solaris build failure with the new qt_safe_() socket functions.Robert Griebl2009-07-151-1/+2
| | | | Reviewed-by: Thiago
* Forgot to include qnet_unix_p.h for the qt_safe_() functionsRobert Griebl2009-07-141-0/+1
| | | | Reviewed-By: TrustMe
* QNetworkReply: Add isFinished() method documentation improvementMarkus Goetz2009-07-141-0/+4
|
* Socket function cleanup: replacing direct POSIX calls with qt_safe_().Robert Griebl2009-07-145-44/+42
| | | | Reviewed-By: Thiago
* QNetworkReply: Add isFinished() methodMarkus Goetz2009-07-145-0/+32
| | | | | | | | The isFinished() method will return true if the reply has successfully finished or has been aborted. Task-number: 257349 Reviewed-by: Thiago Macieira
* Build fix for mingwThierry Bastian2009-07-143-3/+3
| | | | | we should include qt_windows.h and not windows.h because we have to define WINVER to 0x500.
* Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-07-131-0/+2
|\ | | | | | | | | | | Conflicts: src/network/access/qnetworkaccesshttpbackend.cpp src/network/access/qnetworkreplyimpl.cpp
| * QNAM: Fix double sending of a HTTP requestMarkus Goetz2009-07-132-0/+9
| | | | | | | | | | | | | | | | | | In some cases, weird timing issues could occur. In those cases, an EOF was sent twice for the upload data, leading to the HTTP code being confused and sending the request headers twice. Task-number: 257662 Reviewed-by: Thiago Macieira
* | Removed an assert from the QNetworkReply.Denis Dzyubenko2009-07-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is possible that finished() function will be called several times, for example if the user calls QNetworkReply::close() as a result of the authenticationRequired() signal, the connection will be closed (which results in emitting a finished() signal), and then the authentication will be cancelled, which will also try to emit the same signal, however the connection state will already be set to Finished. The fix is to just make sure if the finished() signal has already been emitted by checking if the connection state is not Finished or Aborted. Reviewed-by: Thiago Macieira
* | QLocalSocket WriteOnly mode fixed on WindowsJoerg Bornemann2009-07-091-4/+6
| | | | | | | | | | | | | | | | | | Write only local sockets silently disconnected after some time. Reason: we cannot call PeekNamedPipe on a write only pipe. Task-number: 257714 Reviewed-by: ossi Autotest: tst_QLocalSocket::writeOnlySocket
* | QHttpNetworkReply: Cache isChunkedMarkus Goetz2009-07-092-1/+6
| | | | | | | | | | | | Cache return value of expensive function. Reviewed-by: Peter Hartmann
* | Merge commit 'origin/4.5'Bill King2009-07-081-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: src/sql/drivers/ibase/qsql_ibase.cpp tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qsqldatabase/tst_databases.h tests/auto/qsqldatabase/tst_qsqldatabase.cpp translations/qt_ru.ts
| * Fixed dead code possibly leading to crash.Rohan McGovern2009-07-031-1/+1
| | | | | | | | | | | | | | | | Looks like this `&&' was meant to be `||'. QNetworkProxy::FtpCachingProxy is 5 so it's clearly impossible for type to be less than 0 and greater than QNetworkProxy::FtpCachingProxy. Reviewed-by: Aaron Kennedy
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtVolker Hilsheimer2009-07-083-120/+138
|\ \
| * | fast Windows version of QLocalSocketJoerg Bornemann2009-07-083-120/+138
| | | | | | | | | | | | | | | | | | | | | This commit removes the 100 ms polling timer from QLocalSocket and replaces it with proper overlapped IO handling. Reviewed-by: ossi
* | | Use current license header.Volker Hilsheimer2009-07-081-2/+2
|/ /
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtDavid Boddie2009-07-0720-251/+380
|\ \ | | | | | | | | | | | | Conflicts: src/network/socket/qlocalsocket.cpp
| * | Don't compile the FD_CLOEXEC-safe accept4 call if we don't know about ↵Thiago Macieira2009-07-021-1/+1
| | | | | | | | | | | | SOCK_CLOEXEC
| * | Use the safe versions of the network system calls I have just added.Thiago Macieira2009-07-025-48/+13
| | | | | | | | | | | | Reviewed-By: ossi
| * | Add the support for the EINTR- and CLOEXEC-safe network calls too.Thiago Macieira2009-07-022-1/+155
| | | | | | | | | | | | | | | | | | | | | | | | The SOCK_NONBLOCK, SOCK_CLOEXEC and accept4(2) calls are Linux-specific. Other platforms get the same behaviour through emulation. Reviewed-By: ossi
| * | Add a properly-safe version of select(2).Thiago Macieira2009-07-021-47/+6
| | | | | | | | | | | | | | | | | | | | | | | | Do the timeout handling the right and cross-platform way. The code that was in QProcess worked only on Linux, where the kernel sets the remainder in the returned timeval structure. Reviewed-By: ossi
| * | QNAM: Direct transfer of HTTP buffer to the QNetworkReply bufferMarkus Goetz2009-07-014-12/+16
| | | | | | | | | | | | | | | | | | | | | Directly put a QRingBuffer from one QRingBuffer to another QRingBuffer. Reviewed-by: Thiago Macieira
| * | src/network: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT ↵miniak2009-07-017-104/+43
| | | | | | | | | | | | | | | | | | | | | support Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| * | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-301-1/+1
| |\ \ | | |/
| | * fix crash in QLocalServer on WinCE when waitForNewConnection times outJoerg Bornemann2009-06-301-1/+1
| | | | | | | | | | | | Reviewed-by: mauricek
| * | Merge branch '4.5'Marius Storm-Olsen2009-06-303-5/+11
| |\ \ | | |/
| | * QNetworkAccessManager stuff: Some fixes for coverityMarkus Goetz2009-06-293-6/+13
| | | | | | | | | | | | | | | | | | A few "fixes" to make that number go down.. Reviewed-by: Thiago Macieira
| * | QNAM HTTP Code: Properly use the QRingBuffer for some kind of data.Markus Goetz2009-06-293-28/+75
| | | | | | | | | | | | | | | | | | | | | Use the QRingBuffer properly when reading known-size, non-chunked, non-compressed data from HTTP. Reviewed-by: Thiago Macieira
| * | Fix bad mergesBradley T. Hughes2009-06-261-1/+1
| | |
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-262-0/+35
| |\ \
| | * \ Merge branch '4.5'Thiago Macieira2009-06-262-0/+35
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/network/access/qnetworkreplyimpl.cpp
| | | * QNetworkReplyImpl: Protect against recursive event loopsMarkus Goetz2009-06-252-2/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug that occured together with a QProgressDialog. The signal emission was like: readyRead readyRead readyRead [...] readyRead finished readyRead Now finished should be properly at the ending of this sequence. Task-number: 256630 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-264-25/+61
| |\ \ \ | | |/ /
| | * | QNAM HTTP Code: Prepare for download performance improvementsMarkus Goetz2009-06-254-9/+27
| | | | | | | | | | | | | | | | | | | | | | | | Change the QByteArray to a QRingBuffer to save re-allocation time. Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-243-7/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_x11.cpp
| * \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-231-0/+14
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-222-4/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/qnamespace.qdoc src/corelib/global/qnamespace.h src/gui/graphicsview/qgraphicsscene.cpp
| * \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-189-39/+57
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem_p.h
| * \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-17127-269/+292
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsscene_p.h
| * | | | | | | | Merge of masterBradley T. Hughes2009-06-159-24/+86
| | | | | | | | |
| * | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-124-33/+26
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem_p.h
| * \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-085-3/+37
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-053-3/+4
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-05-2915-75/+61
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-05-268-100/+64
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qcoreevent.h src/gui/graphicsview/qgraphicsitem_p.h
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-05-204-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-05-192-20/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-05-181-12/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \