summaryrefslogtreecommitdiffstats
path: root/src/network
Commit message (Collapse)AuthorAgeFilesLines
* HTTP backend: do not load resources from cache that must be revalidatedPeter Hartmann2011-05-101-7/+5
| | | | | | | | | | | | The header field "Cache-Control: must-revalidate" is a strict requirement for loading the resource from the server, and not reading it from the cache without revalidating first. With this patch, PreferCache will load such from the network instead of loading them from the cache, and AlwaysCache will throw a ContentNotFound error. Reviewed-by: Markus Goetz Task-number: QTBUG-18983 (cherry picked from commit 0e449f38894b1bd2dbb2f14206a011424679f063)
* Clarified sendCustomRequest documentation to include HTTPSJanne Anttila2011-05-101-1/+1
| | | | | Reviewed-By: mgoetz (cherry picked from commit 16b8c940dac02ec77e6ff9fe4150c32db1811e74)
* Fix compilationOlivier Goffart2011-05-101-1/+0
| | | | | Conflicts between 61c6d66b7efd8de4a83b021e7c4ef2b1a803ece2 and 940f16babab76b328b7c9bfdb5435102c689b76b (cherry picked from commit 7a20cf9d4419cf1a5a9a4ed450b03caa8716fd58)
* Fixes warnings about unused variablesOlivier Goffart2011-05-101-0/+1
| | | | | Reviewed-by: Peter Hartmann (cherry picked from commit 61c6d66b7efd8de4a83b021e7c4ef2b1a803ece2)
* Fix warnings on unused parameters and variablesThiago Macieira2011-05-102-2/+1
| | | | (cherry picked from commit 940f16babab76b328b7c9bfdb5435102c689b76b)
* Fix QNetworkConfigurationManager usage outside main thread firstShane Kearns2011-05-091-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | QNetworkConfigurationManager creates the engines loaded from plugins as objects in the main thread. If a QNetworkConfigurationManager instance is created in a worker thread without any instance previously existing in the main thread, then it is uninitialised until the main thread has run. This causes allConfigurations() to return an empty list if called immediately after instantiation, for example. This fix initialises the plugins using blocking queued connections, which causes the worker thread to block until the initialisation function has been called in the context of the main thread. Deadlock is possible if the main thread is for some reason waiting on the worker thread, but it will not deadlock on QNetworkConfigurationManager's mutex. If this is a problem for an application, it should use QNetworkConfigurationManager from the main thread first to preload the plugins. Task-number: QTBUG-18795 Task-number: QTBUG-18799 Reviewed-by: Cristiano Di Flora
* Update QTBUG-17223 for Qt 4.8Shane Kearns2011-05-093-1/+16
| | | | | | | | | | | | | | | In Qt 4.7, http network requests are assigned to http connection channels before connecting the channel. In Qt 4.8, channels are connected "blind" as this gives a performance improvement in certain circumstances. On the assumption that User-Agent should be the same for all the requests being sent to the server in a given burst, we use the first queued request to set the user agent for a http proxy. Task-number: QTBUG-17223 Reviewed-by: Markus Goetz Reviewed-by: Martin Petersson
* Send User-Agent from the network request in http proxy CONNECT commandShane Kearns2011-05-094-1/+19
| | | | | | | | | | | | | Some proxies can discriminate based on the User-Agent when sent a CONNECT command for establishing a HTTPS connection. With this change, if the User-Agent header is set in the QNetworkRequest then it will be passed to the http socket engine for use in the connect command sent to the proxy. As before, "Mozilla/5.0" will be used by default when no user agent has been set. Task-number: QTBUG-17223 Reviewed-by: Markus Goetz
* Fix QNetworkReplyImpl error handlingShane Kearns2011-05-091-4/+13
| | | | | | | | | The backend was never started when compiled without bearer management, now it is. Now emits the error signal in case of startup errors which would leave the state machine hanging. Previously it just printed a warning. Reviewed-by: Peter Hartmann
* Enable per network configuration proxy settings in QNetworkAccessManagerShane Kearns2011-05-092-27/+53
| | | | | | | | | | | | | | Delayed the resolving of the proxy until the backend is being started. This is because the proxy settings are not known until after QNetworkAccessManager has brought the network online using QNetworkSession. On Nokia's symbian3 phones, the default network configuration is a service network containing a list of access points in priority order. For a typical user, this will include one or more WLAN networks and a cellular network - each of which can have different proxy settings. Task-number: QTBUG-18618 Reviewed-by: Peter Hartmann
* Allow a network configuration to be included in a proxy queryShane Kearns2011-05-093-4/+123
| | | | | | | | | | | | | When Qt is compiled with bearer management support, the network configuration can be included as a parameter in QNetworkProxyQuery. This allows QNetworkProxyFactory::systemProxyForQuery to get the right proxy setting for a specific network. For example a mobile phone could have network configurations for home WLAN, work WLAN and 3G data access points, each with different proxy configurations. Task-number: QTBUG-18618 Reviewed-by: Peter Hartmann
* Fix error handling in write for socks socket engineShane Kearns2011-05-091-1/+6
| | | | | | | | When socks socket engine calls the write function of the native socket engine, it now propagates errors to the abstract socket. Task-number: QTBUG-18713 Reviewed-by: Markus Goetz
* Merge remote-tracking branch 'mainline/master' into earthOlivier Goffart2011-05-064-6/+21
|\
| * Move private headers into versioned subdirectoryMarius Storm-Olsen2011-05-021-1/+1
| | | | | | | | | | | | | | This will allow us to expose private headers in a controlled manner, and ensure that they are not used by accident. This also means that we internally will have to enable the private headers for the modules we wish to use in the project.
| * Add module.prf, and install MODULE_PRI for each moduleMarius Storm-Olsen2011-05-021-1/+4
| | | | | | | | Output warning if not present
| * QNetworkConfigurationManager: Fix network polling.Martin Petersson2011-05-022-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | startPolling() is called by each engine, so before it would start multiple singleshot timers. So I moved the timer to the class and check if it has already been started before it is activated again. So that we just use one timer. Task-number: QTBUG-17219 Reviewed-by: Iiro Kause Reviewed-by: Kranthi Kuntala (cherry picked from commit 2506b86828ca8140c2f22d85a4378df40899b132)
| * QAbstractSocket: Fix waitForReadyRead infinite loop.Martin Petersson2011-05-021-2/+2
| | | | | | | | | | | | | | | | Make sure that waitForReadyRead times out if the read buffer is full. Task-number: QTBUG-16123 Reviewed-by: Peter Hartmann (cherry picked from commit 8d4cd52b6981a4e6deea7fdb77f56e40c4f3e6ba)
* | QSslConfiguration documentation fixTaito Silvola2011-05-051-2/+2
| | | | | | | | | | | | | | setPeerVerifyMode() and peerVerifyMode() comments fix Merge-request: 1220 Reviewed-by: Peter Hartmann
* | HTTP cache backend: do not load resources that must be revalidatedPeter Hartmann2011-05-041-2/+7
| | | | | | | | | | | | | | | | | | | | | | The header field "Cache-Control: must-revalidate" is a strict requirement for loading the resource from the server, and not reading it from the cache without revalidating first. With this patch, PreferCache will load such from the network instead of loading them from the cache, and AlwaysCache will throw a ContentNotFound error. Reviewed-by: Markus Goetz Task-number: QTBUG-18983
* | HTTP reply: do not load resources from cache that must be revalidatedPeter Hartmann2011-05-041-7/+5
| | | | | | | | | | | | | | | | | | | | | | The header field "Cache-Control: must-revalidate" is a strict requirement for loading the resource from the server, and not reading it from the cache without revalidating first. With this patch, PreferCache will load such from the network instead of loading them from the cache, and AlwaysCache will throw a ContentNotFound error. Reviewed-by: Markus Goetz Task-number: QTBUG-18983
* | QNetworkCookie: allow spaces in unquoted valuesPeter Hartmann2011-05-041-4/+5
| | | | | | | | | | | | | | | | | | | | We should follow http://tools.ietf.org/html/draft-ietf-httpstate-cookie-23 , which says parse the value until reaching the next ';' or the end of the line. Other cookie implementations allow spaces in unquoted values as well. Reviewed-by: Martin Petersson Task-number: QTBUG-18876
* | QNAM HTTP: Removes some commentsMarkus Goetz2011-05-031-17/+4
| |
* | QNAM HTTP: More commentsMarkus Goetz2011-05-031-23/+14
| |
* | QNAM HTTP: Implement abort() and close()Markus Goetz2011-05-031-6/+35
| |
* | QNAM HTTP: CommentsMarkus Goetz2011-05-031-11/+7
| |
* | QNAM: Function re-orderingMarkus Goetz2011-05-032-39/+36
| |
* | HTTP caching documentation: add some commentsPeter Hartmann2011-05-031-2/+5
| |
* | Revert "HTTP caching internals: fix logic for PreferNetwork and PreferCache"Peter Hartmann2011-05-031-6/+1
| | | | | | | | This reverts commit 11838861a23ace66307306cf9c96b3f1910e09a9.
* | QNAM: Fix initialization order warningsMarkus Goetz2011-05-032-35/+54
| |
* | QNAM: TODO comments for Qt 5Markus Goetz2011-05-031-0/+3
| |
* | QNAM HTTP: Fix upload progress signalMarkus Goetz2011-05-031-1/+1
| |
* | HTTP caching internals: fix logic for PreferNetwork and PreferCachePeter Hartmann2011-05-031-1/+6
| |
* | HTTP Network Reply Impl: return earlier when resource loaded from cachePeter Hartmann2011-05-031-4/+4
| |
* | HTTP Reply implementation: make cache validation method return boolPeter Hartmann2011-05-032-14/+12
| |
* | cache: rename validateCache() to loadFromCacheIfAllowed()Peter Hartmann2011-05-032-4/+4
| |
* | QNAM: Fix proxy code after refactoringMarkus Goetz2011-05-032-7/+13
| |
* | fix buildPeter Hartmann2011-05-031-0/+1
| |
* | QNAM: Start new HTTP backend architectureMarkus Goetz2011-05-036-281/+1203
| |
* | QNAM: Copy files for new architectureMarkus Goetz2011-05-032-0/+1359
| |
* | QNAM: Improve internal proxyAuthenticationRequired()Markus Goetz2011-05-033-9/+12
| | | | | | | | | | | | | | Make it independent from the backend architecture to improve refactorability. Reviewed-by: Peter Hartmann
* | QNAM: Improve internal authenticationRequired()Markus Goetz2011-05-033-13/+17
|/ | | | | | | Make it independant from the backend architecture to improve refactorability. Reviewed-by: Peter Hartmann
* Initial import from the monolithic Qt.Qt by Nokia2011-04-27172-0/+75632
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12