summaryrefslogtreecommitdiffstats
path: root/src/network
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-251-1/+1
|\
| * Fixed many spelling errors.Rohan McGovern2010-10-251-1/+1
| |
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-254-17/+50
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: demos/declarative/snake/snake.qml qmake/generators/symbian/symbiancommon.cpp src/network/access/qnetworkaccessmanager.cpp src/s60installs/s60installs.pro tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * 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
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-071-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msbuild_objectmodel.h qmake/generators/win32/msvc_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp src/corelib/arch/qatomic_arm.h tests/auto/qglthreads/tst_qglthreads.cpp
| * | 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
* | QNAM: Compile fix for Symbian.. hopefully.Markus Goetz2010-10-061-0/+2
| |
* | QNAM: Move out function calls to new variableMarkus Goetz2010-10-051-2/+3
| |
* | QNAM: Remove QNetworkAccessDataBackendMarkus Goetz2010-10-053-130/+1
| | | | | | | | The QNetworkReplyDataImpl is now used instead.
* | QNAM: Fix usage of toString of QUrlMarkus Goetz2010-10-051-1/+1
| | | | | | | | Reviewed-by: Thiago Macieira
* | QNAM: New specialized QNetworkReply for data: URLsMarkus Goetz2010-10-054-0/+252
| | | | | | | | | | | | | | | | | | | | | | Implement a QNetworkReplyDataImpl for data: URLs. This avoids having the overhead of a special backend class of QNetworkReplyImpl. Also move the instantiation to the begin of QNAM::createRequest() so no network sesssion is needed. Reviewed-by: Thiago Macieira Reviewed-by: Peter Hartmann
* | QNAM: Rename QFileNetworkReply to QNetworkReplyFileImplMarkus Goetz2010-10-054-35/+35
| | | | | | | | | | | | | | | | This name is more intuitive since that class lives on the same level as QNetworkReplyImpl and not on the lower level like QHttpNetworkReply Reviewed-by: Peter Hartmann
* | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-043-10/+34
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: doc/src/snippets/code/doc_src_qmake-manual.qdoc src/corelib/arch/symbian/arch.pri src/declarative/graphicsitems/qdeclarativeflickable.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h tests/auto/qfontmetrics/tst_qfontmetrics.cpp
| * 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
* | QNAM: Build fix for -qtnamespaceMarkus Goetz2010-09-291-2/+2
| |
* | QNAM: More zerocopy changesMarkus Goetz2010-09-293-23/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | The zerocopy download buffer is now QSharedPointer<char> instead of the QSharedPointer to QVarLengthArray<char>. This will be a bit leaner to handle by QML and QtWebKit and does not tie us to a QVLA that much. Also fix some bugs related to signal emissions and the return value of bytesAvailable(). Now the behaviour should be the same if a zerocopy buffer is used or not. Reviewed-by: Peter Hartmann Reviewed-by: Thiago Macieira
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-284-27/+17
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/gui/painting/qrasterizer.cpp src/network/access/qnetworkaccessmanager.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/mainwindow.cpp
| * 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
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-215-11/+37
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.h src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativeflickable_p_p.h src/declarative/util/qdeclarativelistmodel.cpp
| * 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 remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-1011-185/+245
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt demos/declarative/snake/content/snake.js demos/declarative/snake/snake.qml doc/src/development/qmake-manual.qdoc src/corelib/plugin/plugin.pri src/gui/kernel/qapplication_win.cpp src/gui/kernel/qdesktopwidget_win.cpp src/gui/painting/qdrawhelper.cpp tests/auto/qdir/tst_qdir.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf
| * 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
| | * | QSslSocket: fix security vulnerability with wildcard IP addressesPeter Hartmann2010-08-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes Westpoint Security issue with Advisory ID#: wp-10-0001. Before, we would allow wildcards in IP addresses like *.2.3.4 ; now, IP addresses must match excatly. Patch-by: Richard J. Moore <rich@kde.org> Task-number: QT-3704
| | * | fix build for -no-qt3supportPeter Hartmann2010-08-101-2/+2
| | | | | | | | | | | | | | | | | | | | QString::lower() is QT3_SUPPORT, the correct method is QString::toLower().
| | * | Fix handling of SSL certificates with wildcard domain namesRichard J. Moore2010-08-102-4/+39
| | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 731 Task-number: QTBUG-4455 Reviewed-by: Peter Hartmann
| | * | QSslSocket: Improve error handlingPeter Hartmann2010-07-131-1/+13
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Markus Goetz Task-number: QT-3567
| * | | Destroy QNetworkConfigurationManager global static from qApp dtor.Aaron McCarthy2010-09-011-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The order of global static destruction is not well defined. Ensure that the QNetworkConfigurationManager global static is destroyed from the QCoreApplication destructor before its dependencies are destroyed with the rest of the global statics. Task-number: QTBUG-13304
| * | | 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
| * | | QNetworkAccessManager doc: add since tag for added enumPeter Hartmann2010-08-311-1/+1
| | |/ | |/|
| * | QSslConfiguration: fix crash when accessing null pointerPeter Hartmann2010-08-301-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | We were accessing the d-pointer of a QSslConfiguration which is initialized lazily. Reviewed-by: Markus Goetz Task-number: QTBUG-13265
* | | Don't ignore interfaces that cannot multicast when querying the mcast ifaceBradley T. Hughes2010-09-011-2/+0
| | | | | | | | | | | | | | | If getsockopt() returns an address for an interface that doesn't advertise that it can multicast, don't second guess the OS, just return the iface.
generated by cgit v0.12 at 2025-01-04 10:58:08 (GMT)