summaryrefslogtreecommitdiffstats
path: root/src/network
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-04-1829-108/+1177
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-04-1823-96/+1115
| |\
| | * Merge earth-team into origin/master'Olivier Goffart2011-04-124-13/+15
| | |\
| | * | Revert "HTTP caching internals: fix logic for PreferNetwork and PreferCache"Markus Goetz2011-04-111-6/+1
| | * | SSL code: introduce new error value for blacklisted certificatesPeter Hartmann2011-04-073-7/+14
| | * | HTTP caching internals: fix logic for PreferNetwork and PreferCachePeter Hartmann2011-04-071-1/+6
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-04-076-6/+50
| | |\ \
| | * | | QLocalSocket: fix abort on Windows.Martin Petersson2011-04-061-0/+5
| | * | | HTTP backend: rename method that loads resource from cachePeter Hartmann2011-04-042-4/+4
| | * | | HTTP backend: make cache validation method return boolPeter Hartmann2011-04-042-14/+12
| | * | | HTTP backend: return earlier when resource loaded from cachePeter Hartmann2011-04-041-7/+7
| | * | | QNetworkDiskCache: clean up after merge requestPeter Hartmann2011-04-011-4/+4
| | * | | QNetworkDiskCache: change file organizationSiddharth Mathur2011-04-012-24/+65
| | * | | QSslSocket: fix setReadBufferSizeMartin Petersson2011-03-311-8/+2
| | * | | QSslConfiguration: do not lazily construct the d-pointerPeter Hartmann2011-03-283-25/+22
| | * | | Merge remote branch 'origin/master' into 4.8-earthDenis Dzyubenko2011-03-2811-2/+34
| | |\ \ \
| | * | | | fix spelling error in HTTP multipart documentationPeter Hartmann2011-03-231-1/+1
| | * | | | network API: add support for HTTP multipart messagesPeter Hartmann2011-03-2210-5/+964
| | * | | | QNAM HTTP: Fix bug with explicitly zero-length compressed responses.Andreas Kling2011-03-221-1/+7
| | * | | | SSL: send SNI extension only if not connecting to an IPPeter Hartmann2011-03-221-1/+2
| | * | | | Merge remote-tracking branch 'origin/master'Olivier Goffart2011-03-2117-18/+67
| | |\ \ \ \
| | * | | | | QNAM: fix the tst_QNetworkAccessManager_And_QProgressDialog auto testMartin Petersson2011-03-172-5/+16
| | * | | | | QTcpSocket: Fix for disconnect in Unbuffered mode.Markus Goetz2011-03-162-5/+10
| | * | | | | QNAM HTTP: error() in case connection is closed unexpectedlyMarkus Goetz2011-03-151-1/+14
| * | | | | | Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-04-1421-21/+111
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-091-8/+5
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-091-8/+5
| | | |\ \ \ \ \
| | | | * | | | | HTTP cacheing: do not store the date header with the resourcePeter Hartmann2011-04-081-8/+5
| | * | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-082-2/+7
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-082-2/+7
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | Ensure shared network session deleted from correct threadShane Kearns2011-04-071-1/+6
| | | | * | | | | Revert "Remove SIGBUS emission from QNetworkSession destruction."Adrian Constantin2011-04-071-1/+1
| | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-04-081-4/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | fix QLocalSocket::isValid() on WindowsJoerg Bornemann2011-04-061-4/+1
| | * | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-072-1/+4
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | / | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | Remove SIGBUS emission from QNetworkSession destruction.Cristiano di Flora2011-04-051-1/+1
| | | * | | | | Add docs for QNetworkConfigurationManager's time-consuming constructor.Xizhi Zhu2011-03-311-0/+3
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-04-051-0/+5
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | QLocalSocket/Win: handle ERROR_ACCESS_DENIEDJoerg Bornemann2011-04-051-0/+5
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-04-051-0/+5
| | |\ \ \ \ \ \
| | | * | | | | | Handle the HTTP 418 reply properly in QNAMThiago Macieira2011-04-011-0/+5
| | | | |_|_|_|/ | | | |/| | | |
| | * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-314-6/+40
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | / / / | | | | |/ / / | | | |/| | |
| | | * | | | QSslSocket internals: abort on encountering blacklisted certificatesPeter Hartmann2011-03-251-0/+7
| | | * | | | QSslCertificate: report fraudulent certificates as invalidPeter Hartmann2011-03-242-4/+31
| | | * | | | FTP: Only read as much as the buffer size the user providedMarkus Goetz2011-03-241-2/+2
| * | | | | | Fix QT_NO_NETWORKPROXY.con2011-03-221-0/+4
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-03-2533-57/+256
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | QSharedNetworkSession: Fix compile on AIX.Pierre Rossi2011-03-221-0/+2
| * | | | | | Merge remote-tracking branch 'mainline/master'Oswald Buddenhagen2011-03-223-1/+18
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-192-0/+12
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |