summaryrefslogtreecommitdiffstats
path: root/src/network/kernel
Commit message (Collapse)AuthorAgeFilesLines
* 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
|/ /
* | QHostInfo symbian backend finalisationShane Kearns2011-04-051-13/+11
| | | | | | | | | | | | | | | | | | | | | | | | For reverse lookups, don't report errors, instead just return the IP address as a string for the host name (for behavioural compability with the windows and unix backends) Don't sort IP4 addresses before IP6 addresses for the same host. The symbian host resolver internally sorts the list so the usable addresses are returned first. (usable means has a valid route) Task-number: QTBUG-18135 Reviewed-by: Markus Goetz
* | Updating comment in QHostInfo::localDomainNameAaron Tunney2011-04-051-1/+3
| | | | | | | | | | | | Updating comment to indicate that the feature isn't supported on Symbian. Reviewed-by: Shane Kearns
* | Thread safety for QHostInfo symbian implementationShane Kearns2011-04-052-10/+46
| | | | | | | | | | | | | | | | | | | | Each thread needs at least one current request if it has any queued requests, this is to stop the queue stalling. When starting a queued request, start it in the same thread it belongs to When aborting a request from the wrong thread, just detach it (it will complete normally but the slot isn't connected, and then delete itself) Reviewed-by: Markus Goetz
* | Fix typo in class nameShane Kearns2011-04-053-36/+36
| | | | | | | | | | | | Manger -> Manager Reviewed-by: Markus Goetz
* | Implement cache support for the async resolverShane Kearns2011-04-052-3/+28
| | | | | | | | | | | | | | | | | | | | Add additional check when starting a queued request, as the cache may have been populated while the request was queued. Put completed requests in the cache (note cache code internally discards errored results and only caches successful results) Reviewed-by: Aaron Tunney Reviewed-by: Markus Goetz
* | Fix error handling in qhostinfo_symbianShane Kearns2011-03-311-54/+42
| | | | | | | | | | | | | | | | | | De-duplicate error handling into a helper function. RHostResolver can return a few different errors at the end of the list, so treat these benign ones the same. When Next() gives an error, return any results we already obtained. Reviewed-by: Aaron Tunney
* | Ayschronous Next() change for DNS resolution.Aaron Tunney2011-03-312-51/+77
| | | | | | | | Reviewed-By: Shane Kearns
* | Merge remote branch 'earth/master' into symbian-socket-engineShane Kearns2011-03-251-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/network/access/qhttpnetworkconnectionchannel.cpp src/network/socket/qlocalsocket.cpp src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtTestu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def
| * | Use TCP_LOCALSOCKET on INTEGRITYRolland Dudemaine2011-02-221-0/+1
| | | | | | | | | | | | | | | | | | | | | Use TCP localsockets on INTEGRITY, and other small INTEGRITY fixes Merge-request: 1101 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* | | QHostInfo: Don't mess with addr family orderingMarkus Goetz2011-03-251-14/+2
| | | | | | | | | | | | Reviewed-by: Aaron Tunney
* | | use QList instead of RPointerArrayShane Kearns2011-03-232-27/+27
| | | | | | | | | | | | | | | | | | For maintainability, it's better to use Qt's container classes Reviewed-by: Markus Goetz
* | | Ensure QSymbianHostResolver::DoCancel does correct thing based on stateShane Kearns2011-03-231-1/+10
| | | | | | | | | | | | | | | | | | | | | If a host resolver async call in progress, cancel it. Otherwise don't. Reviewed-by: Markus Goetz
* | | Ensure parameters of async function calls stay in scopeShane Kearns2011-03-232-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | Calling symbian asynchronous functions with parameters on the stack, even "in" parameters is unsafe. If the server is blocked on another operation, then it will not read the parameters until later (at which time the stack is invalid) Reviewed-by: Markus Goetz
* | | Fix event loop hangs caused by async QHostInfoShane Kearns2011-03-231-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Declaring iStatus in a derived class hides the iStatus in CActive. This confuses the active scheduler (which is using CActive::iStatus) and would in a normal symbian application have caused a stray signal panic. However as Qt's event loop integration uses CActiveScheduler::RunIfReady instead of the normal CActiveScheduler::Start the panic does not happen. Instead the thread semaphore gets messed up and causes problems. Reviewed-by: Markus Goetz
* | | QHostInfo: Fix compilation with non-symbianMarkus Goetz2011-03-221-0/+9
| | | | | | | | | | | | Reviewed-by: Shane Kearns
* | | Fix a deadlock in symbian QHostInfo when abortingShane Kearns2011-03-221-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DoCancel was calling lookupFinished, which tries to acquire a mutex again that was already acquired in abortLookup (causing a deadlock). This call is un-necessary, as Cancel was only called from the destructor and from abortLookup - in neither case is this wanted. The run and RunError functions explicitly call lookupFinished. This fixes hang in autotests when attempting to lookup a bad host name. Reviewed-by: Markus Goetz
generated by cgit v0.12 at 2025-01-02 18:34:43 (GMT)