summaryrefslogtreecommitdiffstats
path: root/src/network/kernel
Commit message (Collapse)AuthorAgeFilesLines
* NTLM code: Save domain in different variableMarkus Goetz2010-09-102-9/+31
| | | | Reviewed-by: Markus Goetz
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-09-073-15/+17
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 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-033-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Update to the NTLM code.Thiago Macieira2010-08-311-19/+37
| | | | | | | | | | | | | | | | Fixes extraction of time from the server, and saves the domain information properly. Patch by subcontractor Reviewed-by: Thiago Macieira
* | Keep the scopeid that getaddrinfo(3) returns to us.Thiago Macieira2010-08-241-1/+4
| | | | | | | | | | Task-number: QTBUG-12608, QTBUG-12243 Reviewed-by: Markus Goetz
* | Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938.Jerome Pasion2010-08-091-1/+1
| | | | | | | | | | Reviewer: David Boddie Task number: QTBUG-11938
* | Network Proxy Query: Fix memleak on OS XMarkus Goetz2010-07-161-1/+4
| | | | | | | | Task-number: QTBUG-12106
* | Autotest: add a small, boring test for QAuthenticatorThiago Macieira2010-07-151-1/+1
| |
* | Add documentation for the QAuthenticator options.Thiago Macieira2010-07-151-2/+40
| | | | | | | | | | Task-number: QT-3573 Reviewed-by: Markus Goetz
* | Expose the QAuthenticator map of options in the API.Thiago Macieira2010-07-153-3/+50
| | | | | | | | | | Task-number: QT-3573 Reviewed-By: Markus Goetz
* | Add a QAuthenticatorPrivate parsing for the headers without QHttpResponseHeaderThiago Macieira2010-07-152-13/+27
| | | | | | | | Reviewed-by: Markus Goetz
* | Fixing merge conflicts.Martin Smith2010-07-131-5/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7 Conflicts: doc/src/declarative/advtutorial.qdoc src/declarative/graphicsitems/qdeclarativeloader.cpp src/declarative/graphicsitems/qdeclarativetextedit.cpp src/declarative/qml/qdeclarativeengine.cpp src/declarative/util/qdeclarativexmllistmodel.cpp
| * | Doc: Removed links to Qt3 support in QHostAddressGeir Vattekar2010-07-121-5/+7
| | | | | | | | | | | | Task-number: QTBUG-12004
* | | Add NTLMv2 authentication support to QAuthenticator.Thiago Macieira2010-07-091-7/+279
|/ / | | | | | | | | | | | | | | | | | | This also fixes a long-standing bug in handling usernames of type "domainname\username", typical of Windows domains, that didn't work with the previous NTLMv1 code. Patch by subcontractor. Task-number: QTBUG-9408, QTBUG-2421, QT-3248 Reviewed-By: Markus Goetz
* | Network: Optimize HTTP proxy lookup on WindowsMarkus Goetz2010-07-051-5/+32
| | | | | | | | | | | | | | Only try auto config retrieval once. Patch by Kai Koehne. Task-number: QTBUG-10106
* | Merge branch '4.6-s60' into 4.7-s60axis2010-06-241-0/+14
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/3rdparty/phonon/qt7/mediaobject.mm src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/plugins/phonon/mmf/mmf.pro
| * Fix QTBUG-8687.Aleksandar Sasha Babic2010-06-181-3/+8
| | | | | | | | | | | | | | The fix is based on 9897aece975e0a4a77e0cc6b8590305baba1fccb. Task-number: QTBUG-8687 Reviewed-by: TrustMe
| * Debug prints and another attempt to fix QTBUG-8687 for N8.Aleksandar Sasha Babic2010-06-181-0/+9
| |
* | Doc: Added details of a system proxy limitation on Windows.David Boddie2010-06-071-5/+27
| | | | | | | | | | Reviewed-by: Markus Goetz Task-number: QTBUG-10106
* | Merge remote branch 'origin/4.7' into HEADOlivier Goffart2010-05-193-5/+1
|\ \ | | | | | | | | | | | | Conflicts: src/corelib/tools/qlocale_symbian.cpp
| * \ Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-05-173-5/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/demos.pro mkspecs/features/resources.prf mkspecs/features/uic.prf src/corelib/io/qurl.cpp src/corelib/tools/qlocale_symbian.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/graphicsview/qgraphicswidget_p.cpp src/gui/graphicsview/qgraphicswidget_p.h src/gui/util/qsystemtrayicon_win.cpp src/multimedia/audio/qaudioinput.cpp tests/auto/qhostinfo/qhostinfo.pro
| | * QHostInfo: Remove unused includesRitt Konstantin2010-05-053-5/+1
| | | | | | | | | | | | Reviewed-by: Markus Goetz
| | * Don't rely on tryStart() to do job control.Thiago Macieira2010-04-201-4/+2
| | | | | | | | | | | | | | | | | | | | | It may fail but threads become available the next instant. Instead, simply use our own currentLookups count. Reviewed-by: Markus Goetz
* | | doc: Fixed many broken links.Martin Smith2010-05-191-2/+2
|/ /
* | QHostInfo: Avoid one tiny copy of QHostInfo object when emittingMarkus Goetz2010-05-051-1/+1
| | | | | | | | | | | | Thanks rittk! Reviewed-by: Olivier
* | QHostInfo: Emit postponed lookup results when finishing currentMarkus Goetz2010-05-052-0/+14
| | | | | | | | Reviewed-by: Thiago
* | QHostInfo: Immediately delete aborted lookup requests.Markus Goetz2010-05-051-0/+17
| | | | | | | | Reviewed-by: Thiago
* | Don't rely on tryStart() to do job control.Thiago Macieira2010-04-261-4/+2
| | | | | | | | | | | | | | It may fail but threads become available the next instant. Instead, simply use our own currentLookups count. Reviewed-by: Markus Goetz
* | [tst_qhostinfo] Properly clean up the cache and lookup threads.Thiago Macieira2010-04-202-5/+20
| | | | | | | | | | | | Ensure that one test won't interfere with the next Reviewed-by: Markus Goetz
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-252-0/+4
|\ \ | |/ | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/symbian/symmake.cpp src/3rdparty/webkit/WebCore/WebCore.pro
| * Stop QHostInfo thread pool when application is about to exitBradley T. Hughes2010-03-222-0/+4
| | | | | | | | | | | | | | | | | | | | Ensure that the threadpool QHostInfo uses internally has cleanup its threads when the application exits. This avoids the warning from QWaitCondition on Windows (which happens due to thread termination at application exit). Task-number: QTBUG-7691 Reviewed-by: mgoetz
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-151-1/+1
|\ \ | |/ | | | | | | Conflicts: src/gui/styles/qs60style_s60.cpp
| * QHostInfo: Compile fixMarkus Goetz2010-03-081-1/+1
| | | | | | | | Reviewed-by: TrustMe
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-062-11/+182
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/multimedia/audioinput/audioinput.cpp src/corelib/io/qfsfileengine.cpp src/gui/egl/qegl_wince.cpp src/gui/egl/qeglproperties.cpp src/gui/egl/qeglproperties_p.h src/gui/embedded/directfb.pri src/gui/kernel/qapplication_win.cpp src/gui/painting/qdrawutil.cpp src/opengl/qgl_p.h src/sql/drivers/odbc/qsql_odbc.cpp src/sql/drivers/odbc/qsql_odbc.h tests/auto/auto.pro tests/auto/qgl/tst_qgl.cpp translations/assistant_adp_ru.ts
| * Document some stuff in QHostInfo and QAbstractSocketMarkus Goetz2010-03-041-0/+7
| |
| * DNS Cache: Also check inside the DNS threadsMarkus Goetz2010-03-041-6/+18
| | | | | | | | Reviewed-by: joao
| * Add DNS caching to QHostInfoMarkus Goetz2010-03-022-7/+154
| | | | | | | | | | | | By default enabled, but it can be disabled via a compile flag. Reviewed-by: Thiago
| * QHostInfo: Forgot to free some stuff on application exit.Markus Goetz2010-03-011-0/+5
| | | | | | | | Reviewed-by: TrustMe
* | Remove QObject::tr() in the network module code.Friedemann Kleint2010-02-242-2/+4
|/
* Call cheaper clear() instead of assigning new QString()Markus Goetz2010-01-281-2/+2
| | | | | Reviewed-by: joao Reviewed-by: Peter Hartmann
* Fix some foreach usage to use const refsMarkus Goetz2010-01-281-2/+2
| | | | Reviewed-by: joao
* Update copyright year to 2010Jason McDonald2010-01-0625-25/+25
| | | | Reviewed-by: Trust Me
* Change QHostInfo to use 5 parallel lookup threadsMarkus Goetz2009-12-173-194/+257
| | | | | | | | Instead of sequentially looking up and potentially taking a long time, we now do work in parallel. Reviewed-by: ogoffart Reviewed-by: lars
* 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
* 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 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
* | Fix QHostInfo IP resolution when there's no reverse for the IP.Thiago Macieira2009-10-092-50/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you try to resolve 10.3.4.6, you're probably going to get that it doesn't exist. On some systems, getnameinfo will return the IP address in string form (Linux, without NI_NAMEREQD). On some others, it will fail (Mac, Windows). So harmonise by gracefully handling the case in which getnameinfo fails. Possible behaviour change: we don't try the forward resolution any more, after completing the reverse one. Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
* | API review: change function name to setUseSystemConfiguration.Thiago Macieira2009-10-062-3/+3
| | | | | | | | Requested-By: Volker Hilsheimer
* | Fix tr-Errors/remove QObject::tr(), mainly in ScriptToolsFriedemann Kleint2009-09-291-1/+1
| | | | | | | | | | | | Note: Those messages are to be translated in Qt 4.6 for the first time. Reviewed-by: Kent Hansen <khansen@trolltech.com>