summaryrefslogtreecommitdiffstats
path: root/src/network
Commit message (Expand)AuthorAgeFilesLines
* fix CV-qualifiers for some membersKonstantin Ritt2010-12-102-13/+13
* minor clean-ups and styling fixesKonstantin Ritt2010-12-1015-186/+145
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-251-3/+11
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-191-2/+10
| |\
| | * Merge remote branch 'qt/4.7' into 4.7Jason McDonald2010-11-184-20/+47
| | |\
| | * | SSL: Fix for systemCaCertificates being called first on symbianShane Kearns2010-11-111-2/+10
| * | | Doc: Fixing typoSergio Ahumada2010-11-161-1/+1
| | |/ | |/|
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-194-20/+47
|\ \ \ | |/ /
| * | QNAM HTTP: Ignore double content-length headersMarkus Goetz2010-11-132-3/+19
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-112-17/+28
| |\ \ | | |/ | |/|
| | * Add FreeBSD's certificate bundle to the certificates list.Raphael Kubo da Costa2010-11-111-0/+1
| | * SSL internals: upon error, read all errors from OpenSSLPeter Hartmann2010-11-112-17/+27
* | | Fix compilation after merge.Olivier Goffart2010-11-122-2/+1
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-1215-96/+80
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-112-16/+60
| |\ \ | | |/ | |/|
| | * SSL: Fix crashes/hangs when retrieving CA certificatesShane Kearns2010-11-112-16/+60
| * | QNAM: Do not need QNetworkSession in AlwaysCache load modeMarkus Goetz2010-11-082-12/+21
| * | QNAM: Remove dead waitForUpstreamBytesWritten() codeMarkus Goetz2010-11-082-7/+0
| * | QNAM: Remove dead waitForDownstreamReadyRead() codeMarkus Goetz2010-11-0811-61/+0
| |/
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-061-0/+1
|\ \
| * | Add missing Q_ENUMS to QAbstractSocketOlivier Goffart2010-11-051-0/+1
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-061-5/+7
|\ \ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-051-5/+7
| |\ \ \ | | |/ / | |/| |
| | * | QNAM HTTP: Do not set cache headers when already set by userRobert Hogan2010-11-011-4/+6
| | * | QNAM: Do not cache network connections per username.Robert Hogan2010-11-011-1/+1
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-052-3/+7
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-051-2/+4
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-041-2/+4
| | |\ \
| | | * | trivial: fix buildHarald Fernengel2010-11-031-2/+2
| | | * | Fix crashHarald Fernengel2010-11-021-2/+4
| * | | | QNAM HTTP: Download last chunk properly when readBufferSize() limitedMarkus Goetz2010-11-041-2/+3
| |/ / /
* | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-042-3/+14
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | QNAM: Reset authenticator state properly between requestsMarkus Goetz2010-11-032-3/+14
| |/
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-2921-214/+208
|\ \ | |/
| * QNAM: Fix doc rendering of QNetworkRequestMarkus Goetz2010-10-291-10/+0
| * Network code: Fix code comment spellchecking errors.Markus Goetz2010-10-284-4/+4
| * QNAM: fix buildPeter Hartmann2010-10-271-1/+5
| * QNAM HTTP: Remove the error() of QHttpNetworkConnectionMarkus Goetz2010-10-275-29/+9
| * QNAM HTTP: Remove enableEncryption()Markus Goetz2010-10-272-8/+0
| * QNAM HTTP: Remove unused codeMarkus Goetz2010-10-273-42/+0
| * QNAM HTTP: Move authenticationRequired() to QHttpNetworkReplyMarkus Goetz2010-10-275-11/+7
| * QNAM HTTP: Move proxyAuthenticationRequired() to QHttpNetworkReplyMarkus Goetz2010-10-274-13/+9
| * QNAM HTTP: Move cacheCredentials() to QHttpNetworkReplyMarkus Goetz2010-10-274-5/+4
| * QNAM HTTP: Use sslErrors() from QHttpNetworkReplyMarkus Goetz2010-10-275-8/+10
| * QNAM HTTP: Remove Wait4AuthStateMarkus Goetz2010-10-273-8/+1
| * QNAM: Internal function renamingMarkus Goetz2010-10-273-10/+10
| * QNAM HTTP: Internal variable spelling mistakesMarkus Goetz2010-10-273-12/+12
| * QNAM HTTP: Pause connection when emitting proxy auth signalMarkus Goetz2010-10-271-0/+4
| * QNAM HTTP: Also pause connection when emitting sslErrors()Markus Goetz2010-10-271-0/+4
| * QNAM HTTP: Also resume uploads after connection pauseMarkus Goetz2010-10-271-3/+4