summaryrefslogtreecommitdiffstats
path: root/src/network
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into 4.8-from-4.7Rohan McGovern2011-06-012-14/+5
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-06-012-14/+5
| |\
| | * Increase SSL readbuffer 1 -> 16 kBJaakko Koskenkorva2011-05-311-2/+2
| | * Revert "Fix QNetworkConfigurationManager usage outside main thread first"Shane Kearns2011-05-311-12/+3
* | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-312-0/+4
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-262-0/+4
| |\ \ | | |/
| | * sockets: limit buffer size of the internal sockets in proxy enginesShane Kearns2011-05-242-0/+4
| * | fix the "Host" header for ipv6 URLs in QNAMshiroki2011-05-251-1/+11
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-17154-2622/+2622
| |\
| | * Update licenseheader text in source filesJyri Tahtela2011-05-13154-2622/+2622
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-05-2711-6598/+47
|\ \ \
| * | | symbian socket engine: share ip address conversion codeShane Kearns2011-05-253-18/+12
| * | | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-24164-2792/+2792
| |\ \ \
| * | | | Add QUrl::topLevelDomain() and move TLD table from QtNetwork to QtCoreRobert Hogan2011-05-245-6543/+2
| * | | | fix Symbian ordinals for merge request re. utf8 characters in SSL certsPeter Hartmann2011-05-241-1/+5
| * | | | fix coding style for merge request re. utf8 characters in SSL certsPierre Rossi2011-05-231-7/+6
| * | | | Use OpenSSL X509_NAME_ENTRY API to parse UTF8 subjectName/issuerNameRaul Metsma2011-05-233-36/+29
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-05-261-1/+11
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | fix "Host" header of ipv6 URLs in QNAMshiroki2011-05-251-1/+11
* | | | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-192-40/+80
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-185-11/+22
| |\ \ \ \
| * | | | | Symbian socket: Implement systemProxyForQuery for service networksShane Kearns2011-05-181-37/+52
| * | | | | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-1116-60/+299
| |\ \ \ \ \
| * | | | | | Make QHostAddress.toString() follow RFC-5952 for IPv6 address format.Martin Petersson2011-05-061-3/+28
* | | | | | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-185-11/+22
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-05-174-10/+21
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Fix thread safety regression of QNetworkConfigurationManagerShane Kearns2011-05-132-2/+2
| | * | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-121-1/+1
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-111-1/+1
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | Fix incorrect hardware address on systems without getifaddrs()Craig Scott2011-05-111-1/+1
| | * | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-111-0/+2
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-091-0/+2
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | emit QNetWorkAccessManager::finished on QNetworkReply::abort()Martin Petersson2011-05-091-0/+2
| | * | | | | Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Olivier Goffart2011-05-1114-60/+281
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-066-8/+35
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | / | | | |_|_|/ | | |/| | |
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-051-4/+4
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | QNAM: Re-order checks in migrateBackend()Markus Goetz2011-05-051-4/+4
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-055-4/+31
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Send User-Agent from the network request in http proxy CONNECT commandShane Kearns2011-05-054-1/+19
| | | | * | Fix QNetworkConfigurationManager usage outside main thread firstShane Kearns2011-05-041-3/+12
| | | * | | QNAM HTTP: Fix bug with explicitly zero-length compressed responses.Andreas Kling2011-05-041-1/+7
| | | |/ /
| * | | | Fix regression that caused waitForXXX(-1) to fail.Thiago Macieira2011-05-161-1/+1
| | |_|/ | |/| |
* | | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-13164-2792/+2792
|/ / /
* | | Merge branch 'symbian-socket-engine' into staging-masterShane Kearns2011-05-1016-60/+299
|\ \ \ | |/ / |/| |
| * | Sockets: Fix potential null pointer usagesShane Kearns2011-05-052-8/+13
| * | Update QTBUG-17223 for Qt 4.8Shane Kearns2011-05-053-1/+16
| * | Send User-Agent from the network request in http proxy CONNECT commandShane Kearns2011-05-054-1/+19
| * | Fix QNetworkReplyImpl error handlingShane Kearns2011-04-181-4/+13
| * | Enable per network configuration proxy settings in QNetworkAccessManagerShane Kearns2011-04-182-27/+53
| * | Allow a network configuration to be included in a proxy queryShane Kearns2011-04-183-4/+123