summaryrefslogtreecommitdiffstats
path: root/src/network
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-195-49/+70
|\
| * QNAM HTTP: Clean code a bitMarkus Goetz2010-02-182-29/+45
| * QNAM HTTP: Always set channel.reply to 0 when doneMarkus Goetz2010-02-185-22/+27
* | Merge remote branch 'origin/4.6' into integration-master-from-4.6Rohan McGovern2010-02-181-1/+1
|\ \ | |/
| * HTTP backend: remove commentPeter Hartmann2010-02-171-1/+1
* | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-188-29/+108
|\ \
| * | Revert "remove -lz from OPENSSL_LIBS so as to respect qt-zlib"Mark Brand2010-02-171-6/+0
| * | remove -lz from OPENSSL_LIBS so as to respect qt-zlibMark Brand2010-02-171-0/+6
| * | QNAM HTTP: More micro optimization in QHttpNetworkRequestMarkus Goetz2010-02-171-3/+7
| * | QNAM HTTP: Some micro optimization in QHttpNetworkRequestMarkus Goetz2010-02-171-9/+16
| * | QNAM HTTP: Trivial optimizationMarkus Goetz2010-02-171-13/+12
| * | QNetworkAccessManager: add method to send custom requestsPeter Hartmann2010-02-168-6/+75
* | | Merge branch '4.6' into qt-master-from-4.6Thiago Macieira2010-02-174-31/+59
|\ \ \ | |/ / |/| / | |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-162-7/+21
| |\
| | * QLocalSocket::isValid on Windows must check for broken connectionJoerg Bornemann2010-02-161-1/+4
| | * fix pipe handle leak in qlocalsocket_win.cppJoerg Bornemann2010-02-162-6/+17
| * | QNAM HTTP: Unify socket EOF handling a bitMarkus Goetz2010-02-162-24/+38
| |/
* | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-131-1/+1
|\ \ | |/
| * doc: Fixed several typos.Martin Smith2010-02-121-1/+1
* | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-124-34/+65
|\ \ | |/
| * QNAM HTTP: Optimize detectPipeliningSupport()Markus Goetz2010-02-111-7/+7
| * QNAM HTTP: Set channel to IdleState at better placeMarkus Goetz2010-02-111-3/+3
| * QNAM HTTP: Forgot to remove a qDebug()Markus Goetz2010-02-091-1/+1
| * QNAM HTTP: Reserve bytes for HTTP parsingMarkus Goetz2010-02-091-0/+12
| * QNetworkCookie(Jar): fix includesPeter Hartmann2010-02-092-2/+2
| * QNAM HTTP: Improve readHeader() of the HTTP replyMarkus Goetz2010-02-091-11/+25
| * QNAM HTTP: Improve parseStatus() of HTTP replyMarkus Goetz2010-02-091-10/+12
| * QNAM HTTP: Fix issue with some serversMarkus Goetz2010-02-091-2/+5
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-042-3/+23
|\ \
| * | doc: Fixed some qdoc warnings.Martin Smith2010-02-042-3/+23
* | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-044-10/+36
|\ \ \ | |/ / |/| / | |/
| * QTcpServer: Clarify thread affinity of incoming QTcpSocketMarkus Goetz2010-02-031-0/+9
| * QNAM HTTP: Fix bug related to re-sending a requestMarkus Goetz2010-02-033-10/+27
* | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-0116-51/+80
|\ \ | |/
| * Call cheaper clear() instead of assigning new QString()Markus Goetz2010-01-284-19/+19
| * Fix some foreach usage to use const refsMarkus Goetz2010-01-285-6/+6
| * Core classes, examples, demos: Some changes from string to charMarkus Goetz2010-01-282-3/+3
| * QNativeSocketEngine: Set OS error strings on failed read()Markus Goetz2010-01-253-4/+7
| * QNativeSocketEngine: Also handle unknown errors from socket engineMarkus Goetz2010-01-251-0/+5
| * QFileNetworkReply: Use a QFileEngineMarkus Goetz2010-01-252-19/+38
| * QNativeSocketEngine_win: Don't mess with linger settingsMarkus Goetz2010-01-251-2/+4
* | Merge commit 'oslo1/master' into oslo1-masterRohan McGovern2010-02-014-48/+71
|\ \
| * \ Merge branch '4.6'Thiago Macieira2010-01-216-71/+73
| |\ \
| * \ \ Merge branch '4.6'Thiago Macieira2010-01-182-4/+1
| |\ \ \
| * \ \ \ Merge branch '4.6'Thiago Macieira2010-01-13136-208/+317
| |\ \ \ \
| * | | | | QNAM: Add priority to the API and use it for HTTPHolger Hans Peter Freyther2010-01-123-1/+56
| * | | | | Merge branch '4.6'Thiago Macieira2010-01-083-27/+17
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-12-265-197/+260
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge commit 'origin/4.6'Olivier Goffart2009-12-151-1/+3
| |\ \ \ \ \ \ \
| * | | | | | | | Added missing include file.jasplin2009-12-151-0/+1