1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removing unnecessary hidden property "_q_user-agent".

Browse Source 
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>
This commit is contained in:
Jonas M. Gastal 2011-11-24 13:34:04 -02:00 committed by Qt by Nokia
parent 4cffc72023
commit c990f38a5d
4 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/access/qhttpnetworkconnectionchannel.cpp
View File

@ -581,7 +581,7 @@ bool QHttpNetworkConnectionChannel::ensureConnection()
else else
value = request.headerField("user-agent"); value = request.headerField("user-agent");
if (!value.isEmpty()) if (!value.isEmpty())
socket->setProperty("_q_user-agent", value); socket->proxy().setRawHeader("User-Agent", value);
} }
#endif #endif
if (ssl) { if (ssl) {

4
src/network/socket/qabstractsocket.cpp
View File

@ -594,10 +594,6 @@ bool QAbstractSocketPrivate::initSocketLayer(QAbstractSocket::NetworkLayerProtoc
#ifndef QT_NO_BEARERMANAGEMENT #ifndef QT_NO_BEARERMANAGEMENT
//copy network session down to the socket engine (if it has been set) //copy network session down to the socket engine (if it has been set)
socketEngine->setProperty("_q_networksession", q->property("_q_networksession")); 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 #endif
if (!socketEngine->initialize(q->socketType(), protocol)) { if (!socketEngine->initialize(q->socketType(), protocol)) {
#if defined (QABSTRACTSOCKET_DEBUG) #if defined (QABSTRACTSOCKET_DEBUG)

11
src/network/socket/qhttpsocketengine.cpp
View File

@ -504,15 +504,8 @@ void QHttpSocketEngine::slotSocketConnected()
data += " HTTP/1.1\r\n"; data += " HTTP/1.1\r\n";
data += "Proxy-Connection: keep-alive\r\n"; data += "Proxy-Connection: keep-alive\r\n";
data += "Host: " + peerAddress + "\r\n"; data += "Host: " + peerAddress + "\r\n";
if (!d->proxy.hasRawHeader("User-Agent")) { if (!d->proxy.hasRawHeader("User-Agent"))
data += "User-Agent: "; data += "User-Agent: Mozilla/5.0\r\n";
QVariant v = property("_q_user-agent");
if (v.isValid())
data += v.toByteArray();
else
data += "Mozilla/5.0";
data += "\r\n";
}
foreach (const QByteArray &header, d->proxy.rawHeaderList()) { foreach (const QByteArray &header, d->proxy.rawHeaderList()) {
data += header + ": " + d->proxy.rawHeader(header) + "\r\n"; data += header + ": " + d->proxy.rawHeader(header) + "\r\n";
} }

2
src/network/ssl/qsslsocket.cpp
View File

@ -1749,8 +1749,6 @@ void QSslSocket::connectToHostImplementation(const QString &hostName, quint16 po
} }
#ifndef QT_NO_NETWORKPROXY #ifndef QT_NO_NETWORKPROXY
d->plainSocket->setProxy(proxy()); 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 #endif
QIODevice::open(openMode); QIODevice::open(openMode);
d->plainSocket->connectToHost(hostName, port, openMode, d->preferredNetworkLayerProtocol); d->plainSocket->connectToHost(hostName, port, openMode, d->preferredNetworkLayerProtocol);