summaryrefslogtreecommitdiffstats
path: root/src/network
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-10-145-21/+29
| |\ \
| * | | Fix construction races in QtNetworkShane Kearns2011-10-062-6/+11
| * | | QNAM - fix poor performance of HEAD request with authenticationShane Kearns2011-10-041-1/+1
* | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-10-074-7/+25
|\ \ \ \ | | |/ / | |/| |
| * | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-10-073-5/+22
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-10-051-1/+1
| | |\ \
| | | * | QNAM - fix poor performance of HEAD request with authenticationShane Kearns2011-10-041-1/+1
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-09-281-1/+1
| | |\ \ \ | | | |/ /
| | | * | QAuthenticator::setUser() parse user name in form user@domainMartin Petersson2011-09-281-1/+1
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-09-151-2/+5
| | |\ \ \
| | | * | | Add missing checks for httpReply in QNetworkHttpBackend.Jocelyn Turcotte2011-09-131-2/+5
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-09-152-4/+21
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ /
| | | * | Prevent crash when cache is changed on the flyShane Kearns2011-09-142-4/+21
| * | | | QHostInfo: fix a race condition under CEKonstantin Ritt2011-10-061-2/+3
* | | | | don't lock the global mutex if there is nothing to protectKonstantin Ritt2011-10-071-12/+8
* | | | | fix possible race conditionsKonstantin Ritt2011-10-071-3/+1
* | | | | simplify the code by using QSystemLibrary a bit smarterKonstantin Ritt2011-10-071-6/+7
* | | | | use QSystemLibrary::resolve() instead of GetProcAddress() win API callsKonstantin Ritt2011-10-071-13/+6
|/ / / /
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-10-041-2/+0
|\ \ \ \
| * | | | QNetworkAccessBackend::start() is used although QT_NO_BEARERMANAGEMENT is def...shkim2011-09-291-2/+0
| | |_|/ | |/| |
* | | | Merge branch '4.8' into earth-staging-masterSinan Tanilkan2011-09-213-11/+21
|\ \ \ \ | |/ / /
| * | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-09-161-0/+5
| |\ \ \
| | * \ \ Merge remote branch 'origin/4.8' into 4.8-from-4.7Rohan McGovern2011-09-14116-8614/+8510
| | |\ \ \ | | | |/ / | | |/| |
| | * | | update the proxy info before session is opened in QNAM by Aapo MakelaKranthi Kuntala2011-09-081-0/+5
| | * | | QSslCertificate: block all DigiNotar (intermediate and root) certsPeter Hartmann2011-09-062-8/+35
| | * | | QSslCertificate: also check common name for blacklisted certificatesPeter Hartmann2011-09-061-11/+12
| | | |/ | | |/|
| | * | QSslCertificate: blacklist fraudulent *.google.comPeter Hartmann2011-08-301-0/+1
| * | | Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-09-152-16/+44
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-09-102-8/+34
| | |\ \
| | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-08-301-10/+12
| | |\ \ \
| * | | | | Fix QNetworkReply::errorString returning an untranslated stringGiuseppe D'Angelo2011-09-121-10/+10
| |/ / / /
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-08-191-1/+6
| |\ \ \ \
| | * | | | Doc: Fixed qdoc warnings.David Boddie2011-08-151-1/+6
* | | | | | Remove support for multiple cookies in one Set-Cookie header to follow RFC6265.Jocelyn Turcotte2011-09-161-13/+5
| |_|_|/ / |/| | | |
* | | | | QSslCertificate: block all DigiNotar (intermediate and root) certsPeter Hartmann2011-09-062-8/+34
| |_|/ / |/| | |
* | | | QSslCertificate: also check common name for blacklisted certificatesPeter Hartmann2011-08-301-11/+12