summaryrefslogtreecommitdiffstats
path: root/src/network/kernel
Commit message (Collapse)AuthorAgeFilesLines
* Fix error handling in QHostInfo windows backendShane Kearns2012-03-071-10/+18
| | | | | | | | | | | If the DNS server returns a non authoritative host not found response, then windows returns WSATRY_AGAIN error code. This is now reported as HostNotFound and not UnknownError Change-Id: I212985acd4e85ff4b2bdb6c57ec403405a7695fb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Richard J. Moore <rich@kde.org> (cherry picked from commit 844b096d674c3b803923357502435ef89ce0c738)
* QNetwork: fix compilation with "-no-feature-bearermanagement"Martin Petersson2012-02-272-0/+4
| | | | | | | Task-number: QTBUG-23239 Change-Id: I12f89a4e595231738985ca0cf3179fee7de9fa72 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Remove unnecessary locking from QNetworkProxy constructorShane Kearns2012-02-201-17/+6
| | | | | | | | | | | | | | | | | | | | | | | | QGlobalNetworkProxy (a singleton) had two phase construction, with the second phase being called from QNetworkProxy's constructor. This isn't necessary, and has been reported as causing deadlocks. Although constructing socket engine handlers has side effects (they add themselves to a list on construction and remove themselves on destruction), this appears to be safe. The socket engine handlers are only used while holding the list mutex, and any socket engines created don't have any reference to the factory that created them. With the new version, it is possible that two instances of QHttpSocketEngineHandler and QSocks5SocketEngineHandler exist temporarily if a Q_GLOBAL_STATIC initialisation race occurs. This appears safe, because the loser of the race deletes its handlers, which remove themselves from the global list as above. Task-number: QTBUG-13088 Change-Id: I8cf520da717d8ab7d862ab89c6de13aea6d60ac3 Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit aee4cbf22a5942c7bd4b9545a8fcb7cf2930e0ee)
* Update documentation to show NTLMv2 is supportedShane Kearns2012-02-201-4/+2
| | | | | | | | | | This feature was implemented in 4.8, but documentation was not updated at the time. Task-number: QTBUG-18181 Change-Id: I657d7ab7aaf43b73b7bf8fd1cb76086522cf5c2b (cherry picked from commit 6f7bd6532d34713811c8f70b287d151d24cdda7c) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Various Qt documentation fixes (wk 44)artoka2012-01-311-3/+3
| | | | | | | | | | | | | | | | Task-number: QTBUG-13362 Task-number: QTBUG-18356 Task-number: QTBUG-18417 Task-number: QTBUG-18664 Task-number: QTBUG-21562 Task-number: QTBUG-22094 Task-number: QTBUG-18741 Task-number: QTBUG-15921 Task-number: QTBUG-22172 Task-number: QTBUG-15738 Change-Id: I1d383a22612cd4fbcb7e03751e76409ca57fe7a2 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Various Qt documentation bug fixes (wk 42)artoka2012-01-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-18101 Task-number: QTBUG-8673 Task-number: QTBUG-14194 Task-number: QTBUG-9109 Task-number: QTBUG-9466 Task-number: QTBUG-8323 Task-number: QTBUG-7924 Task-number: QTBUG-20355 Task-number: QTBUG-19367 Task-number: QTBUG-21295 Task-number: QTBUG-14554 Task-number: QTBUG-8331 Task-number: QTBUG-8329 Task-number: QTBUG-8786 Task-number: QTBUG-8787 Change-Id: I4b6403df4a0078fa385abbfab5b6c3a94f175295 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix for coreservices, it should be part of QPA testsAndy Shaw2012-01-171-1/+2
| | | | | | | | | Since the coreservices test should be part of the QPA ones after all, this reverts d317182e and fixes the original problem correctly by checking if qpa is on before testing for coreservices Change-Id: I476f56924ff2d9bbc2f290563aaff9528fe72766 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1127-27/+27
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix http authentication to a different realm on the same serverShane Kearns2012-01-041-4/+2
| | | | | | | | | | | This is a regression caused by the NTLMv2 authentication patch. I have manually tested NTLMv2 authentication against MS IIS and reverting these two lines does not break it. Task-number: QT-5209 Change-Id: I64159cbe468e1a7f834f8726fd0c9d4ab4c54b38 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> (cherry-picked from 4954f71648aa7f74a4cb8b1dd26470b5da44459e)
* Don't fetch credentials from cache following a failed proxy authenticationShane Kearns2012-01-042-0/+2
| | | | | | | | | | | Add variable to QAuthenticatorPrivate for tracking failure Track authentication success/failure in http proxy socket engine Track authentication success/failure in http connection channel Task-number: QTBUG-22875 Change-Id: Id5d39e839428271ad687e9da12fbbdea9c478f4f Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> (cherry-picked from d24aad82896addce88f1ffb4040560e406acf083)
* Fix NTLM authentication with email addressShane Kearns2011-12-121-8/+3
| | | | | | | | | | | | | | | | When using "user@dns-domain" for NTLM authentication, the whole string should be sent as the username, and the domain should be set to an empty string. The domain sent by the server is still reflected if the username does not contain an '@' character. Manually tested using MS IIS on a domain-joined PC. Task-number: QTBUG-19894 Task-number: ou1cimx1#949951 Change-Id: Ie1f81172e71cb7cce7b8c909062be990c24aea47 Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com> (cherry picked from commit f74ff46c7a333d771b07d8ff38df10d9fd13bbcf)
* Symbian - prefer sessions started by this process to choose proxyShane Kearns2011-11-301-0/+27
| | | | | | | | | | | | When WLAN and 3G connections are both active, the proxy for the wrong connection may have been chosen in the case of plain sockets or QNetworkAccessManager with an invalid configuration. When enumarating active connections to choose a proxy, prefer a connection that was opened by this process. Task-number: QTBUG-22615 Task-number: ou1cimx1#930701 Reviewed-by: mread
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-11-231-3/+3
|\ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: QNetworkProxy documentation: mention usage of "http_proxy" variable
| * QNetworkProxy documentation: mention usage of "http_proxy" variablePeter Hartmann2011-11-221-3/+3
| | | | | | | | | | | | | | | | This is done on systems other than Windows or Mac. Change-Id: I631ea350cb9bc123edc6df33b6f661afa8f0778b Reviewed-by: Arvid Picciani (cherry picked from commit ac22fa8a33472cbdd85ef312c436442a93959ab3)
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-11-171-2/+29
|\ \ | |/ | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: QNAM: make systemProxyForQuery respect http_proxy
| * QNAM: make systemProxyForQuery respect http_proxyArvid Ephraim Picciani2011-11-171-2/+29
| | | | | | | | | | | | | | | | | | the generic systemProxyForQuery will use http_proxy from the environment, if it is set. Change-Id: Ie685c47eb6df1fdd2ab223defc7172bb25e6fe30 Reviewed-by: Thiago Macieira (Intel) <thiago.macieira@intel.com> (cherry picked from commit b22d290a37903f2c5ecfe58e8183cd293ead99dc)
* | Merge branch '4.8-upstream' into master-waterWater-Team2011-10-071-2/+3
|\ \ | |/
| * QHostInfo: fix a race condition under CEKonstantin Ritt2011-10-061-2/+3
| | | | | | | | | | Merge-request: 1339 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* | don't lock the global mutex if there is nothing to protectKonstantin Ritt2011-10-071-12/+8
| | | | | | | | | | | | | | according to Thiago, setting the pointer with the same values *is* thread-safe Merge-request: 2655 Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
* | fix possible race conditionsKonstantin Ritt2011-10-071-3/+1
| | | | | | | | | | | | | | | | | | the initialization guard must be set after the initialization is done; for the code assumed to be only executed in a single thread, this change was done just for consistency - in order to avoid similar issues by copy-pasting in future Merge-request: 2655 Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
* | simplify the code by using QSystemLibrary a bit smarterKonstantin Ritt2011-10-071-6/+7
| | | | | | | | | | Merge-request: 2655 Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
* | use QSystemLibrary::resolve() instead of GetProcAddress() win API callsKonstantin Ritt2011-10-071-13/+6
|/ | | | | | | this makes the code more consistent with similar parts and a bit more readable Merge-request: 2655 Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-08-191-1/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Doc: Fixed qdoc warnings. Doc: Fixed qdoc warnings. Improved comment finding code. Added language information to the pure documentation parser. Doc: Fixes to Qt tutorial Fixed external link to DevNet Wiki. qdoc: Fixed a crash caused by accessing a null pointer. Doc: Fixed the example of an encoded URL in the class description. Doc: Added a copy of the online style images for the qdoc manual. Doc: Removed the Google Analytics script.
| * Doc: Fixed qdoc warnings.David Boddie2011-08-151-1/+6
| |
* | HTTP internals: send password even if no username is setRobert Hogan2011-08-151-2/+2
|/ | | | | | | | | | | Setting only a password (no username) for HTTP requests does not result in the password being sent. Only cancel authentication if neither a username nor a password is set. Requiring a username was preventing user-less logins. Merge-request: 1250 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> Task-number: QTBUG-15566
* Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-07-081-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Flicking behaviour of ListView/GridView SnapOnItem is inconsistent Skip flick velocity test on Mac. Try again to fix flickable velocity on Mac. Try to fix Mac CI test failure Flickable is too sensitive. Reduce timing dependancy in flickable test Velocities reported by Flickable in onFlickStarted can be 0 Fix memory leak in QHostInfo Regression: Some QMenus are shown completely transparent in Symbian
| * Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-07-081-0/+1
| |\
| | * Fix memory leak in QHostInfoShane Kearns2011-07-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | QHostInfo was leaking in the code path where it removes duplicate name lookups after one has completed. Task-number: QT-5121 Reviewed-by: Markus Goetz
| | * Update licenseheader text in source filesJyri Tahtela2011-05-1327-460/+460
| | | | | | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | | Doc: Updated documentation with \since 4.8 declarations.David Boddie2011-06-301-0/+8
|/ /
* | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-06-241-1/+1
|\ \
| * | Compile fix in network for iosIan2011-06-201-1/+1
| | | | | | | | | | | | Reviewed-by: Jørgen Lind
* | | QAuthenticator::setUser() parse user name in form user@domainMartin Petersson2011-06-211-1/+1
|/ / | | | | | | | | | | Task-number: QTBUG-19894 Change-Id: I063dbc66e5f47a83cc1c0aee8913062b4b5e42bc (cherry picked from commit d3313bc2f095dc15718b2a1ed613489ab1ae0927)
* | symbian socket engine: share ip address conversion codeShane Kearns2011-05-253-18/+12
| | | | | | | | | | | | | | | | | | The helper function for converting TInetAddr -> QHostAddress is now used in qhostinfo_symbian.cpp as well. This should slightly improve performance by avoiding conversion to/from strings, and also remove some duplicated code. Reviewed-by: Markus Goetz
* | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-192-40/+80
|\ \
| * \ Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-181-1/+1
| |\ \
| * | | Symbian socket: Implement systemProxyForQuery for service networksShane Kearns2011-05-181-37/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the specified (or active/default) network is a service network, try to determine the appropriate IAP network within it. This is the highest priority active network (if any) followed by the highest priority discovered network (if any) or the highest priority network as a last resort. As Symbian doesn't include proxy type in the comms database, proxies are assumed to be http type unless the port is 1080 (iana assigned port for SOCKS) in which case the proxy is set as SOCKS type. Also fixed unitialised member issue with SymbianIapId internal class Task-number: QTBUG-18618 Reviewed-by: Markus Goetz
| * | | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-113-4/+123
| |\ \ \
| * | | | Make QHostAddress.toString() follow RFC-5952 for IPv6 address format.Martin Petersson2011-05-061-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-18426 Reviewed-by: Peter Hartmann
| * | | | Fix compilationOlivier Goffart2011-05-031-1/+0
| | | | | | | | | | | | | | | | | | | | Conflicts between 61c6d66b7efd8de4a83b021e7c4ef2b1a803ece2 and 940f16babab76b328b7c9bfdb5435102c689b76b
| * | | | Merge earth-team into origin/4.8Olivier Goffart2011-05-031-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure
| * | | | | Fixes warnings about unused variablesOlivier Goffart2011-04-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann
* | | | | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-181-1/+1
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples/wheel.qdoc src/gui/util/qflickgesture.cpp src/gui/util/qflickgesture_p.h src/gui/util/qscroller.cpp src/gui/util/qscroller.h src/gui/util/qscroller_p.h src/gui/util/qscrollerproperties.cpp src/gui/util/qscrollerproperties.h tests/auto/qscroller/tst_qscroller.cpp
| * | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-121-1/+1
| |\ \ \ \ \ | | |_|_|/ / | |/| | | / | | | |_|/ | | |/| |
| | * | | Fix incorrect hardware address on systems without getifaddrs()Craig Scott2011-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On unix systems for which QT_NO_GETIFADDRS is defined, the way that the hardware address field is extracted from the result of a call to qt_safe_ioctl() is incorrect. The address of the ifreq.ifr_addr struct is taken rather than the appropriate member within that struct, sa_data, resulting in a memory offset and subsequently the hardware address has garbage in the first two of six fields. This commit modifies the code to pass the sa_data member instead of the address of the struct as a whole. Task-number: QTBUG-19165 Merge-request: 2614 Reviewed-by: Martin Petersson
| | * | | Fixed include in network module on Symbian.axis2011-03-041-1/+1
| | | | |
* | | | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-1328-477/+477
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | | | Merge branch 'symbian-socket-engine' into staging-masterShane Kearns2011-05-103-4/+123
|\ \ \ \ | |_|_|/ |/| | |
| * | | Allow a network configuration to be included in a proxy queryShane Kearns2011-04-183-4/+123
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Qt is compiled with bearer management support, the network configuration can be included as a parameter in QNetworkProxyQuery. This allows QNetworkProxyFactory::systemProxyForQuery to get the right proxy setting for a specific network. For example a mobile phone could have network configurations for home WLAN, work WLAN and 3G data access points, each with different proxy configurations. Task-number: QTBUG-18618 Reviewed-by: Peter Hartmann
* | | Fix warnings on unused parameters and variablesThiago Macieira2011-04-261-1/+1
|/ /
generated by cgit v0.12 at 2025-01-06 21:15:17 (GMT)