diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-06-09 11:55:14 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-06-09 11:55:14 (GMT) |
| commit | fc2a790e96be47b4da3e308c5e0272e4840a2618 (patch) | |
| tree | 4c1cd7998777252463a060d4ce73f284441d7c22 /src/network/socket/qhttpsocketengine.cpp | |
| parent | 7b4e52045d17bcc4b3bb1e0973c3af2e48381c5e (diff) | |
| parent | 3916feefc5ebadba3320029a29ecf02d8934e879 (diff) | |
| download | Qt-fc2a790e96be47b4da3e308c5e0272e4840a2618.zip Qt-fc2a790e96be47b4da3e308c5e0272e4840a2618.tar.gz Qt-fc2a790e96be47b4da3e308c5e0272e4840a2618.tar.bz2 | |
Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8
Conflicts:
doc/src/declarative/righttoleft.qdoc
examples/draganddrop/fridgemagnets/main.cpp
examples/script/context2d/main.cpp
Diffstat (limited to 'src/network/socket/qhttpsocketengine.cpp')
| -rw-r--r-- | src/network/socket/qhttpsocketengine.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/network/socket/qhttpsocketengine.cpp b/src/network/socket/qhttpsocketengine.cpp index 5f5db17..5c672ec 100644 --- a/src/network/socket/qhttpsocketengine.cpp +++ b/src/network/socket/qhttpsocketengine.cpp @@ -149,6 +149,8 @@ bool QHttpSocketEngine::connectInternal() // Handshake isn't done. If unconnected, start connecting. if (d->state == None && d->socket->state() == QAbstractSocket::UnconnectedState) { setState(QAbstractSocket::ConnectingState); + //limit buffer in internal socket, data is buffered in the external socket under application control + d->socket->setReadBufferSize(65536); d->socket->connectToHost(d->proxy.hostName(), d->proxy.port()); } |