From c990f38a5daaad0e4ac13a3240a3b16da86d6047 Mon Sep 17 00:00:00 2001
From: "Jonas M. Gastal" <jgastal@profusion.mobi>
Date: Thu, 24 Nov 2011 13:34:04 -0200
Subject: [PATCH] Removing unnecessary hidden property "_q_user-agent".

This property is no longer necessary because we can now set the user
agent directly on the proxy.

Task-number: QTBUG-17223
Change-Id: I27cb126dd401f02525290d2317650f55cae9f4ef
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
---
 src/network/access/qhttpnetworkconnectionchannel.cpp |  2 +-
 src/network/socket/qabstractsocket.cpp               |  4 ----
 src/network/socket/qhttpsocketengine.cpp             | 11 ++---------
 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 6bc1ae73ac9..072648cf626 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 a342a95c078..d74a717d934 100644
--- a/src/network/socket/qabstractsocket.cpp
+++ b/src/network/socket/qabstractsocket.cpp
@@ -594,10 +594,6 @@ bool QAbstractSocketPrivate::initSocketLayer(QAbstractSocket::NetworkLayerProtoc
 #ifndef QT_NO_BEARERMANAGEMENT
     //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)
diff --git a/src/network/socket/qhttpsocketengine.cpp b/src/network/socket/qhttpsocketengine.cpp
index 428d21dc72c..fd0119b8fd8 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 6017e2f3a9a..05f50af6f15 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);