diff options
| -rw-r--r-- | src/network/access/qhttpnetworkconnectionchannel.cpp | 2 | ||||
| -rw-r--r-- | src/network/socket/qabstractsocket.cpp | 4 | ||||
| -rw-r--r-- | src/network/socket/qhttpsocketengine.cpp | 11 | ||||
| -rw-r--r-- | src/network/ssl/qsslsocket.cpp | 2 |
4 files changed, 3 insertions, 16 deletions
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp index 6bc1ae73ac..072648cf62 100644 --- a/src/network/access/qhttpnetworkconnectionchannel.cpp +++ b/src/network/access/qhttpnetworkconnectionchannel.cpp @@ -581,7 +581,7 @@ bool QHttpNetworkConnectionChannel::ensureConnection() else value = request.headerField("user-agent"); if (!value.isEmpty()) - socket->setProperty("_q_user-agent", value); + socket->proxy().setRawHeader("User-Agent", value); } #endif if (ssl) { diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index a342a95c07..d74a717d93 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -595,10 +595,6 @@ bool QAbstractSocketPrivate::initSocketLayer(QAbstractSocket::NetworkLayerProtoc //copy network session down to the socket engine (if it has been set) socketEngine->setProperty("_q_networksession", q->property("_q_networksession")); #endif -#ifndef QT_NO_NETWORKPROXY - //copy user agent to socket engine (if it has been set) - socketEngine->setProperty("_q_user-agent", q->property("_q_user-agent")); -#endif if (!socketEngine->initialize(q->socketType(), protocol)) { #if defined (QABSTRACTSOCKET_DEBUG) qDebug("QAbstractSocketPrivate::initSocketLayer(%s, %s) failed (%s)", diff --git a/src/network/socket/qhttpsocketengine.cpp b/src/network/socket/qhttpsocketengine.cpp index 428d21dc72..fd0119b8fd 100644 --- a/src/network/socket/qhttpsocketengine.cpp +++ b/src/network/socket/qhttpsocketengine.cpp @@ -504,15 +504,8 @@ void QHttpSocketEngine::slotSocketConnected() data += " HTTP/1.1\r\n"; data += "Proxy-Connection: keep-alive\r\n"; data += "Host: " + peerAddress + "\r\n"; - if (!d->proxy.hasRawHeader("User-Agent")) { - data += "User-Agent: "; - QVariant v = property("_q_user-agent"); - if (v.isValid()) - data += v.toByteArray(); - else - data += "Mozilla/5.0"; - data += "\r\n"; - } + if (!d->proxy.hasRawHeader("User-Agent")) + data += "User-Agent: Mozilla/5.0\r\n"; foreach (const QByteArray &header, d->proxy.rawHeaderList()) { data += header + ": " + d->proxy.rawHeader(header) + "\r\n"; } diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index 6017e2f3a9..05f50af6f1 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -1749,8 +1749,6 @@ void QSslSocket::connectToHostImplementation(const QString &hostName, quint16 po } #ifndef QT_NO_NETWORKPROXY d->plainSocket->setProxy(proxy()); - //copy user agent down to the plain socket (if it has been set) - d->plainSocket->setProperty("_q_user-agent", property("_q_user-agent")); #endif QIODevice::open(openMode); d->plainSocket->connectToHost(hostName, port, openMode, d->preferredNetworkLayerProtocol); |