summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-07-15 10:36:58 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-07-15 10:36:59 +0200
commit1190863fc0855ef25e7239e35da3978f317638bd (patch)
tree92c408f7c53f194639d2a10b82f5c90a85704776 /src/network
parent02afd94ef4c1913735bd650ca93279cfb00dc534 (diff)
parente4484bb15b29b01dba07cbc31c150153f537606a (diff)
Merge remote-tracking branch 'origin/stable' into dev
Diffstat (limited to 'src/network')
-rw-r--r--src/network/socket/qhttpsocketengine.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/network/socket/qhttpsocketengine.cpp b/src/network/socket/qhttpsocketengine.cpp
index e3aae8ef0d..f2a1633bd3 100644
--- a/src/network/socket/qhttpsocketengine.cpp
+++ b/src/network/socket/qhttpsocketengine.cpp
@@ -497,12 +497,13 @@ void QHttpSocketEngine::slotSocketConnected()
Q_D(QHttpSocketEngine);
// Send the greeting.
- const char method[] = "CONNECT ";
+ const char method[] = "CONNECT";
QByteArray peerAddress = d->peerName.isEmpty() ?
d->peerAddress.toString().toLatin1() :
QUrl::toAce(d->peerName);
QByteArray path = peerAddress + ':' + QByteArray::number(d->peerPort);
QByteArray data = method;
+ data += " ";
data += path;
data += " HTTP/1.1\r\n";
data += "Proxy-Connection: keep-alive\r\n";