summaryrefslogtreecommitdiffstats
path: root/src/network/access
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'qt/master-stable'Jason Barron2009-08-066-303/+286
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe doc/src/classes/qnamespace.qdoc examples/examples.pro src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qobject.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qstandardgestures.h src/gui/kernel/qwidget.cpp
| * 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
* | Compile with Q_DECLARE_SCOPED_PRIVATE.Jason Barron2009-08-041-1/+1
| | | | | | | | | | These classes were moved so they were not updated correctly when I did the merge.
* | Merge commit 'origin/master'Jason Barron2009-08-0411-14/+14
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/corelib/kernel/qmetatype.cpp src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/gui/graphicsview/qgraphicssceneevent.h src/gui/itemviews/qheaderview.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qgesture.h src/gui/kernel/qgesturerecognizer.h src/gui/painting/qpaintengine_raster.cpp src/network/access/qhttpnetworkreply.cpp src/network/access/qnetworkcookie.h src/network/socket/qnativesocketengine_unix.cpp
| * | Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-0310-13/+13
| | | | | | | | | | | | | | | Contains some smaller fixes and renaming of macros. Looks big, but isn't scary at all ;)
| * | Trailing whitespace and tab/space fixes for QtNetworkJanne Anttila2009-08-033-3/+3
| | |
* | | Merge commit 'qt/master-stable'Jason Barron2009-08-0412-350/+702
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/openssl/openssl.pri demos/embedded/embedded.pro examples/itemviews/chart/chart.pro examples/network/network.pro examples/painting/painterpaths/painterpaths.pro examples/threads/mandelbrot/mandelbrot.pro qmake/project.cpp src/3rdparty/libtiff/libtiff/tif_config.h src/corelib/arch/arch.pri src/corelib/global/qglobal.cpp src/corelib/kernel/kernel.pri src/corelib/kernel/qcore_unix_p.h src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/corelib/tools/qsharedpointer_impl.h src/corelib/tools/tools.pri src/gui/kernel/qaction.h src/gui/kernel/qapplication.cpp src/gui/painting/qregion.h src/gui/widgets/qlineedit.cpp src/gui/widgets/qlineedit_p.h src/network/socket/qnativesocketengine_unix.cpp tests/auto/qdir/tst_qdir.cpp tests/auto/qdiriterator/tst_qdiriterator.cpp tests/auto/qhttp/qhttp.pro tests/auto/qline/qline.pro tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qresourceengine/qresourceengine.pro tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qstring/qstring.pro tests/auto/qtcpsocket/qtcpsocket.pro tests/auto/qtcpsocket/tst_qtcpsocket.cpp
| * | 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
* | | | Merge commit 'qt/master-stable'Jason Barron2009-07-291-6/+0
|\ \ \ \ | |/ / /
| * | | 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
* | | | Merge commit 'qt/master-stable'Jason Barron2009-07-281-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/corelib/io/io.pri src/corelib/io/qfilesystemwatcher.cpp tests/auto/qfileinfo/tst_qfileinfo.cpp tools/configure/configureapp.cpp
| * | | qdoc: Fixed all references to obsolete QHttp classes.Martin Smith2009-07-241-3/+3
| | | |
* | | | Merge commit 'qt/master-stable'Jason Barron2009-07-2723-163/+369
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe qmake/Makefile.unix qmake/generators/makefile.cpp src/corelib/global/qglobal.h src/corelib/kernel/kernel.pri src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/kernel/qaction.cpp src/gui/kernel/qaction.h src/gui/kernel/qaction_p.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget.h src/gui/kernel/qwidget_mac.mm src/gui/painting/qgraphicssystemfactory.cpp src/gui/styles/qwindowsstyle.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qabstractscrollarea_p.h src/network/access/qnetworkaccessdebugpipebackend.cpp src/network/socket/qlocalsocket_unix.cpp src/network/socket/qnativesocketengine_p.h src/network/socket/qnativesocketengine_unix.cpp src/openvg/qpaintengine_vg.cpp tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qcssparser/qcssparser.pro tests/auto/qdir/tst_qdir.cpp tests/auto/qfile/tst_qfile.cpp tests/auto/qobject/tst_qobject.cpp tests/auto/qpathclipper/qpathclipper.pro tests/auto/qprocess/tst_qprocess.cpp tests/auto/qsettings/tst_qsettings.cpp tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qsqlquerymodel/qsqlquerymodel.pro tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro tests/auto/qsqltablemodel/qsqltablemodel.pro tests/auto/qsqlthread/qsqlthread.pro tests/auto/qwidget/tst_qwidget.cpp
| * | 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
| |\ \ | | |/
* | | Removed few compiler warnings when using NokiaX86 compiler.Janne Anttila2009-07-221-0/+1
| | |
* | | Merge commit 'origin/master' into 4.6-mergedJason Barron2009-07-094-7/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qcoreevent.cpp src/corelib/tools/qdumper.cpp src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/kernel/qwidget_s60.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkreplyimpl.cpp src/sql/drivers/ibase/qsql_ibase.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/network-settings.h tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qobjectrace/tst_qobjectrace.cpp tests/auto/qsqldatabase/tst_qsqldatabase.cpp tools/configure/configureapp.cpp translations/qt_ru.ts
| * \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-07-073-6/+13
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/network/access/qhttpnetworkconnection_p.h tests/auto/qstyle/qstyle.pro tests/auto/qstyle/tst_qstyle.cpp tools/configure/configureapp.cpp configure.exe will be recompiled in next commit. Took ours.
| | * | QNetworkAccessManager stuff: Some fixes for coverityMarkus Goetz2009-06-293-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | A few "fixes" to make that number go down.. Reviewed-by: Thiago Macieira
| * | | Removed pointless variables to silence warnings from RVCT.axis2009-07-061-2/+0
| | | |
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-2948-102/+139
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore src/gui/dialogs/qfiledialog_p.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp tests/auto/network-settings.h tests/auto/qitemdelegate/tst_qitemdelegate.cpp
* | | | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-3048-199/+357
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore configure.exe src/corelib/concurrent/qtconcurrentthreadengine.h src/corelib/global/qnamespace.h src/gui/graphicsview/qgraphicssceneevent.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qapplication_p.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qwidget.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkaccesshttpbackend.cpp tests/auto/network-settings.h tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro tests/auto/qvariant/tst_qvariant.cpp
| * | | 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>
generated by cgit v0.12 at 2025-01-11 12:00:23 (GMT)