summaryrefslogtreecommitdiffstats
path: root/src/network
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | 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
| |\ \ \
| | * \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-182-0/+12
| | |\ \ \ | | | |/ /
| | | * | Fix accidental population of the disk cache with partial contentSimon Hausmann2011-03-171-0/+7
| | | * | Fix disk cache interaction for range retrieval HTTP requests.Simon Hausmann2011-03-171-0/+5
| * | | | Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-1743-633/+1647
| |\ \ \ \ | | |/ / /
| * | | | Fix http in combination with QT_NO_NETWORKPROXY.con2011-03-101-1/+6
* | | | | Fix compilation with QT_NO_Tasuku Suzuki2011-03-2110-2/+32
| |/ / / |/| | |
* | | | Merge remote-tracking branch 'integration/qt-master-from-4.7' into HEADThiago Macieira2011-03-162-5/+10
|\ \ \ \
| * | | | QTcpSocket: Fix for disconnect in Unbuffered mode.Markus Goetz2011-03-162-5/+10
| * | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-152-3/+25
| |\ \ \ \ | | |_|_|/ | |/| | |
* | | | | Merge remote-tracking branch 'origin/4.7' into HEADThiago Macieira2011-03-162-3/+25
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-151-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Merge branch 'backporting-symbian-armcc-to-4.7' into s60-4.7axis2011-03-141-1/+1
| | |\ \ \
| | | * | | Fixed include in network module on Symbian.axis2011-03-041-1/+1
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-142-3/+25
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | QNAM HTTP: error() in case connection is closed unexpectedlyMarkus Goetz2011-03-141-1/+14
| | * | | | SSL: Fix certification loading on Mac OS X 10.5Martin Petersson2011-03-141-2/+11
* | | | | | Merge earth-team into masterOlivier Goffart2011-03-1514-40/+163
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | SSL: give protocol enum SecureProtocols an own valuePeter Hartmann2011-03-154-6/+8
| * | | | | SSL backend: avoid setting SNI hostname for old SSL versionsPeter Hartmann2011-03-142-2/+5
| * | | | | SSL: Switch default version to TlsV1SslV3 (i.e. use TLS 1 or SSL 3)Peter Hartmann2011-03-145-5/+8
| * | | | | SSL: introduce new option TlsV1SslV3 for SSL communicationPeter Hartmann2011-03-143-1/+10
| * | | | | QNAM HTTP: Pair channels with requests at a later state.Martin Petersson2011-03-103-24/+48
| * | | | | SSL backend: check at runtime for the right OpenSSL version for SNIPeter Hartmann2011-03-044-3/+9
| * | | | | QNAM HTTP: Fix the ioPostToHttpFromSocket auto testMartin Petersson2011-03-043-7/+18
| * | | | | SSL TLS extension on Symbian: work around missing symbolPeter Hartmann2011-02-281-0/+6
| * | | | | SSL: Switch default version to TLS 1.0Peter Hartmann2011-02-284-7/+7
| * | | | | QSslSocket backend: resolve symbols for SNI for SymbianPeter Hartmann2011-02-281-0/+3