diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2011-05-10 09:23:30 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2011-05-10 09:23:30 (GMT) |
| commit | e81ba9b802d6a5439b672c847aa9741cf3229227 (patch) | |
| tree | ebb7f1e5dbd83279ee60e51be9884a4e57122138 /src/network/ssl | |
| parent | e75796dfa58652ec8998227d9f547eea990a0353 (diff) | |
| parent | 19edac88af53eea7f733cabbaee77f9b725b7ea9 (diff) | |
| download | Qt-e81ba9b802d6a5439b672c847aa9741cf3229227.zip Qt-e81ba9b802d6a5439b672c847aa9741cf3229227.tar.gz Qt-e81ba9b802d6a5439b672c847aa9741cf3229227.tar.bz2 | |
Merge branch 'symbian-socket-engine' into staging-master
Diffstat (limited to 'src/network/ssl')
| -rw-r--r-- | src/network/ssl/qsslsocket.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index 0dbf4b5..2695df1 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -1736,6 +1736,8 @@ 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); |