summaryrefslogtreecommitdiffstats
path: root/src/network
Commit message (Collapse)AuthorAgeFilesLines
* QNetworkDiskCache: add code snippets in documentationPeter Hartmann2009-06-221-0/+14
| | | | | | | | should make it easier to apply a network disk cache with code snippets now Reviewed-by: David Boddie <dboddie@trolltech.com> Reviewed-by: Martin Petersson <martin.petersson@trolltech.com>
* Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-191-3/+2
|\
| * QNetworkAccessManager: Clarify doc about deleting QNetworkReplyMarkus Goetz2009-06-181-3/+2
| | | | | | | | Reviewed-by: Volker Hilsheimer
* | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-181-1/+2
|\ \ | |/ | | | | | | | | | | Conflicts: configure.exe tests/auto/qpainter/tst_qpainter.cpp translations/qt_ru.ts
| * QNAM HTTP code: Do not close TCP connection in all casesMarkus Goetz2009-06-181-1/+2
| | | | | | | | | | | | | | | | | | | | This makes sure the keep-alive connections stay open even if someone deletes a QNetworkReply which will then go all the way down to removeReply(QHttpNetworkReply). Should fix http://lists.trolltech.com/pipermail/qt-interest/2009-June/007777.html Reviewed-by: Peter Hartmann
* | QNAM: More comments, some renamingsMarkus Goetz2009-06-177-34/+50
| | | | | | | | | | | | | | Renamed some classes and member variables. Their names were causing confusion before because. Reviewed-by: Peter Hartmann
* | QNAM: Added comment to de-confuse myselfMarkus Goetz2009-06-171-0/+1
| | | | | | | | I mixed this up several times before, so here is the comment for it.
* | QSslCertificate: Doc fixMarkus Goetz2009-06-171-3/+4
| | | | | | | | Change doc that refered to functions that got renamed
* | QIoDevice and QAbstractSocket: Clarify doc about waitForReadyRead()Markus Goetz2009-06-171-2/+2
| |
* | QNAM: Use QTcpSocket for HTTP if no encryption was requestedMarkus Goetz2009-06-171-9/+26
| | | | | | | | | | | | | | This stops QNetworkAccessManager from loading the OpenSSL libs, certificates etc. when they are not needed for the non-HTTPS case. Reviewed-by: mariusSO
* | Merge license header changes from 4.5Volker Hilsheimer2009-06-16127-255/+255
|\ \ | |/
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-16127-254/+254
| | | | | | | | Reviewed-by: Trust Me
| * Fix wrong comparator in QSslCertificatePrivate::QByteArray_from_X509Markus Goetz2009-06-151-1/+1
| | | | | | | | | | | | | | | | | | Because less-than instead of less-or-equal-than was used, the last line of a PEM encoding was not built when the raw length was multiple of 64. Task-number: 256066 Reviewed-by: mariusSO
* | QSslCertificate: lazy loading of some dataMarkus Goetz2009-06-161-5/+11
| | | | | | | | Reviewed-by: Andreas Aardal Hanssen
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBjørn Erik Nilsen2009-06-121-3/+5
|\ \
| * | QHttp: Class made obsolete, changed module QDoc.Markus Goetz2009-06-121-3/+5
| | | | | | | | | | | | | | | | | | | | | This should better communicate that new applications should use QNetworkAccessManager. Reviewed-by: David Boddie
* | | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-126-3/+60
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp src/gui/graphicsview/qgraphicsitem.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tools/linguist/shared/cpp.cpp translations/linguist_ja.qm translations/qt_ru.qm
| * QSslSocket: Wrong warning message in startServerEncryptionMarkus Goetz2009-06-101-1/+1
| | | | | | | | Reviewed-by: TrustMe
| * Make it possible to compile Qt 4.5 SSL support with OpenSSL 1.0.0Bernhard Rosenkraenzer2009-06-095-2/+59
| | | | | | | | | | | | | | (-beta2, but 1.0.0 final shouldn't be very different) Merge-request: 449 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | Allow a maximum of 6 simultaneous HTTP connections to a server.Prasanth Ullattil2009-06-122-18/+21
| | | | | | | | | | | | | | | | | | | | Even though the standard mandates a maximum of 2 connections, most new browsers support atleast 6 connections. So we are also bumping the limit. Task-number: 251144 Reviewed-by: Markus Goetz Reviewed-by: Peter Hartmann
* | QHttpNetworkConnection: Removed an unnecessary/dead checkMarkus Goetz2009-06-113-16/+12
| |
* | QHttpNetworkConnection: Some renamingsMarkus Goetz2009-06-112-17/+14
| | | | | | | | Reviewed-by: Prasanth
* | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-082-1/+6
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/3rdparty/phonon/qt7/mediaobject.mm src/3rdparty/phonon/qt7/quicktimevideoplayer.mm src/gui/text/qfontengine_win.cpp tools/linguist/shared/cpp.cpp
| * Doc typo fix in QSslSocketMarkus Goetz2009-06-081-1/+1
| | | | | | | | Reviewed-by: TrustMe
| * Set the error to be HostUnreacheable if WSAEHOSTUNREACH is recievedAndy Shaw2009-06-081-0/+5
| | | | | | | | | | | | | | This was a contribution sent via the public bugs channel. Task-number: 255161 Reviewed-by: Marius Storm-Olsen
* | QNetworkAccessManager: forgot the "since" tag in my previous commitPeter Hartmann2009-06-051-0/+2
| | | | | | | | Reviewed-by: trustMe
* | add HTTP DELETE support to Network Access APIPeter Hartmann2009-06-053-2/+29
| | | | | | | | | | | | | | | | | | added new method QNetworkAccessManager::deleteResource (naming the method "delete" was not possible since it is a reserverd word in C++) and adjusted all the internals necessary. Task-number: 242916 Reviewed-by: Thiago
* | Compile when -no-qt3-support is on.Sarah Smith2009-06-051-0/+1
| | | | | | | | | | | | | | As checked in was compiling with QDataStream(QByteArray *, int) and that method is only available when compiling with qt3 support. Reviewed-by: Julian de Bhal
* | All of Qt's own code compiles with -pedantic now (but pcre and webkit don't ↵David Faure2009-06-041-1/+1
| | | | | | | | | | | | | | seem fixable easily) Merge-request: 594 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* | Merge commit 'origin/4.5'Olivier Goffart2009-06-041-2/+2
|\ \ | |/
| * open pipes in overlapped mode also on the client sideOswald Buddenhagen2009-06-031-2/+2
| | | | | | | | | | | | otherwise PeekNamedPipe() may block in threaded environments. Reviewed-by: thiago
* | improved string operations all over the placeThierry Bastian2009-05-2814-39/+39
| | | | | | | | | | used character operations whenever possible better usage of QLatin1String
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-274-36/+22
|\ \ | |/ | | | | | | Conflicts: tests/auto/qtreeview/tst_qtreeview.cpp
| * QNetworkReply internals: do not assert when aborted and reading dataPeter Hartmann2009-05-271-1/+2
| | | | | | | | | | | | | | | | ...but just silently return. This is ok because at another location in QNetworkReplyImplPrivate we do the same. Reviewed-by: Thiago Task-number: 254638
| * SSL: Remove broken system certificate loading codeMarkus Goetz2009-05-261-24/+1
| | | | | | | | | | Task-number: 254365 Reviewed-by: Peter Hartmann
| * Doc: Clarified what close(), abort() and disconnectFromHost() really doDavid Boddie2009-05-251-10/+18
| | | | | | | | | | | | | | | | | | | | | | to the socket connection. (Reviewed - see below.) Also included corrections to the description of how to send SocketError and SocketState values via signals. (Trust me - as part of an earlier revision of the custom types documentation.) Task-number: 222907 Reviewed-by: Andy Shaw
| * Doc: Miscellaneous documentation fixes for Qt 4.5.x and later.David Boddie2009-05-251-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.5'Thiago Macieira2009-05-231-15/+0
|\ \ | |/
| * Fix another compilation breakage introduced by the fix to theThiago Macieira2009-05-231-15/+0
| | | | | | | | | | | | | | | | | | compilation breakage introduced in 6c1d7e57. The fix in fc7a43cce did fix the failure, but created another one because qhostinfo_win.cpp also had a copy of qt_sockaddr_in6 Reviewed-by: Jason McDonald
* | Merge branch '4.5'Thiago Macieira2009-05-227-49/+40
|\ \ | |/ | | | | | | Conflicts: src/corelib/kernel/qsharedmemory_unix.cpp
| * Fix compilation breakage on Windows caused by 6c1d7e57.Thiago Macieira2009-05-223-41/+32
| | | | | | | | | | | | | | On Windows, QT_NO_IPV6 isn't defined, but the necessary includes were missing. So #include winsock2.h and also use our own structures. Reviewed-By: Trust Me
| * Fixed compilation with -qtnamespaceMarkus Goetz2009-05-224-8/+8
| | | | | | | | | | Task-number: 254333 Reviewed-by: Andy Shaw <qt-info@nokia.com>
* | Merge branch '4.5'Thiago Macieira2009-05-222-41/+29
|\ \ | |/
| * Fixed strict aliasing breaks with sockaddr_XXX structs.Thiago Macieira2009-05-222-41/+29
| | | | | | | | | | | | | | | | | | This case it was possible to fix by using a union of the types when we actually declare the variable. Besides, this avoids a bunch of #ifdef for IPv6 functionality. Reviewed-By: Oswald Buddenhagen
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-194-6/+6
|\ \ | |/
| * Fix some typos in the documentation.Frederik Schwarzer2009-05-183-3/+3
| | | | | | | | | | | | Usually, "the the" is not proper English Reviewed-By: Thiago Macieira
| * Fix QNetworkDiskCache to expire the oldest files first.Benjamin C Meyer2009-05-181-3/+3
| | | | | | | | | | | | | | | | | | | | When expiring cache files use a QMultiMap, when using a QMap not all files are put into the map because often many files (downloaded or updated at the same time) will have the same creation QDateTime and so only one will go into the QMap who's key is QDateTime. Reviewed-By: Thiago Macieira Reviewed-By: Peter Hartmann
* | Fixed typo.jasplin2009-05-191-1/+1
| | | | | | | | Reviewed-by: TrustMe
* | Fix compilation after mergeOlivier Goffart2009-05-181-0/+1
| |
* | Merge commit 'origin/4.5'Olivier Goffart2009-05-181-19/+27
|\ \ | |/ | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp src/corelib/kernel/qobject_p.h src/network/access/qhttpnetworkconnection.cpp
generated by cgit v0.12 at 2024-11-25 19:33:55 (GMT)