summaryrefslogtreecommitdiffstats
path: root/src/network/socket/qhttpsocketengine.cpp
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@accenture.com>2011-05-10 09:23:30 (GMT)
committerShane Kearns <shane.kearns@accenture.com>2011-05-10 09:23:30 (GMT)
commite81ba9b802d6a5439b672c847aa9741cf3229227 (patch)
treeebb7f1e5dbd83279ee60e51be9884a4e57122138 /src/network/socket/qhttpsocketengine.cpp
parente75796dfa58652ec8998227d9f547eea990a0353 (diff)
parent19edac88af53eea7f733cabbaee77f9b725b7ea9 (diff)
downloadQt-e81ba9b802d6a5439b672c847aa9741cf3229227.zip
Qt-e81ba9b802d6a5439b672c847aa9741cf3229227.tar.gz
Qt-e81ba9b802d6a5439b672c847aa9741cf3229227.tar.bz2
Merge branch 'symbian-socket-engine' into staging-master
Diffstat (limited to 'src/network/socket/qhttpsocketengine.cpp')
-rw-r--r--src/network/socket/qhttpsocketengine.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/network/socket/qhttpsocketengine.cpp b/src/network/socket/qhttpsocketengine.cpp
index 7846056..a8a11a7 100644
--- a/src/network/socket/qhttpsocketengine.cpp
+++ b/src/network/socket/qhttpsocketengine.cpp
@@ -501,7 +501,13 @@ void QHttpSocketEngine::slotSocketConnected()
data += path;
data += " HTTP/1.1\r\n";
data += "Proxy-Connection: keep-alive\r\n"
- "User-Agent: Mozilla/5.0\r\n"
+ "User-Agent: ";
+ QVariant v = property("_q_user-agent");
+ if (v.isValid())
+ data += v.toByteArray();
+ else
+ data += "Mozilla/5.0";
+ data += "\r\n"
"Host: " + peerAddress + "\r\n";
QAuthenticatorPrivate *priv = QAuthenticatorPrivate::getPrivate(d->authenticator);
//qDebug() << "slotSocketConnected: priv=" << priv << (priv ? (int)priv->method : -1);