summaryrefslogtreecommitdiffstats
path: root/src/network
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/4.5'Rohan McGovern2009-08-063-0/+8
|\ | | | | | | | | | | | | | | Conflicts: src/gui/dialogs/qfiledialog.cpp src/gui/dialogs/qfiledialog_win.cpp tests/auto/qicoimageformat/tst_qicoimageformat.cpp tests/auto/qscriptqobject/qscriptqobject.pro
| * Fix compilation when QT_NO_HTTP is definedMarkus Goetz2009-08-053-0/+8
| | | | | | | | | | | | | | | | Note however you still need to -nomake examples -nomake demos when configuring Qt. Reviewed-by: Thiago Task: 259179
* | Don't try to make direct system calls on Linux.Thiago Macieira2009-08-041-1/+1
| | | | | | | | | | | | | | | | | | Accept that we cannot do everything, so users using outdated toolchains may have threading problems (leaking file descriptors). It's not like this is a recent problem anyway... Reviewed-By: Bradley T. Hughes
* | QNAM HTTP Code: Moved append() functions to the reply objectMarkus Goetz2009-08-044-36/+37
| | | | | | | | Reviewed-by: TrustMe
* | QHttpNetworkConnection: Moved channel slots to channel objectMarkus Goetz2009-08-045-267/+249
| | | | | | | | Reviewed-by: Peter Hartmann
* | Merge branch '4.5'Thiago Macieira2009-08-032-1/+15
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qsharedpointer.cpp src/corelib/tools/qsharedpointer_impl.h src/gui/dialogs/qcolordialog.cpp src/gui/painting/qwindowsurface_raster.cpp src/network/access/qnetworkaccessmanager.cpp tests/auto/qsharedpointer/externaltests.cpp
| * QNAM: Clarify docs about when a QNetworkReply can be deletedMarkus Goetz2009-07-242-2/+16
| | | | | | | | | | Task-number: 258644 Reviewed-by: Thiago
* | Fix compilation and source compatibility.Simon Hausmann2009-07-291-2/+3
| | | | | | | | | | | | | | | | Source code that includes <QNetworkCookieJar> implicitly includes QNetworkCookie in Qt 4.5. Restore this and keep Qt compiling after the split up by including qnetworkcookie.h from qnetworkcookiejar.h Reviewed-by: Trust me
* | Fix compilation: #include <QUrl> was missing.Thiago Macieira2009-07-291-0/+1
| | | | | | | | Reviewed-by: Trust Me
* | QNAM HTTP Code: Split QHttpNetworkConnectionMarkus Goetz2009-07-295-75/+234
| | | | | | | | | | | | | | | | Factor our the Channel object to a new file. My goal is to make QHttpNetworkConnection more maintainable before implementing HTTP pipelining. Reviewed-by: Peter Hartmann
* | Move the QNetworkCookieJar class out of qnetworkcookie.[h,cpp] files and ↵Benjamin C Meyer2009-07-296-274/+451
| | | | | | | | | | | | | | | | | | | | | | into qnetworkcookiejar[h,_p.h,cpp]. one adjustment was necessary from the merge request: The line 110 in qnetworkcookie.h needed to include qnetworkcookiejar.h, not <QtNetwork/QNetworkCookieJar> . Merge-request: 1015 Reviewed-by: Peter Hartmann
* | Port of Qt to VxWorksRobert Griebl2009-07-296-15/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes Qt work on VxWorks 6.6+ in native (kernel) mode. * compiles with the WindRiver GNU toolchain (Linux only) * works with QWS (tested with the VNC driver only) * tested on PPC hardware and the x86 VxWorks simulator * no q3support, no phonon, no webkit * no QSharedMemory, no QSystemSemaphore, no QProcess * only one QApplication instance (flat address space) * filesystem support depends heavily on the quality of the native driver * QLibrary is just a dummy to make plugins work at all * qmake transparently creates VxWorks munching rules for static ctors * made auto-test cope with missing OS features A special note regarding the Q_FOREACH patch for dcc: when calling foreach(a,c) with c being a function returning a container, the compiler would generate 5 references to some labels (.LXXXX), which are not there (so the linker complains in the end). Seems like dcc doesn't really like the 'true ? 0 : <function call to get type>' statement Reviewed-By: Harald Fernengel
* | QHttpNetworkConnectionPrivate: Removed wrong commentMarkus Goetz2009-07-271-6/+0
| | | | | | | | | | | | | | The comment was speaking about upload progress, however the code is about download progress. Reviewed-by: TrustMe
* | qdoc: Fixed all references to obsolete QHttp classes.Martin Smith2009-07-245-16/+15
| |
* | Socket code: Forgot since 4.6 doc tagMarkus Goetz2009-07-231-0/+2
| | | | | | | | Reviewed-by: TrustMe
* | QNAM HTTP Code: Use new LowDelay socket optionMarkus Goetz2009-07-231-0/+5
| | | | | | | | Reviewed-by: Thiago
* | QFtp: Also set LowDelay option on the control socketMarkus Goetz2009-07-231-0/+3
| | | | | | | | Reviewed-by: Thiago
* | Sockets: Added support for SO_KEEPALIVE and TCP_NODELAYMarkus Goetz2009-07-238-10/+154
| | | | | | | | | | | | | | | | Introduce QAbstractSocket::setSocketOption that allows to set the socket options for TCP Keep Alive and TCP_NODELAY (disabling Nagle's Algorithm). Reviewed-by: Thiago
* | QNetworkReply: add possibility to ignore specific SSL errorsPeter Hartmann2009-07-2217-15/+157
| | | | | | | | | | | | | | | | | | | | | | | | the same method was also added to QSslSocket. previously, it was only possible to ignore all SSL errors; now, it is also possible to only ignore specific SSL errors, given by a QList of QSslErrors. Moreover, it is possible to call this newly added method right after connecting, not just when we get the SSL error. Reviewed-by: Thiago Task-number: 257322
* | Merge commit 'origin/4.5'Olivier Goffart2009-07-223-1/+30
|\ \ | |/ | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsscene.cpp src/gui/kernel/qt_cocoa_helpers_mac_p.h
| * QHttpNetworkConnection: Clarifying code comment about compressionMarkus Goetz2009-07-211-1/+6
| | | | | | | | Reviewed-by: TrustMe
| * QNAM: Proper loading of meta data when having AlwaysCache modeMarkus Goetz2009-07-212-0/+24
| | | | | | | | | | | | | | | | | | Properly load the raw headers and properly handle the redirection when having a network cache in AlwaysCache mode (equals the offline mode in web browser). Task-number: 256240 Reviewed-by: Thiago Macieira
* | qdoc: Reported links to obsolete things that appear in non-obsolete things.Martin Smith2009-07-221-0/+3
| | | | | | | | Also marked the other QHttpXxx classes as \obsolete.
* | doc: Changed several \reimp to \internalMartin Smith2009-07-201-2/+2
| | | | | | | | The base function was \internal pr private.
* | Merge commit 'origin/4.5'Oswald Buddenhagen2009-07-203-3/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp src/3rdparty/webkit/WebCore/page/DOMWindow.idl src/corelib/io/qdiriterator.cpp src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h tests/auto/qxmlquery/tst_qxmlquery.cpp tools/linguist/lconvert/main.cpp
| * QUdpSocket: Doc improvementMarkus Goetz2009-07-171-0/+3
| | | | | | | | | | Task-number: 236891 Reviewed-By: David Boddie
| * Removed outdated information from QNetworkRequest documentationMarkus Goetz2009-07-171-3/+1
| | | | | | | | Reviewed-by: TrustMe
| * Add a "User-Agent" line to our HTTP proxy requests.Thiago Macieira2009-07-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently some proxy servers can be configured to deny requests based on User-Agent, even for CONNECT connections. See https://bugs.kde.org/show_bug.cgi?id=155707#c155 for an example (packet dump in #c157, analysis in #c158). So send a User-Agent header with value "Mozilla/5.0", hoping that this will be enough to allow the connection. I hope it will, because other tools like libtool send something completely different: User-Agent: curl/7.19.5 (i586-mandriva-linux-gnu) libcurl/7.19.5 GnuTLS/2.8.1 zlib/1.2.3 c-ares/1.6.0 libidn/1.15 libssh2/1.0 Reviewed-by: TrustMe
* | Doc: some rephrasing and fixingVolker Hilsheimer2009-07-201-33/+32
| | | | | | | | Reviewed-by: Thiago
* | Doc: add \since 4.6 for new APIsVolker Hilsheimer2009-07-191-0/+4
| |
* | QNetworkAccessManager: HTTP download performance improvementsMarkus Goetz2009-07-1713-108/+137
| | | | | | | | | | | | | | | | | | Better usage of move semantics with implicit sharing to avoid detaching (=malloc/memcpy). Also some other improvements. Download performance improvement is around 20% according to the httpDownloadPerformance autotest. Reviewed-by: Thiago Macieira
* | 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