summaryrefslogtreecommitdiffstats
path: root/src/network
Commit message (Collapse)AuthorAgeFilesLines
* QNetworkCookieJar: don't do path checking when receiving cookiesPeter Hartmann2009-11-241-3/+4
| | | | | | | | | | | | Actually, the RFC 2109 says cookies should not be stored if the path attribute is not a prefix of the request URI the cookie comes from. However, all browsers allow it anyway; with the demo browser e.g. logging in to wordpress.com was not possible. We still do path checking when sending cookies, i.e. in QNetworkCookieJar::cookiesForUrl(). Reviewed-by: Markus Goetz Task-number: QTBUG-5815
* Fix QWindowsSystemProxy::initMarkus Goetz2009-11-241-1/+4
| | | | | | | | Seems like WinHttpGetIEProxyConfigForCurrentUser can return more than one proxy even if this is not documented. Task-number: QTBUG-5981 Reviewed-by: Peter Hartmann
* QNativeSocketEngine: Compile fixMarkus Goetz2009-11-191-1/+1
| | | | Reviewed-by: Peter Hartmann
* QNAM HTTP Code: Use KeepAlive socket optionMarkus Goetz2009-11-191-0/+2
| | | | Reviewed-by: TrustMe
* 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
| | | | | | | | Over src/ tools/ examples/ and demos/
* | QTcpSocket: Fix waitForConnected on WindowsMarkus Goetz2009-11-192-7/+65
|/ | | | | | | | | The select() system call was used in the wrong way. We need to select for exceptions too. Task-number: QTBUG-5799 Reviewed-by: Aleksandar Sasha Babic <aleksandar.babic@nokia.com> Reviewed-by: Peter Hartmann
* Fix compilation without Qt3support (on Windows CE, Symbian)Simon Hausmann2009-11-161-1/+1
| | | | | | Don't use QFile's Qt3support member, use fileName() instead. Reviewed-by: Trust me
* Introduce QFileNetworkReply in QNetworkAccessManagerMarkus Goetz2009-11-134-0/+326
| | | | | | | | | | | | | The QFileNetworkReply is a wrapper around QFile that has therefore similar performance. This avoids the usage of the unperformant QNetworkAccessFileBackend. The benchmark qfile_vs_qnetworkaccessmanager shows that the QFileNetworkReply's performance is better than 0.9x of QFile compared to QNetworkAccessFileBackend which had about 0.5x of QFile. Reviewed-by: Peter Hartmann
* 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
| | | | | | | | | | | | | | | | | | | | | | | | | | The QDateTimeParser forces at least two QString allocations to convert the Month string into a integer. This makes parsing the date string the most expesnsive operation from within replyHeaderChanged. Use sscanf to parse the RFC1123 header to get a significant speedup. Use a switch case statement to convert the month name to a integer. Reviewed-By: Markus Goetz
| * QNAM: Remove some more occurences of toLower on the hot pathHolger Hans Peter Freyther2009-11-113-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | toLower will force a memory allocation, and memory allocations are certainly adding a delay. Use qstricmp were this is easily possible. This change makes headerValues et all drop out of the profile. QChar::toLower will now be called more often, specially for loops that do linear searching. In the profile with real web content this is faster than using QByteArry::toLower in the inner loop and the forced memory allocations. Reviewed-By: Markus Goetz
| * QNAM: Avoid using toLower for case insensitive comparisionHolger Hans Peter Freyther2009-11-111-12/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using qstricmp is faster on the desktop than the alloc of QByteArray::toLower and the QByteArray::operator==. QChar::toLower will now be called for the input key from within the loop. In the measurements done this is still a performance improvement over the allocation done by QByteArray::toLower. For more header values this might not be the case anymore. RESULT : tst_Loading::byteArrayTestLower(): 0.00076 msec per iteration (total: 25, iterations: 32768) RESULT : tst_Loading::byteArrayTestCompare(): 0.00028 msec per iteration (total: 37, iterations: 131072) Reviewed-By: Markus Goetz
| * QNAM HTTP Code: Start accept-language header with capital letterMarkus Goetz2009-11-101-1/+1
| | | | | | | | | | | | | | HTTP header names are case insensitive, but stick to what all browsers etc. use to work around buggy servers. Reviewed-by: TrustMe
| * 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
| | | | | | | | | | | | | | | | | | Inspired by merge request 2012 by Joel Nordell Reviewed-by: Peter Hartmann
| * | QNAM: Do not emit uploadProgress() when reply was abortedMarkus Goetz2009-11-061-0/+2
| | | | | | | | | | | | Reviewed-by: Peter Hartmann
* | | QNAM HTTP Code: Start authorization header with capital letterMarkus Goetz2009-11-101-2/+2
| |/ |/| | | | | | | | | | | | | HTTP header names are case insensitive, but stick to what all browsers etc. use to work around buggy servers. Task-number: QTBUG-5618 Reviewed-by: Peter Hartmann
* | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead than when parsing the cookie header. This corrects the bug QT-2379, happening in the following sequence: parseCookie -> setCookieUrl -> toRawForm -> parseCookie where a default domain would now also have a dot prefix, and shouldn't. QT-2379 Reviewed-by: Peter Hartmann
* | | Merge commit 'b65fd82299' from qt-core-team 4.6 into 4.6Marius Storm-Olsen2009-11-091-2/+4
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: configure.exe src/corelib/io/qfsfileengine.cpp tests/auto/qfile/tst_qfile.cpp
| * | QHostInfo: do not wait forever on cleanupPeter Hartmann2009-11-041-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | patch by Warwick Allison. On cleanup in QHostInfoAgent, we were waiting forever for the thread to terminate, which did not always succeed due to a Linux kernel bug. Now, we just wait for some time and then return anyway. Reviewed-by: Marius Storm-Olsen Task-number: QTBUG-5296
* | | 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
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | Missing % for printf variableJørgen Lind2009-11-041-2/+2
| |/ / | | | | | | | | | Reviewed-by: Friedemann Kleint <friedemann.kleint@nokia.com>
* | | 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
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qevent.cpp src/network/ssl/qsslerror.cpp
| | * | Doc/i18n: Fixed source strings for translation.David Boddie2009-11-032-3/+3
| | | | | | | | | | | | | | | | Reviewed-by: Oswald Buddenhagen
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... as described in the documentation. Furthermore: * use qt_safe_select to timeout correctly * return immediately when timeout value is 0 Reviewed-by: Oswald Buddenhagen
| | * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a timeout that occurred on Mac with the gui event dispatcher: we were waiting for a write notification, but timed out when we were in closing state and still waiting for the socket engine to complete writing. Now we close the socket anyway after 2 seconds. Reviewed-by: Thiago Macieira
| | * | | QAbstractSocket: wait with closing until all bytes have been writtenPeter Hartmann2009-10-279-7/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | only disconnect from host when all bytes have been written; i.e. not only check whether the write buffer is empty, but also check whether the socket engine has still bytes to write. This is necessary for HTTP and SOCKS5 socket engine, because they both contain an inner TCP socket which also does buffering. For the native socket engine, there is no difference with this patch. Reviewed-by: Markus Goetz Reviewed-by: Thiago Macieira
* | | | | fix canReadLine() erroneously returning trueOswald Buddenhagen2009-11-031-1/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | the indexOf() call did not consider actualReadBufferSize and thus scanned uninitialized memory for newlines. Reviewed-by: phartman
* | | | Fix LIBRARY and ICONJørgen Lind2009-10-291-2/+2
| |_|/ |/| | | | | | | | | | | | | | However, compiling with QT_NO_ICON will still not work :( Reviewed-by: tom
* | | QSslError: Actually make strings show up in the ts fileMarkus Goetz2009-10-281-29/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | I suspect because of missing quotation marks those strings were not showing up. Also, wrapping QT_TRANSLATE_NOOP inside a tr() call makes no sense. Also changed the class from QObject to QSslSocket. Task-number: QTBUG-5059 Reviewed-by: ossi
* | | QNativeSocketEngine: Actually use translationsMarkus Goetz2009-10-281-26/+26
| |/ |/| | | | | | | Task-number: QTBUG-4984 Reviewed-by: Thiago
* | QSslSocket: Add \reimp to the socket option functionsMarkus Goetz2009-10-261-0/+6
|/ | | | Reviewed-by: Thiago
* QHttp: Fix bug related to SSL and big POST dataMarkus Goetz2009-10-222-0/+31
| | | | | | | | QHttp is deprecated, but let's be nice and fix this. POST/PUT now properly works over HTTPS without buffering the whole data when it is not needed. Reviewed-by: Peter Hartmann
* QSslSocket: Trigger a SSL transmission when reading from the socket.Markus Goetz2009-10-223-0/+17
| | | | | | | | | In certain cases a SSL transfer stalled when a readBufferSize was set. This change triggers a SSL transmission when there is data on the socket waiting to be decrypted. Task-number: QTBUG-3860 Reviewed-by: Thiago
* QSslSocket: Also handle setSocketOptionMarkus Goetz2009-10-193-0/+33
| | | | | | | Handle setSocketOption and forward it to the plainSocket that QSslSocket is using internally. Reviewed-by: Thiago
* Merge branch '4.5' into 4.6Thiago Macieira2009-10-161-1/+6
|\ | | | | | | | | Conflicts: src/gui/egl/qegl_symbian.cpp
| * QNetworkProxyFactory: Never return empty list on windowsMarkus Goetz2009-10-161-1/+6
| | | | | | | | | | Task-number: Salesforce 00062670 Reviewed-by: Thiago
| * QNAM HTTP Code: Backport a fix related to aborting repliesMarkus Goetz2009-10-141-1/+4
| | | | | | | | | | | | | | | | Backport af71faf8cb2c9cbf34c408b81ce7ae1ef6c6403e from 4.6 to 4.5. Task-number: 261999 Reviewed-by: Peter Hartmann
* | Networking documentation: Small improvementMarkus Goetz2009-10-163-3/+5
| | | | | | | | | | Task-number: 262144 Reviewed-by: TrustMe
* | QSslSocket: Documentation enhancementMarkus Goetz2009-10-151-0/+7
| | | | | | | | | | | | Clarify about bytesWritten() and encryptedBytesWritten() Reviewed-by: David Boddie
* | QNAM HTTP Code: Proceed POSTing on encryptedBytesWritten()Markus Goetz2009-10-152-0/+13
| | | | | | | | | | | | ... not only on bytesWritten() Reviewed-by: Peter Hartmann
* | QHttpNetworkConnectionChannel: Limit the socket read bufferMarkus Goetz2009-10-121-0/+5
| | | | | | | | Reviewed-by: Peter Hartmann