Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-31 | 4 | -6/+40 |
|\ | |||||
| * | QSslSocket internals: abort on encountering blacklisted certificates | Peter Hartmann | 2011-03-25 | 1 | -0/+7 |
| * | QSslCertificate: report fraudulent certificates as invalid | Peter Hartmann | 2011-03-24 | 2 | -4/+31 |
| * | FTP: Only read as much as the buffer size the user provided | Markus Goetz | 2011-03-24 | 1 | -2/+2 |
* | | QSharedNetworkSession: Fix compile on AIX. | Pierre Rossi | 2011-03-22 | 1 | -0/+2 |
* | | Merge remote-tracking branch 'mainline/master' | Oswald Buddenhagen | 2011-03-22 | 3 | -1/+18 |
|\ \ | |||||
| * \ | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-03-19 | 2 | -0/+12 |
| |\ \ | |||||
| | * \ | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-03-18 | 2 | -0/+12 |
| | |\ \ | | | |/ | |||||
| | | * | Fix accidental population of the disk cache with partial content | Simon Hausmann | 2011-03-17 | 1 | -0/+7 |
| | | * | Fix disk cache interaction for range retrieval HTTP requests. | Simon Hausmann | 2011-03-17 | 1 | -0/+5 |
| * | | | Merge remote-tracking branch 'origin/master' into lighthouse-master | Jørgen Lind | 2011-03-17 | 43 | -633/+1647 |
| |\ \ \ | | |/ / | |||||
| * | | | Fix http in combination with QT_NO_NETWORKPROXY. | con | 2011-03-10 | 1 | -1/+6 |
* | | | | Fix compilation with QT_NO_ | Tasuku Suzuki | 2011-03-21 | 10 | -2/+32 |
| |/ / |/| | | |||||
* | | | Merge remote-tracking branch 'integration/qt-master-from-4.7' into HEAD | Thiago Macieira | 2011-03-16 | 2 | -5/+10 |
|\ \ \ | |||||
| * | | | QTcpSocket: Fix for disconnect in Unbuffered mode. | Markus Goetz | 2011-03-16 | 2 | -5/+10 |
| * | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2011-03-15 | 2 | -3/+25 |
| |\ \ \ | |||||
* | \ \ \ | Merge remote-tracking branch 'origin/4.7' into HEAD | Thiago Macieira | 2011-03-16 | 2 | -3/+25 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-03-15 | 1 | -1/+1 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Merge branch 'backporting-symbian-armcc-to-4.7' into s60-4.7 | axis | 2011-03-14 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * | | | Fixed include in network module on Symbian. | axis | 2011-03-04 | 1 | -1/+1 |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-03-14 | 2 | -3/+25 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | QNAM HTTP: error() in case connection is closed unexpectedly | Markus Goetz | 2011-03-14 | 1 | -1/+14 |
| | * | | | | SSL: Fix certification loading on Mac OS X 10.5 | Martin Petersson | 2011-03-14 | 1 | -2/+11 |
* | | | | | | Merge earth-team into master | Olivier Goffart | 2011-03-15 | 14 | -40/+163 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | SSL: give protocol enum SecureProtocols an own value | Peter Hartmann | 2011-03-15 | 4 | -6/+8 |
| * | | | | | SSL backend: avoid setting SNI hostname for old SSL versions | Peter Hartmann | 2011-03-14 | 2 | -2/+5 |
| * | | | | | SSL: Switch default version to TlsV1SslV3 (i.e. use TLS 1 or SSL 3) | Peter Hartmann | 2011-03-14 | 5 | -5/+8 |
| * | | | | | SSL: introduce new option TlsV1SslV3 for SSL communication | Peter Hartmann | 2011-03-14 | 3 | -1/+10 |
| * | | | | | QNAM HTTP: Pair channels with requests at a later state. | Martin Petersson | 2011-03-10 | 3 | -24/+48 |
| * | | | | | SSL backend: check at runtime for the right OpenSSL version for SNI | Peter Hartmann | 2011-03-04 | 4 | -3/+9 |
| * | | | | | QNAM HTTP: Fix the ioPostToHttpFromSocket auto test | Martin Petersson | 2011-03-04 | 3 | -7/+18 |
| * | | | | | SSL TLS extension on Symbian: work around missing symbol | Peter Hartmann | 2011-02-28 | 1 | -0/+6 |
| * | | | | | SSL: Switch default version to TLS 1.0 | Peter Hartmann | 2011-02-28 | 4 | -7/+7 |
| * | | | | | QSslSocket backend: resolve symbols for SNI for Symbian | Peter Hartmann | 2011-02-28 | 1 | -0/+3 |
| * | | | | | Add QSslSocket::setPeerVerifyName()/peerVerifyName() | David Faure | 2011-02-28 | 2 | -0/+31 |
| * | | | | | QSslSocket SNI: prefer verificationPeerName then peerName then hostName | David Faure | 2011-02-28 | 1 | -2/+5 |
| * | | | | | Add Server Name Identification (RFC4366 section 3.1) | Daniel Black | 2011-02-28 | 4 | -0/+22 |
* | | | | | | Update copyright year to 2011. | Rohan McGovern | 2011-03-10 | 6 | -6/+6 |
* | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-03-10 | 2 | -6/+17 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-03-09 | 2 | -6/+17 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | / | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-03-08 | 1 | -5/+16 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | QNetworkCookie: fix quoted values | Peter Hartmann | 2011-03-07 | 1 | -5/+8 |
| | | * | | | Fix for QTBUG-17746. Quotes is retained in cookie value | Aparna Nandyal | 2011-03-07 | 1 | -7/+15 |
| | * | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-03-08 | 1 | -1/+1 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | |||||
| | | * | | | Merge remote-tracking branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2011-03-08 | 1 | -1/+1 |
| | | |\ \ \ | |||||
| | | | * | | | Update copyright year to 2011. | Jason McDonald | 2011-01-10 | 136 | -136/+136 |
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master... | Qt Continuous Integration System | 2011-03-07 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Improve Q_GLOBAL_STATIC macors. | Jedrzej Nowacki | 2011-03-07 | 1 | -1/+2 |
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast... | Qt Continuous Integration System | 2011-03-04 | 29 | -576/+1428 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | Merge remote branch 'earth/master' into master | João Abecasis | 2011-02-28 | 29 | -576/+1428 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | |