summaryrefslogtreecommitdiffstats
path: root/src/network/access
Commit message (Collapse)AuthorAgeFilesLines
* Remove QObject::tr() in the network module code.Friedemann Kleint2010-02-243-5/+8
|
* Merge remote branch 'origin/master' into bearermanagement/unit-testsAaron McCarthy2010-02-2214-103/+217
|\ | | | | | | | | Conflicts: src/network/access/qnetworkaccessmanager.cpp
| * Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-195-49/+70
| |\ | | | | | | | | | | | | Conflicts: tools/assistant/lib/qhelpsearchindexreader_clucene_p.h
| | * QNAM HTTP: Clean code a bitMarkus Goetz2010-02-182-29/+45
| | | | | | | | | | | | | | | | | | .. and some changes that will help us track down bugs Reviewed-by: Peter Hartmann
| | * QNAM HTTP: Always set channel.reply to 0 when doneMarkus Goetz2010-02-185-22/+27
| | | | | | | | | | | | | | | | | | | | | This will help us to track down a sporadic bug that made requests being sent again even if they were already done. Reviewed-by: Peter Hartmann
| * | Merge remote branch 'origin/4.6' into integration-master-from-4.6Rohan McGovern2010-02-181-1/+1
| |\ \ | | |/ | | | | | | | | | Conflicts: src/corelib/codecs/qtextcodec.h
| | * HTTP backend: remove commentPeter Hartmann2010-02-171-1/+1
| | | | | | | | | | | | | | | | | | the date header always needs to be updated in the cache. Task-number: QTBUG-7466
| * | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-188-29/+108
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/codecs/qtextcodec.h tests/auto/gestures/tst_gestures.cpp
| | * | QNAM HTTP: More micro optimization in QHttpNetworkRequestMarkus Goetz2010-02-171-3/+7
| | | | | | | | | | | | | | | | Reviewed-by: Zeno Albisser
| | * | QNAM HTTP: Some micro optimization in QHttpNetworkRequestMarkus Goetz2010-02-171-9/+16
| | | | | | | | | | | | | | | | Reviewed-by: Thiago
| | * | QNAM HTTP: Trivial optimizationMarkus Goetz2010-02-171-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reorder switch. Directly return instead of having a null QByteArray, using append and then returning it. Reviewed-by: Peter Hartmann
| | * | QNetworkAccessManager: add method to send custom requestsPeter Hartmann2010-02-168-6/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method was added to support e.g. HTTP OPTIONS (needed by Webkit); rather than adding one method for each of those exotic verbs, there is now a generic version for all. Reviewed-by: Markus Goetz Reviewed-by: Andreas Kling Task-number: QTBUG-8206
| * | | Merge branch '4.6' into qt-master-from-4.6Thiago Macieira2010-02-172-24/+38
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tools/assistant/tools/assistant/helpviewer.cpp
| | * QNAM HTTP: Unify socket EOF handling a bitMarkus Goetz2010-02-162-24/+38
| | | | | | | | | | | | Reviewed-by: Peter Hartmann
* | | Allow QNAM to be created as a global variable.Aaron McCarthy2010-02-182-3/+9
| | | | | | | | | | | | | | | | | | QNetworkConfigurationManager cannot be loaded before QApplication as the plugins it loads may create timers. Which fail because timers can only be created in threads created with QThread.
* | | Fix segfault.Aaron McCarthy2010-02-161-14/+17
| | | | | | | | | | | | manager may be 0.
* | | Reorder members to remove hole.Aaron McCarthy2010-02-151-4/+4
| | |
* | | Expand documentation for QNAM::setConfiguration() and friends.Aaron McCarthy2010-02-151-4/+29
| | |
* | | Merge remote branch 'origin/master' into bearermanagement/integrationAaron McCarthy2010-02-142-11/+11
|\ \ \ | |/ / | | | | | | | | | Conflicts: tests/auto/qlineedit/tst_qlineedit.cpp
| * | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-131-1/+1
| |\ \ | | |/ | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp
| | * doc: Fixed several typos.Martin Smith2010-02-121-1/+1
| | | | | | | | | | | | Task: QTBUG-7997
| * | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-124-34/+65
| |\ \ | | |/
| | * QNAM HTTP: Optimize detectPipeliningSupport()Markus Goetz2010-02-111-7/+7
| | | | | | | | | | | | | | | | | | Do cheap checks first. Reviewed-by: TrustMe
| | * QNAM HTTP: Set channel to IdleState at better placeMarkus Goetz2010-02-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The readyRead() from the expand() function called from allDone() had a new request triggered for that channel even if it is not really finished yet. Move the assignment to IdleState inside allDone to avoid this error. Reviewed-by: Andreas Kling Reviewed-by: Peter Hartmann
* | | Fix build on Windows.Aaron McCarthy2010-02-124-2/+4
| | | | | | | | | | | | | | | On Windows interface is #defined to struct. Make sure that qnetworksession.h is included before qplatformdefs.h.
* | | Move http resume code into http backend.Aaron McCarthy2010-02-124-18/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds two new virtual functions to QNetworkAccessBackend: bool canResume() const; and void setResumeOffset(quint64) canResume() is used to query the existing backend if resuming is supported for the current request. setResumeOffset() is used to set an additional offset which should be applied when the backend posts the request. The default implementation of canResume() returns false (resuming not supported). The default implementation of setResumeOffset() does nothing.
* | | Fix compiler warning, unused variable.Aaron McCarthy2010-02-121-2/+0
| | |
* | | Merge remote branch 'origin/master' into bearermanagement/integrationAaron McCarthy2010-02-116-48/+100
|\ \ \ | |/ / | | | | | | | | | Conflicts: configure
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-042-3/+23
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Use a shared QScriptEngine for debugger console command scripts Fix QtScript debugger hang/crash issue with updating locals model doc: Fixed some qdoc warnings. Always activate popup windows on show doc: Fixed some qdoc warnings. Add the QMAKE_FILE_EXT variable to extra compilers generation. Cocoa: Tool Windows steal focus from the main window qdoc3: Removed a debug output. Update QTestLib documentation with chart use case.
| | * | doc: Fixed some qdoc warnings.Martin Smith2010-02-042-3/+23
| | | |
| * | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-043-10/+27
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/assistant/simpletextviewer/findfiledialog.cpp qmake/generators/symbian/symmake.cpp tools/assistant/lib/qhelpgenerator.cpp tools/assistant/lib/qhelpsearchquerywidget.cpp translations/translations.pri
| * | | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-015-22/+41
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qeventdispatcher_mac.mm src/gui/kernel/qt_cocoa_helpers_mac.mm src/gui/widgets/qmenu_mac.mm tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * \ \ \ Merge commit 'oslo1/master' into oslo1-masterRohan McGovern2010-02-014-48/+71
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/getting-started/installation.qdoc src/gui/dialogs/qfiledialog_win.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/assistant/tools/assistant/helpviewer.cpp
| | * \ \ \ Merge branch '4.6'Thiago Macieira2010-01-214-65/+48
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/assistant/lib/qhelpsearchquerywidget.cpp
| | * \ \ \ \ Merge branch '4.6'Thiago Macieira2010-01-181-1/+1
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.6'Thiago Macieira2010-01-1355-127/+236
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt doc/src/deployment/deployment.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/xml/qxmlstream.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| | * | | | | | | QNAM: Add priority to the API and use it for HTTPHolger Hans Peter Freyther2010-01-123-1/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QHttpNetworkRequest and other classes already knew about the priority. Change QNetworkRequest to export this as API. It will be used in WebKit to tag high priority html, javascript and css files as such. Reviewed-By: Markus Goetz
| | * | | | | | | Merge branch '4.6'Thiago Macieira2009-12-262-3/+3
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/fancybrowser/main.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tools/assistant/tools/assistant/bookmarkmanager.cpp
| | * \ \ \ \ \ \ \ Merge commit 'origin/4.6'Olivier Goffart2009-12-151-1/+3
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine.cpp src/network/access/qnetworkrequest.cpp tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
| | * | | | | | | | | Added missing include file.jasplin2009-12-151-0/+1
| | | | | | | | | | |
| | * | | | | | | | | Move data: decoding to functionThorvald Natvig2009-12-021-47/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1560 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | | | | | | | | | Merge commit 'origin/4.6' into oslo1-masterRohan McGovern2010-02-0155-200/+297
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/deployment/deployment.qdoc doc/src/getting-started/installation.qdoc examples/assistant/simpletextviewer/findfiledialog.cpp examples/assistant/simpletextviewer/findfiledialog.h examples/assistant/simpletextviewer/mainwindow.cpp examples/webkit/fancybrowser/main.cpp src/corelib/global/qglobal.h src/gui/dialogs/qfiledialog_win.cpp src/plugins/qpluginbase.pri src/qbase.pri tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/compat/config.cpp tools/assistant/compat/config.h tools/assistant/compat/docuparser.cpp tools/assistant/compat/docuparser.h tools/assistant/compat/fontsettingsdialog.cpp tools/assistant/compat/helpdialog.cpp tools/assistant/compat/helpdialog.h tools/assistant/compat/helpdialog.ui tools/assistant/compat/helpwindow.cpp tools/assistant/compat/helpwindow.h tools/assistant/compat/index.cpp tools/assistant/compat/index.h tools/assistant/compat/lib/qassistantclient.cpp tools/assistant/compat/lib/qassistantclient.h tools/assistant/compat/main.cpp tools/assistant/compat/mainwindow.cpp tools/assistant/compat/mainwindow.h tools/assistant/compat/mainwindow.ui tools/assistant/compat/profile.cpp tools/assistant/compat/profile.h tools/assistant/compat/tabbedbrowser.cpp tools/assistant/compat/tabbedbrowser.h tools/assistant/compat/tabbedbrowser.ui tools/assistant/compat/topicchooser.cpp tools/assistant/compat/topicchooser.ui tools/assistant/lib/qhelpsearchquerywidget.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/assistant/tools/assistant/doc/assistant.qdocconf tools/assistant/tools/assistant/helpviewer.cpp tools/linguist/lupdate/main.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| * | | | | | | | | | Merge branch '4.6'Thiago Macieira2009-11-2513-43/+446
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/modules.qdoc examples/assistant/simpletextviewer/findfiledialog.cpp examples/webkit/fancybrowser/mainwindow.cpp src/gui/widgets/qtabbar.cpp src/gui/widgets/qtabbar_p.h tests/auto/qpixmap/tst_qpixmap.cpp tools/assistant/compat/helpdialog.cpp tools/assistant/compat/tabbedbrowser.cpp translations/translations.pri
| * | | | | | | | | | | QNAM: Add direct access to the RawHeaderHolger Hans Peter Freyther2009-11-112-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide direct access to the header fields. This makes QNetworkReplyHandler::sendResponseIfNedded drop out of the profile on the loading_standalone test case. Reviewed-By: Markus Goetz
* | | | | | | | | | | | Merge remote branch 'origin/4.6' into bearermanagement/integrationAaron McCarthy2010-02-119-37/+85
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/s60installs.pro
| * | | | | | | | | | | QNAM HTTP: Forgot to remove a qDebug()Markus Goetz2010-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | | | | | | | | QNAM HTTP: Reserve bytes for HTTP parsingMarkus Goetz2010-02-091-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann
| * | | | | | | | | | | QNetworkCookie(Jar): fix includesPeter Hartmann2010-02-092-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we need to include the module preefix in public headers Reviewed-by: Denis Dzyubenko
| * | | | | | | | | | | QNAM HTTP: Improve readHeader() of the HTTP replyMarkus Goetz2010-02-091-11/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just read() instead us using peek() and bytesAvailable() Also don't use the obfuscated line ending checking code. Reviewed-by: Peter Hartmann
| * | | | | | | | | | | QNAM HTTP: Improve parseStatus() of HTTP replyMarkus Goetz2010-02-091-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just read() instead us using peek() and bytesAvailable() Reviewed-by: Peter Hartmann
generated by cgit v0.12 at 2024-12-29 09:49:50 (GMT)