summaryrefslogtreecommitdiffstats
path: root/src/network/access
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1756-65/+6606
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Update copyright year to 2011.Jason McDonald2011-01-1055-55/+55
| | | | | | | | Reviewed-by: Trust Me
| * fix build with QT_NO_BEARERMANAGEMENTPeter Hartmann2011-01-071-0/+4
| | | | | | | | | | | | | | | | start() is only defined when using bearer management; that method calls open(), which we just call directly if not using bearer. Reviewed-by: Markus Goetz Task-number: QTBUG-16477
| * Revert "QNAM HTTP: Fix missing error() signal"Markus Goetz2011-01-072-20/+1
| | | | | | | | | | We don't think this is the right solution. This reverts commit de72670c620e1193fa875bf1a4adee553700bacb.
| * fix build with namespaces in new cookie jar tablePeter Hartmann2011-01-061-0/+2
| | | | | | | | forgot the QT_END_NAMESPACE macro.
| * cookie jar code: enhance security by keeping track of effective TLDsPeter Hartmann2011-01-055-12/+6551
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was the following: According to the cookie RFC, domains must have at least one dot in their name for setting a cookie (e.g. domain example.com can set a cookie for ".example.com" but not for ".com"). The problem is: Following this rule, one could still set "supercookies" for e.g. ".co.uk". The solution is to generate a table from http://publicsuffix.org which maintains a list of all "effective" TLDs like e.g. ".co.uk". Reviewed-by: Olivier Goffart Task-number: QTBUG-14706
| * QNAM HTTP: Fix missing error() signalVille Pernu2010-12-202-1/+20
| | | | | | | | | | | | | | | | During download, if a QAbstractSocket::RemoteHostClosedError occurs, the error handling is deferred to _q_disconnected() slot. However, the error message is not saved for the function, and thus the _q_disconnected only emits a finished-signal. We now store an unhandled error into a private member. It is handled and reset by the _q_disconnected (or more specifically, allDone-function). Also, an additional check is made that there are no simultaneous HTTP errors. If a HTTP error exists, any socket errors are suppressed. Task-Number: QT-3494 Reviewed-By: Markus Goetz
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-201-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.pro src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/plugins/phonon/mmf/mmf.pro src/s60installs/s60installs.pro tests/auto/qapplication/test/test.pro tests/auto/qgraphicsview/tst_qgraphicsview.cpp
| * Abort working replies with error when network session fails.Aaron McCarthy2010-12-141-2/+2
| | | | | | | | | | | | | | Otherwise the connections will stay in a zombie state until the TCP keep alive timer times out in a couple of hours. Task-number: Maemo 201619
* | QNetworkReply: set to finished for synchronous requestsPeter Hartmann2010-12-101-0/+1
| | | | | | | | | | | | | | Since 4.8, QNetworkReply has a setFinished() method, which we need to set to true for synchronous calls. Reviewed-by: Markus Goetz
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-0614-38/+203
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: configure qmake/generators/win32/msbuild_objectmodel.cpp src/gui/image/qpnghandler.cpp src/network/access/qnetworkaccessdatabackend.cpp src/opengl/qgl_x11egl.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * Revert "Fix a missing error-signal when a server is shut down while downloading"Peter Hartmann2010-11-262-18/+1
| | | | | | | | | | | | | | | | This reverts commit cbf7a7782f465846455a5fd5df339ebde31a5521. This commit caused autotest regressions in tst_qdeclarativeloader and tst_qdeclarativetext; reverting it for now until this has been resolved.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Ville Pernu2010-11-2415-40/+209
| |\
| | * HTTP backend: fix build without Qt3 supportPeter Hartmann2010-11-231-1/+1
| | | | | | | | | | | | Reviewed-by: Markus Goetz
| | * QNetworkAccessManager: enable synchronous HTTP callsPeter Hartmann2010-11-2315-40/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To enable synchronous calls, an attribute in the QNetworkRequest has to be set. If set, when QNetworkAccessManager::get() (and post(), put()) returns, the reply is finished and all data has been read in case of success. This feature is semi-public for now (usable, but not documented). To enable this, an attribute in the QNetworkRequest must be set. If this attribute is set, we open a new connection to the server with only one channel and call the channels' sockets' waitFor* methods. Reviewed-by: Markus Goetz
| * | Fix a missing error-signal when a server is shut down while downloadingVille Pernu2010-11-242-1/+18
| |/ | | | | | | | | | | | | | | | | QT-3494: During download, if a QAbstractSocket::RemoteHostClosedError occurs, the error handling is deferred to _q_disconnected() slot. However, the error message is not saved for the function, and thus the _q_disconnected only emits a finished-signal. Solution: Store an unhandled error into a private member. It is handled and reset by the _q_disconnected (or more specifically, allDone-function).
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-192-3/+19
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp src/gui/kernel/qgesturemanager.cpp tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf Changes in qmake/generators/win32/msvc_objectmodel.cpp come from commit 4ba3dadcae97bfde6216c32cfa339f8f0e0253c7
| * QNAM HTTP: Ignore double content-length headersMarkus Goetz2010-11-132-3/+19
| | | | | | | | | | Task-number: QTBUG-15311 Reviewed-by: ogoffart
* | Fix compilation after merge.Olivier Goffart2010-11-122-2/+1
| | | | | | | | Also fix a warning
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-1213-80/+20
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure doc/src/snippets/code/doc_src_qmake-manual.qdoc mkspecs/features/symbian/application_icon.prf mkspecs/features/symbian/default_post.prf mkspecs/features/symbian/symbian_building.prf qmake/generators/symbian/initprojectdeploy_symbian.cpp src/multimedia/audio/audio.pri src/network/access/qnetworkaccessmanager.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl_p.h src/plugins/bearer/corewlan/qcorewlanengine.mm src/plugins/phonon/mmf/mmf.pro tests/auto/qscriptvalue/tst_qscriptvalue.cpp tests/auto/qscriptvalue/tst_qscriptvalue.h tools/qdoc3/doc/qdoc-manual.qdocconf
| * QNAM: Do not need QNetworkSession in AlwaysCache load modeMarkus Goetz2010-11-082-12/+21
| | | | | | | | | | | | | | Move the creation code to the top of QNAM::createRequest() to avoid setting up a QNetworkSession when it is not needed. Reviewed-by: ogoffart
| * QNAM: Remove dead waitForUpstreamBytesWritten() codeMarkus Goetz2010-11-082-7/+0
| |
| * QNAM: Remove dead waitForDownstreamReadyRead() codeMarkus Goetz2010-11-0811-61/+0
| | | | | | | | Reviewed-by: Thiago Macieira
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-061-5/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (45 commits) mkspecs: Move QMAKE_CC and QMAKE_CXX from gcc-base.conf to g++-base.conf mkspecs: Make linux-x86-openkode-g++ not include g++.conf directly mkspecs: Include gcc-base-unix.conf from g++.conf to match old behavior configure: Deal with multiple redefinitions of qmake variables Split QScriptValue::call autotest into smaller tests. Optimize and clean up QClipData::fixup() There is no predefined qmake x11 scope for x11 builds. Refactor tst_QScriptContext::throwError test. Fixed whitespace. Don't use scopes in mkspecs as configure does not support them Fixed destination path for the S60 feedback plugin. Don't put Objective-C sources in SOURCES Fix regression in tst_maketestselftest::naming_convention. Split monolithic QScriptEngine autotests into smaller tests Add SunSpider and V8 benchmarks to benchmarks/script.pro Push and pop the thread-default context for the current thread Silence preprocessor warnings about __TARGET_ARCH_ARM not being defined. Import SunSpider benchmarks for QtScript Import V8 benchmarks for QtScript Add more microbenchmarks for QScriptValue ...
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-051-5/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (40 commits) Optimize and clean up QClipData::fixup() There is no predefined qmake x11 scope for x11 builds. Refactor tst_QScriptContext::throwError test. Fixed whitespace. Don't use scopes in mkspecs as configure does not support them Fixed destination path for the S60 feedback plugin. Don't put Objective-C sources in SOURCES Fix regression in tst_maketestselftest::naming_convention. Split monolithic QScriptEngine autotests into smaller tests Add SunSpider and V8 benchmarks to benchmarks/script.pro Push and pop the thread-default context for the current thread Silence preprocessor warnings about __TARGET_ARCH_ARM not being defined. Import SunSpider benchmarks for QtScript Import V8 benchmarks for QtScript Add more microbenchmarks for QScriptValue Add more microbenchmarks for QScriptEngine QNAM HTTP: Do not set cache headers when already set by user QNAM: Do not cache network connections per username. Refactor tst_QScriptValue::instanceOf Refactor tst_QScriptValue::getSetPrototype ...
| | * | QNAM HTTP: Do not set cache headers when already set by userRobert Hogan2010-11-011-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt clobbers the cache-control headers set by WebCore when CacheLoadControlAttribute == QNetworkRequest::AlwaysNetwork. This causes at least one QtWebKit layout test to fail: http/tests/misc/refresh-headers.php Qt needs to detect if the client has already made a cache-control decision in the headers before overwriting them. See https://bugs.webkit.org/show_bug.cgi?id=45598 Task-Number: QTBUG-13564 Merge-request: 2472 Reviewed-by: Markus Goetz <Markus.Goetz@nokia.com>
| | * | QNAM: Do not cache network connections per username.Robert Hogan2010-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If user information is present in the Url, QNetworkAccessHttpBackend will cache the connection with a key in the format of user@hostname. This causes the following tests in QtWebKit to fail: LayoutTests/http/tests/xmlhttprequest/re-login.html LayoutTests/http/tests/xmlhttprequest/re-login-async.html The tests call the same url with user1 credentials, no credentials, user 2 credentials and no credentials. In the second and fourth calls Qt should use the most recently stored credentials. For the fourth call it currently uses user1's credentials instead of user2's. This is because it retrieves the cached connection from the third call and uses the user/pass in that connection's authenticator - which is user1's. In order to retrieve the connection with the most recently used credentials userinfo should be removed when caching the connection in QNetworkAccessCache. This will allow Qt to retrieve the connection used in the third call, in fact the same cached connection for all four calls. Merge-request: 623 Reviewed-by: Markus Goetz <Markus.Goetz@nokia.com>
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-051-1/+3
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | Conflicts: mkspecs/features/symbian/symbian_building.prf src/network/access/qhttpnetworkconnectionchannel.cpp
| * | QNAM HTTP: Download last chunk properly when readBufferSize() limitedMarkus Goetz2010-11-041-2/+3
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-13431 Task-number: QTBUG-6276 Reviewed-by: ogoffart
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-041-0/+7
|\ \ \ | |/ / | | / | |/ |/|
| * QNAM: Reset authenticator state properly between requestsMarkus Goetz2010-11-031-0/+7
| | | | | | | | | | | | | | Reset authenticator and fix operator=(...) of QAuthenticator. Task-number: QTBUG-6792 Reviewed-by: ogoffart
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-2913-206/+144
|\ \ | |/
| * QNAM: Fix doc rendering of QNetworkRequestMarkus Goetz2010-10-291-10/+0
| | | | | | | | Reviewed-by: Morten Engvoldsen
| * Network code: Fix code comment spellchecking errors.Markus Goetz2010-10-282-2/+2
| | | | | | | | | | | | Me no speak americano. Reviewed-by: Peter Hartmann
| * QNAM: fix buildPeter Hartmann2010-10-271-1/+5
| | | | | | | | | | | | | | | | * winsock2.h conflicts with qplatformdefs.h * ifndef QT_NO_OPENSSL was missing Reviewed-by: Prasanth Reviewed-by: Markus Goetz
| * QNAM HTTP: Remove the error() of QHttpNetworkConnectionMarkus Goetz2010-10-275-29/+9
| | | | | | | | | | | | | | | | Removed the distinction between reply error and connection error. The QNetworkAccessManager was treating them the same way anyway. Reviewed-by: Prasanth Task-Number: QTBUG-13234
| * QNAM HTTP: Remove enableEncryption()Markus Goetz2010-10-272-8/+0
| | | | | | | | | | Reviewed-by: Prasanth Task-Number: QTBUG-13234
| * QNAM HTTP: Remove unused codeMarkus Goetz2010-10-273-42/+0
| | | | | | | | | | Reviewed-by: Prasanth Task-Number: QTBUG-13234
| * QNAM HTTP: Move authenticationRequired() to QHttpNetworkReplyMarkus Goetz2010-10-275-11/+7
| | | | | | | | | | Reviewed-by: Prasanth Task-Number: QTBUG-13234
| * QNAM HTTP: Move proxyAuthenticationRequired() to QHttpNetworkReplyMarkus Goetz2010-10-274-13/+9
| | | | | | | | | | Reviewed-by: Prasanth Task-Number: QTBUG-13234
| * QNAM HTTP: Move cacheCredentials() to QHttpNetworkReplyMarkus Goetz2010-10-274-5/+4
| | | | | | | | | | Reviewed-by: Prasanth Task-Number: QTBUG-13234
| * QNAM HTTP: Use sslErrors() from QHttpNetworkReplyMarkus Goetz2010-10-275-8/+10
| | | | | | | | | | Reviewed-by: Prasanth Task-Number: QTBUG-13234
| * QNAM HTTP: Remove Wait4AuthStateMarkus Goetz2010-10-273-8/+1
| | | | | | | | | | Reviewed-by: Prasanth Task-Number: QTBUG-13234
| * QNAM: Internal function renamingMarkus Goetz2010-10-273-10/+10
| | | | | | | | | | Reviewed-by: Prasanth Task-Number: QTBUG-13234
| * QNAM HTTP: Internal variable spelling mistakesMarkus Goetz2010-10-273-12/+12
| | | | | | | | | | Reviewed-by: Prasanth Task-Number: QTBUG-13234
| * QNAM HTTP: Pause connection when emitting proxy auth signalMarkus Goetz2010-10-271-0/+4
| | | | | | | | | | | | | | | | | | Pause the socket notifiers because the user could be displaying a dialog which makes the event loop run and could make our socket notifiers fire. Reviewed-by: Prasanth Task-Number: QTBUG-13234
| * QNAM HTTP: Also pause connection when emitting sslErrors()Markus Goetz2010-10-271-0/+4
| | | | | | | | | | | | | | | | | | | | Pause the socket notifiers because the user could be displaying a dialog which makes the event loop run and could make our socket notifiers fire. Reviewed-by: Peter Hartmann Reviewed-by: Prasanth Task-Number: QTBUG-13234
| * QNAM HTTP: Also resume uploads after connection pauseMarkus Goetz2010-10-271-3/+4
| | | | | | | | | | | | Reviewed-by: Peter Hartmann Reviewed-by: Prasanth Task-Number: QTBUG-13234
| * QNAM HTTP: Process authenticationRequired() from HTTP properlyMarkus Goetz2010-10-274-7/+10
| | | | | | | | | | | | | | | | | | Fixes a bug where a different QNetworkReply(Impl) handles an authentication request. Reviewed-by: Peter Hartmann Reviewed-by: Prasanth Task-Number: QTBUG-13234
| * QNAM HTTP: Pause sockets while emitting to user code.Markus Goetz2010-10-272-41/+56
| | | | | | | | | | | | | | | | | | | | | | This is needed because user code might display a dialog which spins an event loop and could make the sockets readyRead() fire. This event loop recursion is not desired as it can lead to nasty bugs when the state is messed up. Reviewed-by: Peter Hartmann Reviewed-by: Prasanth Task-Number: QTBUG-13234
generated by cgit v0.12 at 2025-08-31 19:57:41 (GMT)