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-07-091-0/+1
|\
| * Fix resource leak in symbian socket engineShane Kearns2011-07-081-0/+1
* | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-07-081-0/+1
|\ \
| * \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-07-081-0/+1
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-07-071-0/+1
| | |\ \
| | | * | Fix memory leak in QHostInfoShane Kearns2011-07-071-0/+1
* | | | | Merge remote branch 'upstream/4.8'Jerome Pasion2011-07-084-6/+16
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-07-064-6/+16
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | HTTP internals: continue gzip decompression if buffer fills exactlyPeter Hartmann2011-07-051-1/+1
| | * | HTTP internals: do not discard data if not receiving gzip end markerPeter Hartmann2011-07-053-4/+14
| | * | Add a null check for the backend in QNetworkReplyImpl.Jocelyn Turcotte2011-07-051-1/+1
| | |/
* | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-07-013-4/+4
|\ \ \ | |/ /
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-07-013-4/+4
| |\ \
| | * | Symbian socket engine: remove remaining todo commentsShane Kearns2011-06-302-4/+3
| | * | Push the data together with the error in the synchronous case.Pierre Rossi2011-06-281-0/+1
* | | | Doc: Updated documentation with \since 4.8 declarations.David Boddie2011-06-302-0/+9
|/ / /
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-06-273-0/+12
|\ \ \ | |/ /
| * | Make it compile with openssl 1.0.0d, gcc 4.6Bernhard Rosenkraenzer2011-06-273-0/+12
* | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-06-243-13/+33
|\ \ \ | |/ / |/| |
| * | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-06-243-13/+33
| |\ \ | | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-06-202-8/+31
| | |\
| | * | bearer: run the bearer engines in their own worker threadShane Kearns2011-06-133-16/+27
| | * | Revert "Revert "Fix QNetworkConfigurationManager usage outside main thread fi...Shane Kearns2011-06-131-3/+12
* | | | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-06-2413-45/+67
|\ \ \ \ | |/ / /
| * | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-06-222-9/+22
| |\ \ \
| | * \ \ Merge remote branch 'origin/4.7' into qt-4.8-from-4.7Jani Hautakangas2011-06-222-9/+22
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-06-101-2/+2
| | | |\ \ | | | | |/
| | | | * SSL readbuffer 16->32 kBJaakko Koskenkorva2011-06-101-2/+2
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-06-091-7/+20
| | | |\ \
| | | | * | Limit the cookies count per domain to 50.Jocelyn Turcotte2011-06-091-7/+20
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-06-222-15/+23
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | symbian socket engine: resolve some fixme and todo itemsShane Kearns2011-06-222-15/+23
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-06-213-5/+7
| |\ \ \ \ \
| | * | | | | Compile fix in network for iosIan2011-06-203-5/+7
| * | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-1716-6613/+67
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | 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 '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-24164-2912/+3212
| |\ \ \ \
| * | | | | Doc: Applying a pending change from previous merges.David Boddie2011-05-111-0/+4
| * | | | | Doc: Fixed qdoc warning.David Boddie2011-05-111-1/+1
| * | | | | Doc: Fixed qdoc warnings.David Boddie2011-05-112-3/+3
| * | | | | setPeerVerifyMode() and peerVerifyMode() comments fixTaito Silvola2011-05-051-2/+2