summaryrefslogtreecommitdiffstats
path: root/src/network
Commit message (Collapse)AuthorAgeFilesLines
* QNAM: Reset authenticator state properly between requestsMarkus Goetz2010-11-032-3/+14
| | | | | | | Reset authenticator and fix operator=(...) of QAuthenticator. Task-number: QTBUG-6792 Reviewed-by: ogoffart
* QNAM: Fix doc rendering of QNetworkRequestMarkus Goetz2010-10-291-10/+0
| | | | Reviewed-by: Morten Engvoldsen
* Network code: Fix code comment spellchecking errors.Markus Goetz2010-10-284-4/+4
| | | | | | Me no speak americano. Reviewed-by: Peter Hartmann
* QNAM: fix buildPeter Hartmann2010-10-271-1/+5
| | | | | | | | * winsock2.h conflicts with qplatformdefs.h * ifndef QT_NO_OPENSSL was missing Reviewed-by: Prasanth Reviewed-by: Markus Goetz
* QNAM HTTP: Remove the error() of QHttpNetworkConnectionMarkus Goetz2010-10-275-29/+9
| | | | | | | | Removed the distinction between reply error and connection error. The QNetworkAccessManager was treating them the same way anyway. Reviewed-by: Prasanth Task-Number: QTBUG-13234
* QNAM HTTP: Remove enableEncryption()Markus Goetz2010-10-272-8/+0
| | | | | Reviewed-by: Prasanth Task-Number: QTBUG-13234
* QNAM HTTP: Remove unused codeMarkus Goetz2010-10-273-42/+0
| | | | | Reviewed-by: Prasanth Task-Number: QTBUG-13234
* QNAM HTTP: Move authenticationRequired() to QHttpNetworkReplyMarkus Goetz2010-10-275-11/+7
| | | | | Reviewed-by: Prasanth Task-Number: QTBUG-13234
* QNAM HTTP: Move proxyAuthenticationRequired() to QHttpNetworkReplyMarkus Goetz2010-10-274-13/+9
| | | | | Reviewed-by: Prasanth Task-Number: QTBUG-13234
* QNAM HTTP: Move cacheCredentials() to QHttpNetworkReplyMarkus Goetz2010-10-274-5/+4
| | | | | Reviewed-by: Prasanth Task-Number: QTBUG-13234
* QNAM HTTP: Use sslErrors() from QHttpNetworkReplyMarkus Goetz2010-10-275-8/+10
| | | | | Reviewed-by: Prasanth Task-Number: QTBUG-13234
* QNAM HTTP: Remove Wait4AuthStateMarkus Goetz2010-10-273-8/+1
| | | | | Reviewed-by: Prasanth Task-Number: QTBUG-13234
* QNAM: Internal function renamingMarkus Goetz2010-10-273-10/+10
| | | | | Reviewed-by: Prasanth Task-Number: QTBUG-13234
* QNAM HTTP: Internal variable spelling mistakesMarkus Goetz2010-10-273-12/+12
| | | | | Reviewed-by: Prasanth Task-Number: QTBUG-13234
* QNAM HTTP: Pause connection when emitting proxy auth signalMarkus Goetz2010-10-271-0/+4
| | | | | | | | | Pause the socket notifiers because the user could be displaying a dialog which makes the event loop run and could make our socket notifiers fire. Reviewed-by: Prasanth Task-Number: QTBUG-13234
* QNAM HTTP: Also pause connection when emitting sslErrors()Markus Goetz2010-10-271-0/+4
| | | | | | | | | | Pause the socket notifiers because the user could be displaying a dialog which makes the event loop run and could make our socket notifiers fire. Reviewed-by: Peter Hartmann Reviewed-by: Prasanth Task-Number: QTBUG-13234
* QNAM HTTP: Also resume uploads after connection pauseMarkus Goetz2010-10-271-3/+4
| | | | | | Reviewed-by: Peter Hartmann Reviewed-by: Prasanth Task-Number: QTBUG-13234
* QNAM HTTP: Process authenticationRequired() from HTTP properlyMarkus Goetz2010-10-274-7/+10
| | | | | | | | | Fixes a bug where a different QNetworkReply(Impl) handles an authentication request. Reviewed-by: Peter Hartmann Reviewed-by: Prasanth Task-Number: QTBUG-13234
* QNAM HTTP: Pause sockets while emitting to user code.Markus Goetz2010-10-272-41/+56
| | | | | | | | | | | This is needed because user code might display a dialog which spins an event loop and could make the sockets readyRead() fire. This event loop recursion is not desired as it can lead to nasty bugs when the state is messed up. Reviewed-by: Peter Hartmann Reviewed-by: Prasanth Task-Number: QTBUG-13234
* QNAM HTTP: Do not copy around credentials when using NTLMMarkus Goetz2010-10-271-0/+7
| | | | | | | | Copying the username and password messes up the state inside the QAuthenticator. Do not do it. Reviewed-by: Prasanth Task-Number: QTBUG-13234
* QNAM HTTP: Move caching of credentials from URLMarkus Goetz2010-10-272-6/+6
| | | | | | | | The credentials are now cached when the request gets sent. Reviewed-by: Peter Hartmann Reviewed-by: Prasanth Task-Number: QTBUG-13234
* QNAM: Do not load credentials from cache prematurelyMarkus Goetz2010-10-271-11/+5
| | | | | | | | The credentials shall only be loaded on demand, e.g. after the HTTP code emits authenticationRequired() Reviewed-by: Prasanth Task-Number: QTBUG-13234
* QAuthenticator: Fix NTLMv2 credential caching of QNAMMarkus Goetz2010-10-272-6/+9
| | | | | | | | | | QNetworkAccessManager used the user() function for caching the credentials when doing HTTP authentication with NTLMv2. For that to work it needs to return the same value as was put in with setUser(). Reviewed-by: Peter Hartmann Reviewed-by: Prasanth Task-Number: QTBUG-13234
* Sockets: Private function for pausing/resuming notifiersMarkus Goetz2010-10-274-0/+53
| | | | | | | | | | This will be used by QNAM to prevent event loop recursion while emitting signals that often spin an event loop, e.g. authenticationRequired() displaying a dialog for the user. Reviewed-by: Peter Hartmann Reviewed-by: Prasanth Task-Number: QTBUG-13234
* Fixed many spelling errors.Rohan McGovern2010-10-251-1/+1
|
* Fix crash on exit.Aaron McCarthy2010-10-191-8/+30
| | | | | | | | | If QNetworkConfigurationManager is deleted from the QApplication destructor it will be deleted after QNetworkConfigurationManagerPrivate global static (which is also deleted by QApplication). Fixed by testing if connManager() returns 0 before use. Task-number: QTBUG-14447
* QNAM HTTP: Fix error signal emission for unreachable IPsMarkus Goetz2010-10-151-2/+12
| | | | | | | This commit fixes getFromUnreachableIp() Reviewed-by: Thiago Macieira Task-Number: QTBUG-10679
* QNAM: Do not need QNetworkSession for data://Markus Goetz2010-10-141-0/+16
| | | | | | | This was already fixed in 4.8, this is a hotfix for 4.7 Task-Number: QT-4096 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* Merge commit 'doc-team/4.7' into 4.7Morten Engvoldsen2010-10-071-3/+4
|\
| * Doc: Fix broken links in QSslConfigurationGeir Vattekar2010-10-061-3/+4
| | | | | | | | | | Task-number: QTBUG-14213 Reviewed-by: David Boddie
* | Merge commit 'doc-team/4.7' into 4.7Morten Engvoldsen2010-10-061-4/+4
|\ \ | |/
| * doc: Changed \i to \e.Martin Smith2010-10-041-4/+4
| | | | | | | | | | | | Don\t use \i for italics. Use \e. Task: QTBUG-14133
* | Make the OpenSSL library search also hit /lib.Thiago Macieira2010-10-011-1/+1
|/ | | | | Task-number: http://bugs.meego.com/show_bug.cgi?id=7777 Reviewed-by: Markus Goetz
* QSslSocket speed up loading of system certificates on Unix (not Mac)Peter Hartmann2010-09-282-9/+30
| | | | | | | | | | ... by only reading in a certificate once. Before, we were adding all files from all directories; since they often contained symlinks, the same certificate was added several times. Reviewed-by: Markus Goetz Reviewed-by: Thiago Macieira Task-number: QTBUG-14013
* Insert the result of QHostInfo::fromName into the hostinfo cache, too.David Faure2010-09-281-1/+4
| | | | | | | | | | | | This way both synchronous and asynchronous lookups are cached, resulting in more reliable behavior: this issue was detected by kde's ktcpsockettest where state() was sometimes HostLookupState and sometimes ConnectedState, depending on whether the previous lookups were done by the thread or by the blocking lookup in QAbstractSocket::waitForConnected. Merge-request: 829 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com> Reviewed-by: Markus Goetz
* Moved the partial deployment section to qbase.pri.axis2010-09-271-15/+0
| | | | | | This way it will be available to all modules, not just selected ones. RevBy: Miikka Heikkinen
* QHostInfo: Fix a crash when a new request is pushed while resolving.Jocelyn Turcotte2010-09-261-8/+11
| | | | | | | The loop looking for posponedLookup in the lookup thread wasn't locking the mutex before trying to access/modify the list. Reviewed-by: Andreas Kling
* QNAM: Use QFileNetworkReply for qrc:/ URL schemaMisha Tyutyunik2010-09-222-3/+6
| | | | | | | Resources do not need network access and can be quicker loaded with QFileNetworkReply. Reviewed-by: Markus Goetz
* Fix one hang of QNAM on Symbian.Jocelyn Turcotte2010-09-201-2/+2
| | | | | | | | | | This one happened especially more often on amazon.de. While one channel was taken by one request, but postponed because it was still in disconnecting mode, another request would come, pick the same channel, and overwrite the request/reply assignment of this channel. The first request would be left unhandled eternally. Reviewed-by: Markus Goetz
* Fix compile warnings.Friedemann Kleint2010-09-141-0/+1
| | | | Reviewed-by: Thomas Hartmann <thomas.hartmann@nokia.com>
* Fix memory leaks and valgrind errors.Aaron McCarthy2010-09-131-0/+3
|
* NTLM code: Save domain in different variableMarkus Goetz2010-09-102-9/+31
| | | | Reviewed-by: Markus Goetz
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-092-134/+136
|\ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Editable QComboBox popup immediately closes itself after a click Change RLibrary handle in QS60PluginResolver to be process wide Cursor is misplaced in the editors text area QSslSocketPrivate::systemCaCertificates() hangs sometimes on Symbian
| * QSslSocketPrivate::systemCaCertificates() hangs sometimes on SymbianJuha Turunen2010-09-092-134/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch fixes the hanging issues on some Symbian devices that occurs while retrieving certificates from the Symbian certificate store. The hanging was caused by the certificate info array not being closed before exiting the thread. This alone wouldn't make the existing implementation work, so the patch replaces it with a pure Symbian style implementation which doesn't seem to be affected (probably some OpenC threads issue). Merge-request: 808 Reviewed-by: Shane Kearns Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Task: QTBUG-13033
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-081-6/+0
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits) Work around a compiler bug on 64-bit. Fix handling of braces/no-braces in QUrl::host / setHost. Changes (and minor corrections) to QByteArray documentation. QtWebKit: Update tag files to match the same content on qtwebkit.git QtWebKit: Downstream patch 2 fixing a crash on MSVC 64bit. QtWebKit: Downstream patch 1 fixing a crash on MSVC 64bit. uic: Fix compile breakage in case QT_NO_QT3_SUPPORT. uic: Improve messages. Tools (uic/rcc): Improve warning messages. QDir: Removed checks for existance of fileEngine QDir and QFileInfo shouldn't lose properties when detaching Another bug-o introduced in fixing QDirPrivate refactoring Reverting QDir::detach introduced earlier QFileInfo: Prepare for engine-less implementation Removed QFileInfoPrivate::initFileEngine Simplify QDir::cd QDir::makeAbsolute could self-destruct on failure QDir::operator= simplification QDirPrivate refactoring QDirPrivate refactoring ...
| * Merge commit 'refs/merge-requests/2464' of git://gitorious.org/qt/qt into ↵David Boddie2010-09-081-6/+0
| |\ | | | | | | | | | integration
| | * Correct QNetworkReply::downloadProgress and uploadProgress docsJohn Brooks2010-09-011-6/+0
| | | | | | | | | | | | | | | The signal provides qint64, which cannot be connected to QProgressBar::setValue(int).
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-09-074-24/+44
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/Makefile.win32 src/corelib/io/qfsfileengine_win.cpp src/corelib/kernel/qeventdispatcher_win.cpp src/gui/dialogs/qfiledialog_win.cpp src/gui/inputmethod/qcoefepinputcontext_s60.cpp src/gui/text/qfontdatabase_win.cpp src/gui/util/qsystemtrayicon_win.cpp src/script/utils/qscriptdate.cpp tests/auto/qinputcontext/tst_qinputcontext.cpp tests/auto/qscriptengine/tst_qscriptengine.cpp
| * | Ensure that we load system libraries from the correct location.Jan-Arve Sæther2010-09-034-24/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a security hole that has been there for a while, but the public awareness have recently rised so the threat is more imminent now. The solution is to fix all places where we dynamically load system libraries. More specifically, we now load all system libraries with an absolute path that points to a library in the system directory (usually c:\windows\system32). We therefore introduce a small class named QSystemLibrary that only loads libraries located in the system path. This shares some of the API with QLibrary (in order to make the patch as small as possible). We don't fix QLibrary due to risk of regressions. In addition, applications can fix the code that calls QLibrary themselves. The problem does not apply to Windows CE, since the search order is documented as not searching in the current directory. However, it touches some CE-specific code - therefore QSystemLibrary is sometimes used on WinCE (however, it will just do a normal LoadLibrary() since its safe anyway). This change does not affect the testability plugin (it is not clearly documented where that plugin is located, and the plugin should never be used in production code anyway) Loading OpenSSL libraries The ssl libraries are handled specially, and searched in this order (we cannot expect them to always be in the system folder): 1. Application path 2. System libraries path 3. Trying all paths inside the PATH environment variable Task-number: QT-3825 Reviewed-by: Thiago Macieira Reviewed-by: Peter Hartmann
| * | QNAM HTTP: Fix crash related to aborted uploadsMarkus Goetz2010-08-122-1/+5
| | | | | | | | | | | | Task-number: QTBUG-12285