summaryrefslogtreecommitdiffstats
path: root/src/network
Commit message (Collapse)AuthorAgeFilesLines
* API review: change function name to setUseSystemConfiguration.Thiago Macieira2009-10-062-3/+3
| | | | Requested-By: Volker Hilsheimer
* Fixing the compile bug for Symbian when using ARMV5Aleksandar Sasha Babic2009-10-062-0/+5
| | | | | | Explicit destructor was needed by compiler. Reviewed-by: Thiago Macieira
* QAbstractSocket::setSocketOption: Make const referenceMarkus Goetz2009-10-062-3/+3
| | | | | | After 4.6 API review. Reviewed-by: Volker Hilsheimer
* OpenSSL wrapping: compile when configured with -openssl-linkedPeter Hartmann2009-10-053-8/+2
| | | | | | we were calling sk_pop_free from OpenSSL with a wrong signature. Reviewed-by: Olivier Goffart
* Dealing with socket that was signalized on exception fds setAleksandar Sasha Babic2009-10-021-3/+5
| | | | | | | | | | | It turns out that if socket was signalized via exception fds set, we should signalize only write notifier in the case where both read and write notifiers exist. If in this case we send signal to read notification socket will prematurely be closed. x#Reviewed-by: Janne Antilla
* Workaround for Open C bugAleksandar Sasha Babic2009-10-021-1/+1
| | | | Workaorund for SO_REUSEPORT / SO_REUSEADDR regression bug.
* Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-10-011-0/+9
|\
| * QNAM HTTP Code: Always send an Accept-Language headerMarkus Goetz2009-10-011-0/+9
| | | | | | | | | | | | | | | | Send a header that we accept every language. Works around a bug in some broken websites and is hopefully of no harm for us. Task-number: QT-952 Reviewed-by: Thiago
* | Fix tr-Errors/remove QObject::tr(), mainly in ScriptToolsFriedemann Kleint2009-09-291-1/+1
| | | | | | | | | | | | Note: Those messages are to be translated in Qt 4.6 for the first time. Reviewed-by: Kent Hansen <khansen@trolltech.com>
* | HTTP backend: store the date header in the cached resourcePeter Hartmann2009-09-291-5/+8
| | | | | | | | | | | | | | | | | | | | we need the date header to calculate the age of the page, although this increases disk usage when using a QNetworkDiskCache. A solution to reduce the disk access of QNetworkDiskCache will be considered for a later version of Qt. Reviewed-by: Markus Goetz Reviewed-by: Aleksandar Sasha Babic
* | Merge commit 'origin/4.5' into 4.6Andreas Aardal Hanssen2009-09-281-0/+3
|\ \ | |/ | | | | | | | | | | | | | | Reviewed-by: Joao Conflicts: src/gui/graphicsview/qgraphicsview.cpp src/gui/widgets/qspinbox.cpp tests/auto/qgraphicsview/tst_qgraphicsview.cpp
| * QHostAddress: Clarification about DNSMarkus Goetz2009-09-251-0/+3
| | | | | | | | Task-number: QT-1683
* | QNAM HTTP Code: Properly remove aborted requests from processingMarkus Goetz2009-09-234-4/+41
| | | | | | | | | | | | | | | | This fixes a crash that occured because aborted requests were not properly removed from the channel.alreadyPipelinedRequests. Task-number: QTBUG-4507 Reviewed-by: Peter Hartmann
* | QNetworkReplyImpl: Delete the outgoingDataBuffer in destructorMarkus Goetz2009-09-221-0/+2
| | | | | | | | | | | | Fixes a memleak Reviewed-by: Peter Hartmann
* | Removed a debug output that was a bit annoyingThorbjørn Lindeijer2009-09-151-2/+1
| | | | | | | | Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
* | QNativeSocketEngine on Windows: don't bail out on non-fatal errorPeter Hartmann2009-09-151-3/+9
| | | | | | | | | | | | | | | | receiving the WSAEMSGSIZE error means we could not read all the data because the buffer was too small, but still we should return the number of bytes read and not return -1 Reviewed-by: Marius Storm-Olsen
* | Merge branch '4.5' into 4.6Thiago Macieira2009-09-121-4/+6
|\ \ | |/ | | | | | | | | Conflicts: tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro
| * Only reset the backend pointer after we're done with itJoão Abecasis2009-09-101-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | Since 925912ebf552417306a5bd20fd986afda6a582be QNetworkReplyImplPrivate no longer holds its own pointer to the network cache and relies on the backend to get it. Since the cache is used in our call to finished, we must reset the backend only after that. This fixes a crash I was seeing in Arora... Reviewed-by: Markus Goetz Reviewed-by: Peter Hartmann
| * Update license headers again.Jason McDonald2009-09-08127-508/+508
| | | | | | | | Reviewed-by: Trust Me
* | QLocalSocket (Win) emit readChannelFinished only onceJoerg Bornemann2009-09-111-1/+2
| | | | | | | | | | | | | | If pipeClosed is true, then we've already emitted the readChannelFinished signal. We must not do this in close() in that case. Reviewed-by: ossi
* | QLocalSocket::readData (Windows) must return -1 on EOFJoerg Bornemann2009-09-101-1/+4
| | | | | | | | | | | | | | | | If we've detected a broken pipe and we have no more data in the read buffer, then we return -1 to signal EOF. Additionally, we close the QLocalSocket. Reviewed-by: ossi
* | QLocalSocket Windows: emit readChannelFinished if broken pipe detectedJoerg Bornemann2009-09-101-0/+4
| | | | | | | | | | | | | | If we detect in a read operation that the pipe has been closed, we must emit the readChannelFinished signal. Reviewed-by: ossi
* | Some unneeded semicolons lessAlessandro Portale2009-09-092-2/+2
| |
* | Fix unresolved reference to q_sk_free with openssl 1.0Bernhard Rosenkraenzer2009-09-093-3/+10
| | | | | | | | | | | | | | Previous fix introduced an unresolved reference in the lib Merge-request: 1409 Reviewed-by: Peter Hartmann <peter.hartmann@trolltech.com>
* | Fix build with openssl 1.0.0 betasBernhard Rosenkraenzer2009-09-091-1/+2
| | | | | | | | | | | | | | | | | | The recent addition of sk_pop_free to src/network/ssl/qsslsocket_openssl_symbols.cpp broke the build with openssl 1.0.0 betas; this commit fixes it Merge-request: 1409 Reviewed-by: Peter Hartmann <peter.hartmann@trolltech.com>
* | Resolved ordinals for Qt/4.6 added OpenSSL symbols for Symbian OS.Janne Anttila2009-09-091-0/+2
| | | | | | | | | | This fix gets rid of warnings/errors such as: QWARN : cannot call unresolved function sk_pop_free
* | Update license headers again.Jason McDonald2009-09-09135-540/+540
| | | | | | | | Reviewed-by: Trust Me
* | Fix windows implemetation of QLocalSocket to emit bytesWritten() signalabcd2009-09-091-1/+2
| | | | | | | | | | | | | | | | Have QWindowsPipeWriter emit a bytesWritten signal and have QLocalSocket connect this to its own bytesWritten signal. This change contains an autotest to check for the signal emission. Previously there was no implementation to emit the signal.
* | QAbstractSocket: Missing initializationsMarkus Goetz2009-09-042-1/+5
| |
* | QHostInfoPrivate: Uninitialized intMarkus Goetz2009-09-041-2/+3
| |
* | QNetworkAccessManager: Missing break in proxyAuthenticationKeyMarkus Goetz2009-09-041-0/+1
| | | | | | | | | | | | | | This probably made the proxy authentication saving for ftp proxies not working. Reviewed-by: Thiago
* | fix disconnect-after-write-problem in QLocalSocket on WindowsJoerg Bornemann2009-09-042-11/+34
| | | | | | | | | | | | | | | | | | If the server disconnects directly after writing its data, like the localfortuneserver example does, we must close the reading client socket. Before this patch, an error was yielded. Task-number: 260631 Reviewed-by: phartman
* | QNativeSocketEngine: do not issue warning if socketDescriptor is <= 0Peter Hartmann2009-09-021-1/+4
| | | | | | | | | | | | ... but leave it there on Symbian. Reviewed-by: Aleksandar Sasha Babic
* | Merge branch '4.5' into 4.6Thiago Macieira2009-09-014-24/+32
|\ \ | |/ | | | | | | | | | | Conflicts: src/network/access/qnetworkaccessbackend.cpp src/network/access/qnetworkreplyimpl.cpp tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
| * Re-add check for saving to cache, which was removed by accident.Thiago Macieira2009-09-011-0/+1
| | | | | | | | Discussed with Ben Meyer.
| * QNetworkAccessManager can delete the QAbstractNetworkCache pointer atBenjamin C Meyer2009-09-014-21/+24
| | | | | | | | | | | | | | | | | | | | any point. Rather then keep a separate pointer to the cache in the reply use the pointer kept by the manager so the reply never tries to access a cache pointer that has already been deleted. Autotest: included Merge-request: 1124 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * Initialize QNetworkAccessBackend's private variables to 0 in the constructorBenjamin C Meyer2009-09-011-2/+7
| | | | | | | | | | | | | | and when creating a CacheBackend set the manager pointer. Merge-request: 1124 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | QNAM HTTP Code: Removed unnecessary legacy loopMarkus Goetz2009-09-011-23/+16
| | | | | | | | | | | | Thank you Coverity! Thank you Biochemist! Reviewed-by: joao
* | QtNetwork: More Coverity fixesMarkus Goetz2009-09-013-1/+9
| |
* | Socket code: Do not use magic buffer size valueMarkus Goetz2009-09-011-4/+13
| | | | | | | | | | | | | | I have seen a performance increase of around 30% for big file transfers on Linux when having high bandwidth and higher latency. Reviewed-by: Thiago
* | QNAM HTTP Code: Pipelining used queue from wrong sideMarkus Goetz2009-09-011-1/+1
| | | | | | | | | | | | Do it as it was done in dequeueAndSendRequest. Reviewed-by: TrustMe
* | QSslCertificate: fix previous patch, add autotest and documentationPeter Hartmann2009-09-011-3/+3
| | | | | | | | | | | | The +1 must be added to the version, not the serial number. Reviewed-by: trustme
* | QSslCertificate: Add + 1 to serialNumberRaul Metsma2009-09-011-2/+2
| | | | | | | | | | Merge-request: 1383 Reviewed-by: Peter Hartmann <peter.hartmann@trolltech.com>
* | Implement QSslCertificate::version() and QSslCertificate::serialNumber()Raul Metsma2009-09-013-0/+11
| | | | | | | | | | | | | | Task-number: 251830 Merge-request: 1383 Reviewed-by: Peter Hartmann <peter.hartmann@trolltech.com>
* | Doc for QSslError constructor parameters fixed each cons.Peter Yard2009-09-011-3/+12
| |
* | Performance: don't call WinHttpGetProxyForUrl for a file URL (e.g. from webkit)David Faure2009-08-311-1/+6
| | | | | | | | | | | | | | | | | | That method can be slow, since it does a DHCP query followed by a DNS query (sometimes followed by a Netbios query, too)... no point in doing it for every file URL loaded in webkit. Merge-request: 1128 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | Update license header for new file from merge requestThiago Macieira2009-08-311-14/+14
| |
* | Add QNetworkProxyFactory::setUseSystemConfigurationEnabled(true)David Faure2009-08-313-0/+110
| | | | | | | | | | | | | | Simply following the system configuration for the proxy used to require writing a QNetworkProxyFactory subclass. The static setter makes this easier, so apps can in one line say "I want to use the system proxy settings". Solution and method name suggested by Thiago.
* | Update tech preview license header for files that are new in 4.6.Jason McDonald2009-08-317-91/+91
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.5' into 4.6Thiago Macieira2009-08-31127-1651/+1651
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp demos/boxes/vector.h demos/embedded/fluidlauncher/pictureflow.cpp demos/embedded/fluidlauncher/pictureflow.h doc/src/desktop-integration.qdoc doc/src/distributingqt.qdoc doc/src/examples-overview.qdoc doc/src/examples.qdoc doc/src/frameworks-technologies/dbus-adaptors.qdoc doc/src/geometry.qdoc doc/src/groups.qdoc doc/src/objecttrees.qdoc doc/src/platform-notes.qdoc doc/src/plugins-howto.qdoc doc/src/qt3support.qdoc doc/src/qtdbus.qdoc doc/src/qtdesigner.qdoc doc/src/qtgui.qdoc doc/src/qtmain.qdoc doc/src/qtopengl.qdoc doc/src/qtsvg.qdoc doc/src/qtuiloader.qdoc doc/src/qundo.qdoc doc/src/richtext.qdoc doc/src/topics.qdoc src/corelib/tools/qdumper.cpp src/gui/embedded/qkbdpc101_qws.cpp src/gui/embedded/qkbdsl5000_qws.cpp src/gui/embedded/qkbdusb_qws.cpp src/gui/embedded/qkbdvr41xx_qws.cpp src/gui/embedded/qkbdyopy_qws.cpp src/gui/embedded/qmousebus_qws.cpp src/gui/embedded/qmousevr41xx_qws.cpp src/gui/embedded/qmouseyopy_qws.cpp src/gui/painting/qpaintengine_d3d.cpp src/gui/painting/qwindowsurface_d3d.cpp src/opengl/gl2paintengineex/glgc_shader_source.h src/opengl/gl2paintengineex/qglpexshadermanager.cpp src/opengl/gl2paintengineex/qglpexshadermanager_p.h src/opengl/gl2paintengineex/qglshader.cpp src/opengl/gl2paintengineex/qglshader_p.h src/opengl/util/fragmentprograms_p.h src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp src/script/parser/qscript.g src/script/qscriptarray_p.h src/script/qscriptasm_p.h src/script/qscriptbuffer_p.h src/script/qscriptclass.cpp src/script/qscriptclassdata_p.h src/script/qscriptcompiler.cpp src/script/qscriptcompiler_p.h src/script/qscriptcontext.cpp src/script/qscriptcontext_p.cpp src/script/qscriptcontext_p.h src/script/qscriptcontextfwd_p.h src/script/qscriptecmaarray.cpp src/script/qscriptecmaarray_p.h src/script/qscriptecmaboolean.cpp src/script/qscriptecmacore.cpp src/script/qscriptecmadate.cpp src/script/qscriptecmadate_p.h src/script/qscriptecmaerror.cpp src/script/qscriptecmaerror_p.h src/script/qscriptecmafunction.cpp src/script/qscriptecmafunction_p.h src/script/qscriptecmaglobal.cpp src/script/qscriptecmaglobal_p.h src/script/qscriptecmamath.cpp src/script/qscriptecmamath_p.h src/script/qscriptecmanumber.cpp src/script/qscriptecmanumber_p.h src/script/qscriptecmaobject.cpp src/script/qscriptecmaobject_p.h src/script/qscriptecmaregexp.cpp src/script/qscriptecmaregexp_p.h src/script/qscriptecmastring.cpp src/script/qscriptecmastring_p.h src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptengine_p.h src/script/qscriptenginefwd_p.h src/script/qscriptextenumeration.cpp src/script/qscriptextenumeration_p.h src/script/qscriptextqobject.cpp src/script/qscriptextqobject_p.h src/script/qscriptextvariant.cpp src/script/qscriptfunction.cpp src/script/qscriptfunction_p.h src/script/qscriptgc_p.h src/script/qscriptmember_p.h src/script/qscriptobject_p.h src/script/qscriptprettypretty.cpp src/script/qscriptprettypretty_p.h src/script/qscriptvalue.cpp src/script/qscriptvalueimpl.cpp src/script/qscriptvalueimpl_p.h src/script/qscriptvalueimplfwd_p.h src/script/qscriptvalueiteratorimpl.cpp src/script/qscriptxmlgenerator.cpp src/script/qscriptxmlgenerator_p.h tests/auto/linguist/lupdate/testdata/recursivescan/project.ui tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp tools/linguist/shared/cpp.cpp