summaryrefslogtreecommitdiffstats
path: root/src/network
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.5'Marius Storm-Olsen2009-06-303-5/+11
|\
| * QNetworkAccessManager stuff: Some fixes for coverityMarkus Goetz2009-06-293-6/+13
* | QNAM HTTP Code: Properly use the QRingBuffer for some kind of data.Markus Goetz2009-06-293-28/+75
* | Fix bad mergesBradley T. Hughes2009-06-261-1/+1
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-262-0/+35
|\ \
| * \ Merge branch '4.5'Thiago Macieira2009-06-262-0/+35
| |\ \ | | |/
| | * QNetworkReplyImpl: Protect against recursive event loopsMarkus Goetz2009-06-252-2/+39
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-264-25/+61
|\ \ \ | |/ /
| * | QNAM HTTP Code: Prepare for download performance improvementsMarkus Goetz2009-06-254-9/+27
| * | QNAM HTTP Code: Uncluttering functionsMarkus Goetz2009-06-253-18/+36
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-243-7/+0
|\ \ \ | |/ /
| * | QNAM: Removed some dead codeMarkus Goetz2009-06-243-7/+0
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-231-0/+14
|\ \ \ | |/ /
| * | QNetworkDiskCache: add code snippets in documentationPeter Hartmann2009-06-221-0/+14
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-222-4/+4
|\ \ \ | |/ /
| * | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-191-3/+2
| |\ \ | | |/
| | * QNetworkAccessManager: Clarify doc about deleting QNetworkReplyMarkus Goetz2009-06-181-3/+2
| * | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-181-1/+2
| |\ \ | | |/
| | * QNAM HTTP code: Do not close TCP connection in all casesMarkus Goetz2009-06-181-1/+2
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-189-39/+57
|\ \ \ | |/ /
| * | QNAM: More comments, some renamingsMarkus Goetz2009-06-177-34/+50
| * | QNAM: Added comment to de-confuse myselfMarkus Goetz2009-06-171-0/+1
| * | QSslCertificate: Doc fixMarkus Goetz2009-06-171-3/+4
| * | QIoDevice and QAbstractSocket: Clarify doc about waitForReadyRead()Markus Goetz2009-06-171-2/+2
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-17127-269/+292
|\ \ \ | |/ /
| * | QNAM: Use QTcpSocket for HTTP if no encryption was requestedMarkus Goetz2009-06-171-9/+26
| * | Merge license header changes from 4.5Volker Hilsheimer2009-06-16127-255/+255
| |\ \ | | |/
| | * Update license headers as requested by the marketing department.Jason McDonald2009-06-16127-254/+254
| | * Fix wrong comparator in QSslCertificatePrivate::QByteArray_from_X509Markus Goetz2009-06-151-1/+1
| * | QSslCertificate: lazy loading of some dataMarkus Goetz2009-06-161-5/+11
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBjørn Erik Nilsen2009-06-121-3/+5
| |\ \
| | * | QHttp: Class made obsolete, changed module QDoc.Markus Goetz2009-06-121-3/+5
| * | | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-126-3/+60
| |\ \ \ | | |/ / | |/| / | | |/
| | * QSslSocket: Wrong warning message in startServerEncryptionMarkus Goetz2009-06-101-1/+1
| | * Make it possible to compile Qt 4.5 SSL support with OpenSSL 1.0.0Bernhard Rosenkraenzer2009-06-095-2/+59
| * | Allow a maximum of 6 simultaneous HTTP connections to a server.Prasanth Ullattil2009-06-122-18/+21
* | | Merge of masterBradley T. Hughes2009-06-159-24/+86
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-124-33/+26
|\ \ \ | |/ /
| * | QHttpNetworkConnection: Removed an unnecessary/dead checkMarkus Goetz2009-06-113-16/+12
| * | QHttpNetworkConnection: Some renamingsMarkus Goetz2009-06-112-17/+14
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-085-3/+37
|\ \ \ | |/ /
| * | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-082-1/+6
| |\ \ | | |/
| | * Doc typo fix in QSslSocketMarkus Goetz2009-06-081-1/+1
| | * Set the error to be HostUnreacheable if WSAEHOSTUNREACH is recievedAndy Shaw2009-06-081-0/+5
| * | QNetworkAccessManager: forgot the "since" tag in my previous commitPeter Hartmann2009-06-051-0/+2
| * | add HTTP DELETE support to Network Access APIPeter Hartmann2009-06-053-2/+29
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-053-3/+4
|\ \ \ | |/ /
| * | Compile when -no-qt3-support is on.Sarah Smith2009-06-051-0/+1
| * | All of Qt's own code compiles with -pedantic now (but pcre and webkit don't s...David Faure2009-06-041-1/+1
| * | Merge commit 'origin/4.5'Olivier Goffart2009-06-041-2/+2
| |\ \ | | |/