summaryrefslogtreecommitdiffstats
path: root/src/network/kernel
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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
* | | Fix SetActive being called twiceShane Kearns2011-03-221-2/+0
| | | | | | | | | | | | Reviewed-by: Markus Goetz
* | | Implement network session support for synchronous QHostInfoShane Kearns2011-03-223-10/+24
| | | | | | | | | | | | | | | | | | | | | Private API, QHostInfoPrivate::fromName, which is called from QAbstractSocket when the network session property is set. Reviewed-by: Markus Goetz
* | | Fix bugs where = used instead of ==Shane Kearns2011-03-211-6/+6
| | | | | | | | | | | | Reviewed-by: Aaron Tunney
* | | Add explicit network session support for async QHostInfoShane Kearns2011-03-183-5/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass the shared network session pointer into the QSymbianHostResolver (which maintains a reference for its lifetime). This is used to open the RHostResolver handle, in order to get a host resolver which is associated with a particular session. The session is obtained from the _q_networksession property of the QAbstractSocket, as in the symbian socket engine Reviewed-by: Markus Goetz
* | | handle errors in QSymbianHostResolver::requestHostLookupShane Kearns2011-03-182-31/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was hanging because although the error flags were set, the callback was not emitted and nothing was done with the return value from the function. Now, it sets the state to error, and self completes - so that the completion through RunL is used as normal. Because the state is error, the processing of name/address is skipped and the error string is not rewritten. Note, error being detected at this point is only common when using an explicit network session (as RHostResolver::Open can fail if the RConnection is in the wrong state) Reviewed-by: Markus Goetz
* | | Fix "wrong lookup id" warning from QAbstractSocketShane Kearns2011-03-182-7/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian host info implementation was using default constructor for the results, which sets the id to -1, and storing the id seperately. Changed this to use the constructor that specifies the id, and use the id inside the results instead of storing it separately (just a change to the accessor function) Reviewed-by: Markus Goetz
* | | QHostInfo: Compile fix for non-SymbianMarkus Goetz2011-03-171-1/+1
| | |
* | | Implementation of async DNS lookup.Aaron Tunney2011-03-173-18/+473
| | | | | | | | | | | | Reviewed-by: Shane Kearns
* | | Implement IPv6 in symbian QNetworkInterfaceShane Kearns2011-03-161-45/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For IPv6 interfaces, the network mask is reported correctly, so we use that. For IPv4 interfaces, the network mask is reported as 0.0.0.0 so the existing workaround to get the netmask from routes is used. For loopback interfaces, the mask can be statically determined. Skip checking the routes if proper masks were reported for all the interfaces. Added a helper function for converting TInetAddr -> QHostAddress using the constructors that take binary data. (better than conversion to/from strings) Task-number: QTBUG-18137 Reviewed-by: Markus Goetz
* | | Merge branch 'symbian-socket-engine' of ↵Shane Kearns2011-03-083-13/+206
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.troll.no:qt/qt-symbian-network into symbian-socket-engine Conflicts: src/network/access/qnetworkaccessmanager.cpp tests/auto/qsslsocket/tst_qsslsocket.cpp
| * \ \ Merge remote branch 'qt/master' into symbian-socket-engineShane Kearns2011-02-0727-61/+243
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/network/access/qnetworkaccessmanager.cpp src/network/bearer/qnetworksession.cpp src/network/kernel/qnetworkproxy_symbian.cpp src/network/socket/qnativesocketengine_unix.cpp tests/auto/platformsocketengine/tst_platformsocketengine.cpp
| * | | | Fix deprecated cast from ascii warningShane Kearns2011-01-241-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Aaron Tunney
| * | | | Initial draft of QHostInfo::localHostName(), plus fix for address buffer for ↵Aaron Tunney2011-01-191-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IPv6 addresses. Reviewed-by: Shane Kearns
| * | | | QHostInfo: Symbian implementation for fromName()Aaron Tunney2010-12-091-15/+91
| | | | | | | | | | | | | | | | | | | | Reviewed-By: Markus Goetz
| * | | | Fix some crashes in the symbian socket engineShane Kearns2010-12-091-0/+5
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Markus Goetz
| * | | | Whitespace fixesShane Kearns2010-12-081-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | Remove more Q_OS_SYMBIAN stuff from network codeMarkus Goetz2010-12-081-12/+1
| | | | |
| * | | | QSymbianSocketEngine: Always support IPv6Markus Goetz2010-12-081-7/+10
| | | | |
| * | | | Fixed typo and includes.Aaron Tunney2010-12-071-1/+3
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Markus Goetz
| * | | | Some more qnetworkproxy_symbian informationMarkus Goetz2010-12-071-0/+5
| | | | |
| * | | | Added qnetworkproxy_symbian.cppMarkus Goetz2010-12-072-0/+62
| | | | |
| * | | | Weed out old unix code from qhostinfo_symbian.cppMarkus Goetz2010-12-071-313/+9
| | | | |
| * | | | Copy qhostinfo_unix.cpp to qhostinfo_symbian.cppMarkus Goetz2010-12-072-1/+408
| | | | |
* | | | | Merge remote branch 'earth/master' into symbian-socket-engineShane Kearns2011-03-0827-47/+298
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | | | | Conflicts: src/corelib/kernel/qcore_symbian_p.h src/network/kernel/qnetworkinterface_symbian.cpp
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-01-3127-43/+295
| |\ \ \ | | |/ /
| | * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-251-18/+1
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | Conflicts: configure src/network/bearer/bearer.pri
| | | * HTTP: fix digest authenticationPeter Hartmann2011-01-241-18/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | no need to extract the realm from the user; with digest authentication the realm is an attribute of its own. Reviewed-by: Markus Goetz Task-number: QTBUG-15070
| | * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1727-25/+294
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| | | * various fixes to deal with CI gate failuresJeremy Katz2011-01-141-15/+15
| | | |
| | | * QNetworkProxyFactory::systemProxyForQuery() for SymbianJyrki Jaakkola2011-01-122-0/+269
| | | |
| | | * Update copyright year to 2011.Jason McDonald2011-01-1025-25/+25
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | * Change QHostInfoCache to use QElapsedTime instead of QTime.Niklas Kurkisuo2011-01-102-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use QElapsedTime instead of QTime for performance gain. See QT-2965 for more info. Task-number: QTBUG-16468 Reviewed-by: Markus Goetz
| * | | Merge branch 'windowsMakefileBuildSupport' into earth-masteraxis2011-01-281-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Fixed include in network module on Symbian.axis2011-01-281-1/+1
| | | |
| * | | QHostInfoCache: Use QElapsedTime instead of QTimeNiklas Kurkisuo2011-01-062-3/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | Use QElapsedTime instead of QTime for performance gain. See QT-2965 for more info. Task-number: QTBUG-16468 Reviewed-by: Markus Goetz
* | | Use shared socket server session everywhereShane Kearns2010-12-061-11/+2
|/ / | | | | | | | | | | | | Converted uses of RSocketServ in QtNetwork and the symbian bearer plugin to use the shared session from QtCore instead of creating their own Reviewed-by: Markus Goetz
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-051-2/+4
|\ \ | |/ | | | | | | | | Conflicts: mkspecs/features/symbian/symbian_building.prf src/network/access/qhttpnetworkconnectionchannel.cpp
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-11-041-2/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (53 commits) trivial: fix build Fix crash fix isLikelyToBeNfs usage Export isLikelyToBeNfs only if we have an internal build Fixed QGraphicsView autotest to use a dummy toplevel widget Fixed QMdiArea autotest to use a dummy toplevel widget. Fixed QMenuBar autotest. Changed window activation order. Fixed QStyleSheetStyle autotest to use a dummy toplevel widget Fixed QPathCliper autotest, to skip a test when qreal != double Fixed QComboBox autotest to use a dummy toplevel widget Fixed QColumnView autotest. Added an QApplication::processEvents Fixed QAccessability autotest to use a dummy toplevel widget Fix QListWidget test Fix QGraphicsItems autotest Fixed QGraphicsScene autotest to use a dummy toplevel widget Fixed QGraphicsItem autotest to use a dummy toplevel widget Fixed QListView autotest to use a dummy toplevel widget Fixed QMenu autotest to use a dummy toplevel widget Fixed QMenuBar autotest. Added mainwindow activation Fixed QString autotest when QT_QLOCALE_USES_FCVT is set ...
| | * trivial: fix buildHarald Fernengel2010-11-031-2/+2
| | |
| | * Fix crashHarald Fernengel2010-11-021-2/+4
| | | | | | | | | | | | | | | | | | check the global network proxy for 0 before dereferencing Reviewed-by: Robert Griebl
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-041-3/+7
|\ \ \ | |/ /
| * | QNAM: Reset authenticator state properly between requestsMarkus Goetz2010-11-031-3/+7
| |/ | | | | | | | | | | | | Reset authenticator and fix operator=(...) of QAuthenticator. Task-number: QTBUG-6792 Reviewed-by: ogoffart
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-292-6/+9
|\ \ | |/
| * QAuthenticator: Fix NTLMv2 credential caching of QNAMMarkus Goetz2010-10-272-6/+9
| | | | | | | | | | | | | | | | | | | | QNetworkAccessManager used the user() function for caching the credentials when doing HTTP authentication with NTLMv2. For that to work it needs to return the same value as was put in with setUser(). Reviewed-by: Peter Hartmann Reviewed-by: Prasanth Task-Number: QTBUG-13234
* | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-041-1/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | 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
| * 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
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-281-8/+11
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/gui/painting/qrasterizer.cpp src/network/access/qnetworkaccessmanager.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/mainwindow.cpp
| * 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
generated by cgit v0.12 at 2025-08-26 16:59:27 (GMT)