summaryrefslogtreecommitdiffstats
path: root/src/network
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Fix to QtNetwork ARMV5 UDEB compilation"Jason Barron2009-08-124-55/+2
| | | | | | | | | | | | | This reverts commit 32f931cb6ab5f3e50f1f582276d896f2dff716f1. This reverts commit e39de8681800cbe2ce31c155d23237410b7c21f3. The above commits were added as a workaround to a bug in RVCT which has been fixed. Conflicts: src/network/access/qnetworkcookie.h src/network/access/qnetworkrequest.h
* Fixed QtNetwork autotest build breaks for Symbian.Janne Anttila2009-08-121-1/+1
| | | | Also updated QtNetwork auto test category file.
* Merge commit 'qt/master-stable'Jason Barron2009-08-103-0/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp src/corelib/tools/qsharedpointer_impl.h src/gui/widgets/qdatetimeedit.cpp src/gui/widgets/qlinecontrol.cpp src/gui/widgets/qlineedit.cpp tests/auto/qcssparser/qcssparser.pro tests/auto/qicoimageformat/tst_qicoimageformat.cpp tests/auto/qmultiscreen/qmultiscreen.pro tests/auto/qresourceengine/qresourceengine.pro tests/auto/qresourceengine/tst_qresourceengine.cpp tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
| * Merge commit 'origin/4.5'Rohan McGovern2009-08-063-0/+8
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/dialogs/qfiledialog.cpp src/gui/dialogs/qfiledialog_win.cpp tests/auto/qicoimageformat/tst_qicoimageformat.cpp tests/auto/qscriptqobject/qscriptqobject.pro
| | * Fix compilation when QT_NO_HTTP is definedMarkus Goetz2009-08-053-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Note however you still need to -nomake examples -nomake demos when configuring Qt. Reviewed-by: Thiago Task: 259179
* | | Fixed wrong ifdef.axis2009-08-061-2/+2
| | | | | | | | | | | | RevBy: Jason Barron
* | | Update license headers according to commit 858c70f768e.axis2009-08-061-2/+2
| | | | | | | | | | | | RevBy: Trust me
* | | Replaced $MODULE$ with hardcoded module names.axis2009-08-061-1/+1
| | | | | | | | | | | | RevBy: Trust me
* | | Move socket wrapper functions into the .cpp file.Jason Barron2009-08-062-126/+126
| | | | | | | | | | | | | | | | | | | | | These functions were in the header, but didn't really need to be since they are used by one source file (if at all). Since the header file is included by other platforms, let's move them rather than ifdef'ing them.
* | | Rename Q_DECLARE_SCOPED_PRIVATE back to Q_DECLARE_PRIVATEHarald Fernengel2009-08-0621-24/+24
| | | | | | | | | | | | | | | | | | Rationale: We're using template magic now to get the private pointer in qglobal.h, so no need to have two macros. Also keeps backward compatibility with outside (KDE) code.
* | | Merge commit 'qt/master-stable'Jason Barron2009-08-067-304/+287
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe doc/src/classes/qnamespace.qdoc examples/examples.pro src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qobject.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qstandardgestures.h src/gui/kernel/qwidget.cpp
| * | Don't try to make direct system calls on Linux.Thiago Macieira2009-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Accept that we cannot do everything, so users using outdated toolchains may have threading problems (leaking file descriptors). It's not like this is a recent problem anyway... Reviewed-By: Bradley T. Hughes
| * | QNAM HTTP Code: Moved append() functions to the reply objectMarkus Goetz2009-08-044-36/+37
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | QHttpNetworkConnection: Moved channel slots to channel objectMarkus Goetz2009-08-045-267/+249
| | | | | | | | | | | | Reviewed-by: Peter Hartmann
* | | Compile with Q_DECLARE_SCOPED_PRIVATE.Jason Barron2009-08-041-1/+1
| | | | | | | | | | | | | | | These classes were moved so they were not updated correctly when I did the merge.
* | | Merge commit 'origin/master'Jason Barron2009-08-0432-162/+201
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/corelib/kernel/qmetatype.cpp src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/gui/graphicsview/qgraphicssceneevent.h src/gui/itemviews/qheaderview.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qgesture.h src/gui/kernel/qgesturerecognizer.h src/gui/painting/qpaintengine_raster.cpp src/network/access/qhttpnetworkreply.cpp src/network/access/qnetworkcookie.h src/network/socket/qnativesocketengine_unix.cpp
| * | | Cleanup and applied Qt coding style for qnetworkinterface_symbian.cppJanne Anttila2009-08-041-68/+46
| | | |
| * | | Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-0321-24/+24
| | | | | | | | | | | | | | | | | | | | Contains some smaller fixes and renaming of macros. Looks big, but isn't scary at all ;)
| * | | Trailing whitespace and tab/space fixes for QtNetworkJanne Anttila2009-08-0314-123/+122
| | | |
| * | | Small optimization.Aleksandar Sasha Babic2009-07-241-0/+4
| | | | | | | | | | | | | | | | Do not use route info for addresses other than IPV4.
| * | | For some reason interface info on Symbian will notAleksandar Sasha Babic2009-07-241-2/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | give neither correct netmask nor broadcast address. But, experiments show that route info can be used to obtain netmask. Then is easy to calculate broadcast address. Idea is to match interface and destination address from routeinfo entry, and then to use given netmask. "Machines take me by surprise with great frequency." Alan Turing(1912 - 1954)
* | | | Merge commit 'qt/master-stable'Jason Barron2009-08-0418-362/+761
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/openssl/openssl.pri demos/embedded/embedded.pro examples/itemviews/chart/chart.pro examples/network/network.pro examples/painting/painterpaths/painterpaths.pro examples/threads/mandelbrot/mandelbrot.pro qmake/project.cpp src/3rdparty/libtiff/libtiff/tif_config.h src/corelib/arch/arch.pri src/corelib/global/qglobal.cpp src/corelib/kernel/kernel.pri src/corelib/kernel/qcore_unix_p.h src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/corelib/tools/qsharedpointer_impl.h src/corelib/tools/tools.pri src/gui/kernel/qaction.h src/gui/kernel/qapplication.cpp src/gui/painting/qregion.h src/gui/widgets/qlineedit.cpp src/gui/widgets/qlineedit_p.h src/network/socket/qnativesocketengine_unix.cpp tests/auto/qdir/tst_qdir.cpp tests/auto/qdiriterator/tst_qdiriterator.cpp tests/auto/qhttp/qhttp.pro tests/auto/qline/qline.pro tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qresourceengine/qresourceengine.pro tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qstring/qstring.pro tests/auto/qtcpsocket/qtcpsocket.pro tests/auto/qtcpsocket/tst_qtcpsocket.cpp
| * | | Merge branch '4.5'Thiago Macieira2009-08-032-1/+15
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qsharedpointer.cpp src/corelib/tools/qsharedpointer_impl.h src/gui/dialogs/qcolordialog.cpp src/gui/painting/qwindowsurface_raster.cpp src/network/access/qnetworkaccessmanager.cpp tests/auto/qsharedpointer/externaltests.cpp
| | * | QNAM: Clarify docs about when a QNetworkReply can be deletedMarkus Goetz2009-07-242-2/+16
| | | | | | | | | | | | | | | | | | | | Task-number: 258644 Reviewed-by: Thiago
| * | | Fix compilation and source compatibility.Simon Hausmann2009-07-291-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Source code that includes <QNetworkCookieJar> implicitly includes QNetworkCookie in Qt 4.5. Restore this and keep Qt compiling after the split up by including qnetworkcookie.h from qnetworkcookiejar.h Reviewed-by: Trust me
| * | | Fix compilation: #include <QUrl> was missing.Thiago Macieira2009-07-291-0/+1
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | QNAM HTTP Code: Split QHttpNetworkConnectionMarkus Goetz2009-07-295-75/+234
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Factor our the Channel object to a new file. My goal is to make QHttpNetworkConnection more maintainable before implementing HTTP pipelining. Reviewed-by: Peter Hartmann
| * | | Move the QNetworkCookieJar class out of qnetworkcookie.[h,cpp] files and ↵Benjamin C Meyer2009-07-296-274/+451
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into qnetworkcookiejar[h,_p.h,cpp]. one adjustment was necessary from the merge request: The line 110 in qnetworkcookie.h needed to include qnetworkcookiejar.h, not <QtNetwork/QNetworkCookieJar> . Merge-request: 1015 Reviewed-by: Peter Hartmann
| * | | Port of Qt to VxWorksRobert Griebl2009-07-296-15/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes Qt work on VxWorks 6.6+ in native (kernel) mode. * compiles with the WindRiver GNU toolchain (Linux only) * works with QWS (tested with the VNC driver only) * tested on PPC hardware and the x86 VxWorks simulator * no q3support, no phonon, no webkit * no QSharedMemory, no QSystemSemaphore, no QProcess * only one QApplication instance (flat address space) * filesystem support depends heavily on the quality of the native driver * QLibrary is just a dummy to make plugins work at all * qmake transparently creates VxWorks munching rules for static ctors * made auto-test cope with missing OS features A special note regarding the Q_FOREACH patch for dcc: when calling foreach(a,c) with c being a function returning a container, the compiler would generate 5 references to some labels (.LXXXX), which are not there (so the linker complains in the end). Seems like dcc doesn't really like the 'true ? 0 : <function call to get type>' statement Reviewed-By: Harald Fernengel
* | | | Merge commit 'qt/master-stable'Jason Barron2009-07-291-6/+0
|\ \ \ \ | |/ / /
| * | | QHttpNetworkConnectionPrivate: Removed wrong commentMarkus Goetz2009-07-271-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The comment was speaking about upload progress, however the code is about download progress. Reviewed-by: TrustMe
* | | | Merge commit 'qt/master-stable'Jason Barron2009-07-285-16/+15
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/corelib/io/io.pri src/corelib/io/qfilesystemwatcher.cpp tests/auto/qfileinfo/tst_qfileinfo.cpp tools/configure/configureapp.cpp
| * | | qdoc: Fixed all references to obsolete QHttp classes.Martin Smith2009-07-245-16/+15
| | | |
* | | | Compile fixes after latest merge of 4.6.Jason Barron2009-07-281-0/+5
| | | | | | | | | | | | | | | | | | | | The ususal suspects like QScopedPointer fixes, but also some changes since the introduction of qcore_unix.*
* | | | Merge commit 'qt/master-stable'Jason Barron2009-07-2753-622/+1068
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe qmake/Makefile.unix qmake/generators/makefile.cpp src/corelib/global/qglobal.h src/corelib/kernel/kernel.pri src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/kernel/qaction.cpp src/gui/kernel/qaction.h src/gui/kernel/qaction_p.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget.h src/gui/kernel/qwidget_mac.mm src/gui/painting/qgraphicssystemfactory.cpp src/gui/styles/qwindowsstyle.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qabstractscrollarea_p.h src/network/access/qnetworkaccessdebugpipebackend.cpp src/network/socket/qlocalsocket_unix.cpp src/network/socket/qnativesocketengine_p.h src/network/socket/qnativesocketengine_unix.cpp src/openvg/qpaintengine_vg.cpp tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qcssparser/qcssparser.pro tests/auto/qdir/tst_qdir.cpp tests/auto/qfile/tst_qfile.cpp tests/auto/qobject/tst_qobject.cpp tests/auto/qpathclipper/qpathclipper.pro tests/auto/qprocess/tst_qprocess.cpp tests/auto/qsettings/tst_qsettings.cpp tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qsqlquerymodel/qsqlquerymodel.pro tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro tests/auto/qsqltablemodel/qsqltablemodel.pro tests/auto/qsqlthread/qsqlthread.pro tests/auto/qwidget/tst_qwidget.cpp
| * | Socket code: Forgot since 4.6 doc tagMarkus Goetz2009-07-231-0/+2
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | QNAM HTTP Code: Use new LowDelay socket optionMarkus Goetz2009-07-231-0/+5
| | | | | | | | | | | | Reviewed-by: Thiago
| * | QFtp: Also set LowDelay option on the control socketMarkus Goetz2009-07-231-0/+3
| | | | | | | | | | | | Reviewed-by: Thiago
| * | Sockets: Added support for SO_KEEPALIVE and TCP_NODELAYMarkus Goetz2009-07-238-10/+154
| | | | | | | | | | | | | | | | | | | | | | | | Introduce QAbstractSocket::setSocketOption that allows to set the socket options for TCP Keep Alive and TCP_NODELAY (disabling Nagle's Algorithm). Reviewed-by: Thiago
| * | QNetworkReply: add possibility to ignore specific SSL errorsPeter Hartmann2009-07-2217-15/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the same method was also added to QSslSocket. previously, it was only possible to ignore all SSL errors; now, it is also possible to only ignore specific SSL errors, given by a QList of QSslErrors. Moreover, it is possible to call this newly added method right after connecting, not just when we get the SSL error. Reviewed-by: Thiago Task-number: 257322
| * | Merge commit 'origin/4.5'Olivier Goffart2009-07-223-1/+30
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsscene.cpp src/gui/kernel/qt_cocoa_helpers_mac_p.h
| | * QHttpNetworkConnection: Clarifying code comment about compressionMarkus Goetz2009-07-211-1/+6
| | | | | | | | | | | | Reviewed-by: TrustMe
| | * QNAM: Proper loading of meta data when having AlwaysCache modeMarkus Goetz2009-07-212-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | Properly load the raw headers and properly handle the redirection when having a network cache in AlwaysCache mode (equals the offline mode in web browser). Task-number: 256240 Reviewed-by: Thiago Macieira
| * | qdoc: Reported links to obsolete things that appear in non-obsolete things.Martin Smith2009-07-221-0/+3
| | | | | | | | | | | | Also marked the other QHttpXxx classes as \obsolete.
| * | doc: Changed several \reimp to \internalMartin Smith2009-07-201-2/+2
| | | | | | | | | | | | The base function was \internal pr private.
| * | Merge commit 'origin/4.5'Oswald Buddenhagen2009-07-203-3/+5
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp src/3rdparty/webkit/WebCore/page/DOMWindow.idl src/corelib/io/qdiriterator.cpp src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h tests/auto/qxmlquery/tst_qxmlquery.cpp tools/linguist/lconvert/main.cpp
| | * QUdpSocket: Doc improvementMarkus Goetz2009-07-171-0/+3
| | | | | | | | | | | | | | | Task-number: 236891 Reviewed-By: David Boddie
| | * Removed outdated information from QNetworkRequest documentationMarkus Goetz2009-07-171-3/+1
| | | | | | | | | | | | Reviewed-by: TrustMe
| | * Add a "User-Agent" line to our HTTP proxy requests.Thiago Macieira2009-07-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently some proxy servers can be configured to deny requests based on User-Agent, even for CONNECT connections. See https://bugs.kde.org/show_bug.cgi?id=155707#c155 for an example (packet dump in #c157, analysis in #c158). So send a User-Agent header with value "Mozilla/5.0", hoping that this will be enough to allow the connection. I hope it will, because other tools like libtool send something completely different: User-Agent: curl/7.19.5 (i586-mandriva-linux-gnu) libcurl/7.19.5 GnuTLS/2.8.1 zlib/1.2.3 c-ares/1.6.0 libidn/1.15 libssh2/1.0 Reviewed-by: TrustMe
| * | Doc: some rephrasing and fixingVolker Hilsheimer2009-07-201-33/+32
| | | | | | | | | | | | Reviewed-by: Thiago