summaryrefslogtreecommitdiffstats
path: root/src/network
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-05-121-0/+9
|\
| * Merge branch '4.5'Thiago Macieira2009-05-111-0/+9
| |\
| | * Document that we don't support NTLM version 2.Thiago Macieira2009-05-111-0/+9
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-mult...Bradley T. Hughes2009-05-086-30/+52
|\ \ \ | |/ /
| * | Merge branch '4.5'Thiago Macieira2009-05-074-27/+38
| |\ \ | | |/
| | * fix parsing cookies in multiple linesPeter Hartmann2009-05-072-17/+17
| | * Fix OpenSSL dynamic loading on OpenBSD.Thiago Macieira2009-05-071-3/+6
| | * Make QNetworkProxy calculate the capabilities for a new proxy typeThiago Macieira2009-05-071-3/+10
| | * Clarify documentation in QNetworkProxy about SOCKS5 supporting domainThiago Macieira2009-05-071-4/+5
| * | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-05-063-3/+14
| |\ \ | | |/
| | * QNetworkDiskCache: check if opening file succeedsBenjamin C Meyer2009-05-061-2/+6
| | * Moved the QT_BEGIN_NAMESPACE macro to the right place in qsslcipher.cppThiago Macieira2009-05-061-1/+1
| | * QNetworkCookieJar: do not allow cookies for domains like ".com"Peter Hartmann2009-05-041-0/+7
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-mult...Bradley T. Hughes2009-05-065-188/+116
|\ \ \ | |/ /
| * | fix compilation of QLocalServer when QT_LOCALSOCKET_TCP is definedJoerg Bornemann2009-05-061-0/+2
| * | standardize on one name for the socket connection slotOswald Buddenhagen2009-05-063-12/+4
| * | rewrite QLocalServer native Windows implementation.Oswald Buddenhagen2009-05-064-178/+112
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-mult...Bradley T. Hughes2009-05-041-5/+4
|\ \ \ | |/ /
| * | Merge commit 'origin/4.5'Olivier Goffart2009-05-041-5/+4
| |\ \ | | |/
| | * QNetworkCookieJar: allow cookies with wrong domain attributePeter Hartmann2009-04-301-5/+4
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-mult...Bradley T. Hughes2009-04-291-1/+2
|\ \ \ | |/ /
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-291-1/+2
| |\ \ | | |/
| | * QNetworkAccessManager: do not segfault when using a network cacheBenjamin C Meyer2009-04-291-1/+2
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-mult...Bradley T. Hughes2009-04-272-2/+12
|\ \ \ | |/ /
| * | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-04-251-0/+8
| |\ \ | | |/
| | * Re-send network request properly when the socket is in Closing state.Denis Dzyubenko2009-04-241-0/+8
| * | Merge branch '4.5'Thiago Macieira2009-04-241-2/+4
| |\ \ | | |/
| | * don't complain about invalid socket on server shutdownOswald Buddenhagen2009-04-241-2/+4
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-mult...Bradley T. Hughes2009-04-231-1/+1
|\ \ \ | |/ /
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-231-1/+1
| |\ \ | | |/
| | * correctly handle remote disconnectsOswald Buddenhagen2009-04-231-1/+1
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-mult...Bradley T. Hughes2009-04-202-18/+3
|\ \ \ | |/ /
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-172-18/+3
| |\ \ | | |/
| | * fix reading problem on 64-bit machines in QProcess and socket enginePeter Hartmann2009-04-161-17/+2
| | * Add a warning for trying to connectToHost() when disconnecting.Thiago Macieira2009-04-161-1/+1
| | * BT: QAbstractSocket: fix check for closing state (typo)Peter Hartmann2009-04-151-1/+1
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-mult...Bradley T. Hughes2009-04-1613-1252/+1676
|\ \ \ | |/ /
| * | BT: QAbstractSocket: fix check for closing state (typo)Peter Hartmann2009-04-151-1/+1
| * | Merge commit 'origin/4.5'Olivier Goffart2009-04-152-7/+6
| |\ \ | | |/
| | * Don't remove the cache file if you have successfully added it.Thiago Macieira2009-04-141-1/+2
| | * Fix compilation if SSL is not enabled.Thiago Macieira2009-04-071-6/+4
| * | Merge commit 'origin/4.5'Bjoern Erik Nilsen2009-04-0711-1250/+1675
| |\ \ | | |/
| | * QLocalSocket will disconnect 30 seconds after a successful delayed connectBradley T. Hughes2009-04-072-13/+16
| | * Remove inline keywords, fix compile bugIan Walters2009-04-071-3/+3
| | * Move QT_BEGIN_NAMESPACE to after the usual Qt header includesRhys Weatherley2009-04-073-8/+8
| | * De-inlined 2 functions in QHttpNetworkHeaderMarkus Goetz2009-04-061-2/+2
| | * Splitted qhttpnetworkconnection* files into individual filesMarkus Goetz2009-04-069-1237/+1659
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-mult...Bradley T. Hughes2009-04-075-86/+472
|\ \ \ | |/ /
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-061-17/+27
| |\ \ | | |/
| | * Fix QNetworkReply's automatic pushing of a cache when the cache isThiago Macieira2009-04-061-17/+27