diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-05 14:44:02 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-05 14:44:02 (GMT) |
| commit | bae78d4a2cc32952a19e4da9f0486af635ea6d47 (patch) | |
| tree | d56b9b4bc802bae55bde7227677ed1b7045bdcd8 /src/network/access | |
| parent | c2dce7ae678d1206f114dc18f114ddc1b32f3c68 (diff) | |
| parent | b5e0130ff16e908a0e77904f34fa9af93b837dcb (diff) | |
| download | Qt-bae78d4a2cc32952a19e4da9f0486af635ea6d47.zip Qt-bae78d4a2cc32952a19e4da9f0486af635ea6d47.tar.gz Qt-bae78d4a2cc32952a19e4da9f0486af635ea6d47.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Skip test on MacOS due to problems with corewlan plugin
Send User-Agent from the network request in http proxy CONNECT command
Fix initial main window dimensions for "fullscreen with softkeys" case
Fix compile errors in bearer tests
Fix QNetworkConfigurationManager usage outside main thread first
Diffstat (limited to 'src/network/access')
| -rw-r--r-- | src/network/access/qhttpnetworkconnectionchannel.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp index 700b455..bf2fa8f 100644 --- a/src/network/access/qhttpnetworkconnectionchannel.cpp +++ b/src/network/access/qhttpnetworkconnectionchannel.cpp @@ -557,6 +557,12 @@ bool QHttpNetworkConnectionChannel::ensureConnection() connectHost = connection->d_func()->networkProxy.hostName(); connectPort = connection->d_func()->networkProxy.port(); } + if (socket->proxy().type() == QNetworkProxy::HttpProxy) { + // Make user-agent field available to HTTP proxy socket engine (QTBUG-17223) + QByteArray value = request.headerField("user-agent"); + if (!value.isEmpty()) + socket->setProperty("_q_user-agent", value); + } #endif if (connection->d_func()->encrypt) { #ifndef QT_NO_OPENSSL |