summaryrefslogtreecommitdiffstats
path: root/src/network/access
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Fixed spelling mistake and some acronyms.David Boddie2009-08-101-5/+5
| | | | | Task-number: 259268 Reviewed-by: Trust Me
* Compile fix with namespaceshjk2009-08-101-3/+3
|
* 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
* | 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
* | 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-241-3/+3
| |
* | 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
* | QNetworkReply: add possibility to ignore specific SSL errorsPeter Hartmann2009-07-2213-10/+100
| | | | | | | | | | | | | | | | | | | | | | | | 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-201-3/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | 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
| * Removed outdated information from QNetworkRequest documentationMarkus Goetz2009-07-171-3/+1
| | | | | | | | 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
* | QNetworkReply: Add isFinished() method documentation improvementMarkus Goetz2009-07-141-0/+4
| |
* | 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
* | 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
* | QHttpNetworkReply: Cache isChunkedMarkus Goetz2009-07-092-1/+6
| | | | | | | | | | | | Cache return value of expensive function. Reviewed-by: Peter Hartmann
* | 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
* | 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
* | 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>
* | 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>
* | QNAM HTTP Code: Uncluttering functionsMarkus Goetz2009-06-253-18/+36
| | | | | | | | | | | | | | | | Uncluttered and duplicated some function to make it more clear what is happening. Was a bit confusing before if compressed data or uncompressed data is handled. Reviewed-by: Peter Hartmann
* | QNAM: Removed some dead codeMarkus Goetz2009-06-243-7/+0
| | | | | | | | Reviewed-by: Peter Hartmann
* | QNetworkDiskCache: add code snippets in documentationPeter Hartmann2009-06-221-0/+14
| | | | | | | | | | | | | | | | should make it easier to apply a network disk cache with code snippets now Reviewed-by: David Boddie <dboddie@trolltech.com> Reviewed-by: Martin Petersson <martin.petersson@trolltech.com>
* | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-191-3/+2
|\ \ | |/
| * QNetworkAccessManager: Clarify doc about deleting QNetworkReplyMarkus Goetz2009-06-181-3/+2
| | | | | | | | Reviewed-by: Volker Hilsheimer
* | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-181-1/+2
|\ \ | |/ | | | | | | | | | | Conflicts: configure.exe tests/auto/qpainter/tst_qpainter.cpp translations/qt_ru.ts
| * QNAM HTTP code: Do not close TCP connection in all casesMarkus Goetz2009-06-181-1/+2
| | | | | | | | | | | | | | | | | | | | This makes sure the keep-alive connections stay open even if someone deletes a QNetworkReply which will then go all the way down to removeReply(QHttpNetworkReply). Should fix http://lists.trolltech.com/pipermail/qt-interest/2009-June/007777.html Reviewed-by: Peter Hartmann
* | QNAM: More comments, some renamingsMarkus Goetz2009-06-177-34/+50
| | | | | | | | | | | | | | Renamed some classes and member variables. Their names were causing confusion before because. Reviewed-by: Peter Hartmann
* | QNAM: Added comment to de-confuse myselfMarkus Goetz2009-06-171-0/+1
| | | | | | | | I mixed this up several times before, so here is the comment for it.
* | QNAM: Use QTcpSocket for HTTP if no encryption was requestedMarkus Goetz2009-06-171-9/+26
| | | | | | | | | | | | | | This stops QNetworkAccessManager from loading the OpenSSL libs, certificates etc. when they are not needed for the non-HTTPS case. Reviewed-by: mariusSO