summaryrefslogtreecommitdiffstats
path: root/src/network
Commit message (Expand)AuthorAgeFilesLines
* Prevent data loss when an ssl socket is closed by remoteShane Kearns2012-02-022-13/+22
* Various Qt documentation fixes (wk 44)artoka2012-01-311-3/+3
* Various Qt documentation bug fixes (wk 42)artoka2012-01-302-7/+10
* Fix for coreservices, it should be part of QPA testsAndy Shaw2012-01-171-1/+2
* Update year in Nokia copyright messages.Jason McDonald2012-01-11163-163/+163
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2012-01-0511-23/+78
|\
| * Fix http authentication to a different realm on the same serverShane Kearns2012-01-041-4/+2
| * Fix race in http connection channelShane Kearns2012-01-042-1/+3
| * Don't fetch credentials from cache following a failed proxy authenticationShane Kearns2012-01-048-13/+52
| * Handle plain socket write errors in SSLShane Kearns2012-01-041-2/+9
| * Fix for assertion failureShane Kearns2012-01-042-1/+6
| * Fix faulty logic in http connection pipeliningShane Kearns2012-01-041-2/+6
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-12-203-12/+0
|\ \ | |/ |/|
| * SSL: fix build with -openssl-linked for OpenSSL 0.9.8*Peter Hartmann2011-12-193-12/+0
* | Fix NTLM authentication with email addressShane Kearns2011-12-121-8/+3
* | Fix null pointer dereference in NTLM authenticationShane Kearns2011-12-121-2/+5
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-12-051-0/+27
|\ \
| * | Symbian - prefer sessions started by this process to choose proxyShane Kearns2011-11-301-0/+27
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-11-302-22/+47
|\ \ \ | |/ / |/| / | |/
| * Backport SMP safe initialisation of QNetworkConfigurationManagerShane Kearns2011-11-302-22/+47
* | SSL: fix build when compiled with -openssl-linkedPeter Hartmann2011-11-282-0/+12
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-11-231-3/+3
|\ \ | |/
| * QNetworkProxy documentation: mention usage of "http_proxy" variablePeter Hartmann2011-11-221-3/+3
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-11-181-4/+4
|\ \
| * | Fix sporadic hang in QLocalServer::close() in OS X 10.7Robert Knight2011-11-181-4/+4
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-11-171-2/+29
|\ \ \ | |/ / |/| / | |/
| * QNAM: make systemProxyForQuery respect http_proxyArvid Ephraim Picciani2011-11-171-2/+29
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-11-165-4/+20
|\ \ | |/
| * Add the ability to do unsafe SSL renegotiation as a fallback.Richard Moore2011-11-155-4/+20
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-11-141-0/+1
|\ \ | |/
| * HTTP: blacklist server for pipeliningPeter Hartmann2011-11-141-0/+1
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-11-122-2/+8
|\ \ | |/
| * Fix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEndSami Rosendahl2011-11-111-2/+4
| * HTTP proxy engine - accept standard Connection headerShane Kearns2011-11-111-0/+4
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-11-103-3/+8
|\ \ | |/
| * QNAM: Fix authentication cache when the password is in the URLOlivier Goffart2011-11-083-3/+8
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-11-081-0/+3
|\ \ | |/
| * SSL: blacklist intermediate certificates that issued weak certsPeter Hartmann2011-11-081-0/+3
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-11-011-2/+2
|\ \
| * | QNetworkDiskCache documentation missed informationartoka2011-11-011-2/+2
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-11-011-1/+1
|\ \ \ | | |/ | |/|
| * | SSL documentation: correct enum namePeter Hartmann2011-10-311-1/+1
* | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-10-311-1/+1
|\ \ \
| * | | Symbian - disable memory mapping in QNetworkDiskCacheShane Kearns2011-10-281-1/+1
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-10-282-4/+4
|\ \ \ \
| * | | | Use QBasicAtomicInt as a static variableShane Kearns2011-10-191-2/+2
| * | | | FTP - fix interoperability issues with SIZE commandShane Kearns2011-10-181-2/+2
| | |_|/ | |/| |
* | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-10-227-9/+102
|\ \ \ \ | | |_|/ | |/| |
| * | | Add the ability to enable various SSL bug workarounds.Richard Moore2011-10-217-9/+102
| |/ /
* | | Merge branch '4.8-upstream' into master-waterWater-Team2011-10-172-6/+11
|\ \ \ | |/ /