summaryrefslogtreecommitdiffstats
path: root/src/network
Commit message (Collapse)AuthorAgeFilesLines
* QSslSocketPrivate::systemCaCertificates() hangs sometimes on Symbianv4.7.0Juha Turunen2010-09-102-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 (cherry picked from commit 5342be5ceffc84b56476fff57dd7d5e1bbfeb471)
* Add exception barrier to QCertificateRetriever::RunL()Shane Kearns2010-09-102-3/+9
| | | | | | | | This translates stl exceptions into Symbian OS Leaves, to prevent an assertion failure in the active scheduler. Reviewed-by: mread (cherry picked from commit 4f8ec542b123399574d2e509fa99f4bd66a34e25)
* Change to commercial license headers in preparation for release.Jason McDonald2010-09-07151-1963/+1963
| | | | Reviewed-by: Trust Me
* Better fix for d524da81ee257a6bd67d32d0bc870280a7d5b8a4.Aaron McCarthy2010-09-062-9/+8
| | | | | Wrap new APIs in ifndef QT_MOBILITY_BEARER. (cherry picked from commit 7e4807fed07e4c96086af00338601223b3353d29)
* compilation with QT_NO_DEPRECATEDJason McDonald2010-09-061-0/+2
| | | | | | | | | Reviewed-by: Andreas Kling (cherry picked from commit 033b53a02fb02c5aec412e3d87ad9661110c6e6e) Conflicts: src/network/bearer/qnetworkconfiguration.h
* Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938.Jason McDonald2010-09-025-5/+5
| | | | | | | | | | Reviewer: David Boddie Task number: QTBUG-11938 (cherry picked from commit eea84818e98af917d3cf2bf04ea17a416ef9d55e) Conflicts: src/script/api/qscriptcontext.cpp
* Destroy QNetworkConfigurationManager global static from qApp dtor.Aaron McCarthy2010-09-021-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 (cherry picked from commit 744ff7738333c35e7d621c61d72422cf3a8e7fe4)
* Doc: Fixed qdoc warnings.v4.7.0-rc1Jesper Thomschutz2010-08-241-7/+13
| | | | | | | | | | | | | | Reviewed-by: Trust Me (cherry picked from commit cb086eb5340c4c41efaf45373aa05c37e8aa974a) Conflicts: doc/src/index.qdoc src/dbus/qdbusconnection.cpp src/declarative/util/qdeclarativeanimation.cpp src/gui/s60framework/qs60mainapplication.cpp src/gui/s60framework/qs60mainappui.cpp src/network/access/qnetworkrequest.cpp
* Make this constructor explicit in Qt too.Aaron McCarthy2010-08-181-4/+0
| | | | (cherry picked from commit 167b63d2250e7923d7b660076a80e82af07d9cdb)
* Fix regression with SSL connections failing on symbianShane Kearns2010-08-111-1/+1
| | | | | | | | | Due to a wrong ifdef sequence, the unix code was being compiled instead of the symbian code for retrieving the system certificates. Task-number: QTBUG-12718 Reviewed-by: Peter Hartmann (cherry picked from commit 8229eded4cba85ae53c1b03ce87981ebabd2f3ae)
* QSslSocket: fix security vulnerability with wildcard IP addressesPeter Hartmann2010-08-111-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 (cherry picked from commit 846f1b44eea4bb34d080d055badb40a4a13d369e)
* Fix link error when building Bearer application with Qt MobilityAlex2010-08-062-1/+8
| | | | | | | | | | | | QtMobility uses the Qt header when compiling applications which link against Mobility's Bearer library. Therefore QNetworkConfiguration::bearerName() cannot be inline and refer to the new QNetworkConfiguration::bearerTypeName() function (which doesn't exist in Mobility) Task-number: QTBUG-12378 Reviewed-by: Rohan McGovern (cherry picked from commit d524da81ee257a6bd67d32d0bc870280a7d5b8a4)
* Use an enum to return the bearer type of a network configuration.Aaron McCarthy2010-08-054-29/+114
| | | | | Task-number: QTBUG-12378 Reviewed-by: Alex
* Rename QNetworkConfiguration::bearerName() function.Aaron McCarthy2010-08-052-9/+21
| | | | | | | | | | | | bearerName() -> bearerTypeName(). bearerName() is deprecated and converted into an inline function which calls bearerTypeName(). This is required to keep existing code source compatible between Qt Mobility 1.0.x and Qt 4.7. Task-number: QTBUG-12378 Reviewed-by: Alex (cherry picked from commit 613bc8eb31d8a80b43aa045ab2040b7cb7e0eadf)
* Order network configurations in service networks in priority order.Aaron McCarthy2010-07-292-9/+13
| | | | | | | | | It is useful to know the priority order of the sub configurations of a service network. Task-number: QTBUG-11678 RevBy: juhvu <qt-info@nokia.com> (cherry picked from commit 959efa8daab2715d18440ed8b890b9dd2b501fc7)
* Cherry pick fix for MOBILITY-1077 from Qt Mobility.Aaron McCarthy2010-07-291-4/+8
| | | | | | 7ef45318255c5cf1f10508753c9a2c55fc2cb8c0 321bd8b7b54e34a983b1ba142af836cf3e153a66 (cherry picked from commit c16f0a839743af36b36aea9c35f0d5ddfda3d6ac)
* Qt does not build with qt_namespace on macosCarlos Manuel Duclos Vergara2010-07-221-2/+2
| | | | | | | | | The problem was that the QT_BEGIN_NAMESPACE was in the wrong place. I moved it 10 lines before and the problem is gone. Task-number: QTBUG-12262 Reviewed-by: Prasanth (cherry picked from commit b0998a44a5dc384a6cf65c1d5910cb3dd40620cf)
* Network Proxy Query: Fix memleak on OS XMarkus Goetz2010-07-171-1/+4
| | | | | Task-number: QTBUG-12106 (cherry picked from commit bca7646d81d8c580820cf5f6e52122da6d984c6b)
* fix build for -no-qt3supportPeter Hartmann2010-07-171-2/+2
| | | | | | QString::lower() is QT3_SUPPORT, the correct method is QString::toLower(). (cherry picked from commit 46175e55c8d053b61a45aea89a3e1b8371207dee)
* QSslSocket: Improve error handlingPeter Hartmann2010-07-161-1/+13
| | | | | | Reviewed-by: Markus Goetz Task-number: QT-3567 (cherry picked from commit c25c7c9bdfade6b906f37ac8bad44f6f0de57597)
* QNAM HTTP: Fix problem with cached files and metaDataChanged()Markus Goetz2010-07-161-4/+4
| | | | | Reviewed-by: Peter Hartmann (cherry picked from commit 1c34bf050da3c4d6c303e1dd1dad9eb99e7ccbf4)
* doc: Fixed several qdoc warnings.Martin Smith2010-07-161-1/+1
| | | | (cherry picked from commit 079a4105aff9c63d4107762aec478ade9900c7c2)
* QSslSocket: fix documentation for QSslSocket::setPeerVerifyMode()Peter Hartmann2010-07-161-2/+2
| | | | (cherry picked from commit 2c48de46fdfeb935d1f31ae18f13add52c162ac8)
* Fix handling of SSL certificates with wildcard domain namesRichard J. Moore2010-07-162-4/+39
| | | | | | | Merge-request: 731 Task-number: QTBUG-4455 Reviewed-by: Peter Hartmann (cherry picked from commit 5f6018564668d368f75e431c4cdac88d7421cff0)
* Add documentation for the QAuthenticator options.Thiago Macieira2010-07-161-2/+40
| | | | | | Task-number: QT-3573 Reviewed-by: Markus Goetz (cherry picked from commit 1af3362a321dd055798173737d3aede367a1d30c)
* Expose the QAuthenticator map of options in the API.Thiago Macieira2010-07-163-3/+50
| | | | | | Task-number: QT-3573 Reviewed-By: Markus Goetz (cherry picked from commit 69027cdb2ab9b89673edf29d5034bed33e614a05)
* Add a QAuthenticatorPrivate parsing for the headers without QHttpResponseHeaderThiago Macieira2010-07-163-20/+29
| | | | | Reviewed-by: Markus Goetz (cherry picked from commit 367aa34cbcfa109926087e89d49f9223c1409d44)
* Add NTLMv2 authentication support to QAuthenticator.Thiago Macieira2010-07-161-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 (cherry picked from commit 1b98fbd82c7145c2f81292f8a1feb6cac74e775d)
* Doc: Removed links to Qt3 support in QHostAddressGeir Vattekar2010-07-131-5/+7
| | | | | Task-number: QTBUG-12004 (cherry picked from commit 10039e4b5bb80e5a9705126e7c62c588039acde6)
* Add partial update deployment rules to QtNetworkShane Kearns2010-07-071-0/+15
| | | | | | | | Partial update allows you to build a qtnetwork.sis which can be installed on top of a matching qt.sis, but contains only the qtnetwork.dll file. This is faster to install, so it's useful when developing qtnetwork. Reviewed-by: Simon Hausmann
* Support QSslSocket::systemCaCertificates() on SymbianSimon Hausmann2010-07-063-1/+199
| | | | | | | | | Implemented access to the unified certificate store on Symbian with Shane and Peter's help. Task-number: QTBUG-11399 Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
* 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
* QSslSocket::systemCaCertificates(): fix for WinCEPeter Hartmann2010-07-052-0/+18
| | | | | | | | on WinCE the function is called "CertOpenStore", and not "CertOpenSystemStoreW". Patch-by: Ismail Donmez Task-number: QTBUG-11905
* Consolidate zlib configuration redundancyMark Brand2010-07-021-8/+1
| | | | | Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fixed whitespace formattingMark Brand2010-07-021-55/+57
| | | | | Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QSslSocket::systemCaCertificates(): have one common case for all UnicesPeter Hartmann2010-07-011-7/+4
| | | | Reviewed-by: Simon Hausmann
* SSL backend: correct ordering of root CA certificates in the storePeter Hartmann2010-06-301-2/+14
| | | | | | | | | | | Some CAs have several root certificates with the same SubjectInfo, but different expiration date. This means that OpenSSL needs to choose the valid root certificate over the expired ones when verifying a certificate chain. Apparently, the certs added to the store first are the ones that get used first, so we add the expired ones at the end. Reviewed-by: Thiago Macieira Task-number: QTBUG-11664
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-283-12/+50
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Enable SSE2 for MSVC x64 builds, as it was incorrectly disabled Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration to javascriptcore-snapshot-28062010 ( 0fccd26d3624e80cf68873701ef70ad72ca66bec ) ignore *.vcxproj.user doc: Added more DITA output to the XML generator Don't load ciphers and system certificates for QSslSocket::supportsSsl() Doc: Fixed whitespace issues and added missing files to lists. Doc: Fixed links in the QML documentation. Doc: Changed links to explicitly refer to QML objects. qdoc: Added a workaround for QML/Qt class name clashes.
| * Don't load ciphers and system certificates for QSslSocket::supportsSsl()Andreas Kling2010-06-283-12/+50
| | | | | | | | | | | | | | Loading these uses about 1 MB of memory and can be be deferred until it's actually needed. Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-271-0/+14
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (31 commits) Make symbian/unix shadow builds work again. Change the files to camelcase as avkon now does that Update EABI and WINSCW DEF files for Symbian Fix linking on arm with def files Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 4b88f595ab62b7c5f703a286c4f5f13f8784a936 Fixed incorrect parsing of TARGET.EPOCHEAPSIZE. Fixed make runonphone that looked for the package in the wrong place. Fixed several problems with the postlinker for Symbian (elf2e32). Don't crash when cleaning the uninitialized fontdatabase (Symbian) Revert "Fixing the race condition in event dispatcher implementation on" Revert "Fixing race condition in qeventdispatcher_symbian.cpp code path" Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to a80fd59e3b3b18116803a14e6369345933994236 Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to a80fd59e3b3b18116803a14e6369345933994236 Fixed memory restrictions not being passed on to elf2e32. Allow TLW translucency on Symbian without Qt::FramelessWindowHint Updated UIDs for spectrum demo Ensure that compiling with the no debug/warning output defines works Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to f0dcb906fe56b5dc06aa305b6cfc821d5dd25a28 Clean up HB_Anchor's DeviceTables on failure when loading format 3 Make sure ValueRecord's DeviceTables are cleaned up on failure ...
| * 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
| | * Ensure that compiling with the no debug/warning output defines worksAndy Shaw2010-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The defines that can be used are QT_NO_DEBUG_OUTPUT and QT_NO_WARNING_OUTPUT in order to turn off qDebug and qWarning output. Reviewed-by: cduclos Reviewed-by: Markus Goetz
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-211-0/+14
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix QTBUG-8687. Debug prints and another attempt to fix QTBUG-8687 for N8.
| | | * 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
| | | |
* | | | Corrected filename case for wincrypt.hMark Brand2010-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The case doesn't matter when building on Windows, but does when cross-compiling on Unix. Merge-request: 709 Reviewed-by: Andreas Kling <andreas.kling@nokia.com>
* | | | Fix warnings in QSslSocketPrivate::systemCaCertificates()Zeno Albisser2010-06-251-8/+8
|/ / / | | | | | | | | | Reviewed-by: Markus Goetz
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-201-2/+17
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | src/3rdparty/* is left untouched and not merged from 4.6. The corresponding changes in Harfbuzz and WebKit are already in the 4.6 staging areas. Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebKit/qt/ChangeLog src/3rdparty/webkit/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.cpp src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.qrc tests/auto/qtextlayout/tst_qtextlayout.cpp tests/auto/qwidgetaction/tst_qwidgetaction.cpp
| * | QLocalSocket/Win: handle ERROR_MORE_DATA after read operationJoerg Bornemann2010-06-171-2/+17
| |/ | | | | | | | | | | | | | | | | | | | | | | If we're connected to a name pipe which is in message mode, we have to handle the following case: ReadFile() or GetOverlappedResult() return FALSE and GetLastError() returns ERROR_MORE_DATA. This just means, that the message didn't fit into the pipe's internal buffer. We must not handle this as error. Task-number: QTBUG-11490 Reviewed-by: ossi
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-168-2017/+153
|\ \
generated by cgit v0.12 at 2024-11-22 18:49:58 (GMT)