summaryrefslogtreecommitdiffstats
path: root/src/network
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * QHttpSocketEngine: Remove unneeded codeMarkus Goetz2010-01-062-18/+4
| * QAbstractSocket: Fix warnings when compiling with QABSTRACTSOCKET_DEBUGMarkus Goetz2010-01-061-9/+9
| * QAbstractSocket: Warn when wrong QHostInfo was receivedMarkus Goetz2010-01-061-0/+4
* | Merge branch '4.6'Thiago Macieira2009-12-265-197/+260
|\|
| * Change QHostInfo to use 5 parallel lookup threadsMarkus Goetz2009-12-173-194/+257
| * Doc: fix typoVolker Hilsheimer2009-12-171-1/+1
| * QNAM Code: Do not re-abort or continue processing notifications.Markus Goetz2009-12-141-2/+2
* | Merge commit 'origin/4.6'Olivier Goffart2009-12-151-1/+3
|\|
| * Fix compilation if QT_NO_DATESTRING is defined.Thiago Macieira2009-12-101-0/+3
* | Added missing include file.jasplin2009-12-151-0/+1
* | Move data: decoding to functionThorvald Natvig2009-12-021-47/+15
* | Merge branch '4.6'Thiago Macieira2009-11-2516-52/+516
|\|
| * QNetworkCookieJar: don't do path checking when receiving cookiesPeter Hartmann2009-11-241-3/+4
| * Fix QWindowsSystemProxy::initMarkus Goetz2009-11-241-1/+4
| * QNativeSocketEngine: Compile fixMarkus Goetz2009-11-191-1/+1
| * QNAM HTTP Code: Use KeepAlive socket optionMarkus Goetz2009-11-191-0/+2
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-192-8/+8
| |\
| | * Ran the script utils/normalizeOlivier Goffart2009-11-182-8/+8
| * | QTcpSocket: Fix waitForConnected on WindowsMarkus Goetz2009-11-192-7/+65
| |/
| * Fix compilation without Qt3support (on Windows CE, Symbian)Simon Hausmann2009-11-161-1/+1
| * Introduce QFileNetworkReply in QNetworkAccessManagerMarkus Goetz2009-11-134-0/+326
| * Merge commit 'coreteam/4.6' into oslo1-4.6Marius Storm-Olsen2009-11-136-32/+106
| |\
| | * QNAM: Parse RFC1123 directly and don't go through QLocaleHolger Hans Peter Freyther2009-11-111-8/+74
| | * QNAM: Remove some more occurences of toLower on the hot pathHolger Hans Peter Freyther2009-11-113-8/+6
| | * QNAM: Avoid using toLower for case insensitive comparisionHolger Hans Peter Freyther2009-11-111-12/+11
| | * QNAM HTTP Code: Start accept-language header with capital letterMarkus Goetz2009-11-101-1/+1
| | * Merge branch '4.6' into core-4.6Thiago Macieira2009-11-098-15/+29
| | |\
| | * | QNAM HTTP Code: Also send our locale name as accept-languageMarkus Goetz2009-11-091-4/+13
| | * | QNAM: Do not emit uploadProgress() when reply was abortedMarkus Goetz2009-11-061-0/+2
* | | | QNAM: Add direct access to the RawHeaderHolger Hans Peter Freyther2009-11-112-0/+9
|/ / /
* | / QNAM HTTP Code: Start authorization header with capital letterMarkus Goetz2009-11-101-2/+2
| |/ |/|
* | Merge commit 'qtwebkit/qtwebkit-4.6' into 4.6Jocelyn Turcotte2009-11-092-4/+11
|\ \
| * | QNetworkCookie: Add the dot prefix of the domain while adding to the jarJocelyn Turcotte2009-11-092-4/+11
* | | Merge commit 'b65fd82299' from qt-core-team 4.6 into 4.6Marius Storm-Olsen2009-11-091-2/+4
|\ \ \ | | |/ | |/|
| * | QHostInfo: do not wait forever on cleanupPeter Hartmann2009-11-041-2/+4
* | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-063-7/+13
|\ \ \ | | |/ | |/|
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Jørgen Lind2009-11-052-5/+11
| |\ \
| | * | Doc: Fixed qdoc warnings.David Boddie2009-11-042-5/+11
| * | | Missing % for printf variableJørgen Lind2009-11-041-2/+2
| |/ /
* | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-0414-28/+94
|\| |
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6David Boddie2009-11-032-3/+3
| |\ \
| | * | Doc/i18n: Fixed source strings for translation.David Boddie2009-11-032-3/+3
| * | | Merge commit 'e4bec39a139363d1ee4cf3fb15a3fe4499215e77' into 4.6Thiago Macieira2009-11-0212-25/+91
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch '4.6' into core-4.6Thiago Macieira2009-10-292-55/+54
| | |\ \
| | * | | QLocalServer: block indefinitely when timeout value is -1Peter Hartmann2009-10-281-16/+6
| | * | | Merge remote branch 'origin/4.6' into core-4.6Thiago Macieira2009-10-281-0/+6
| | |\ \ \ | | | | |/ | | | |/|
| | * | | QAbstractSocket: insert timer to prevent timeoutPeter Hartmann2009-10-273-2/+30
| | * | | QAbstractSocket: wait with closing until all bytes have been writtenPeter Hartmann2009-10-279-7/+55