diff options
| author | Shane Kearns <ext-shane.2.kearns@nokia.com> | 2012-06-12 16:46:37 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-21 00:58:19 +0200 |
| commit | 98fd2eeb6292d3391b7364493b960f818896fa23 (patch) | |
| tree | 21352980ab5abc123d3b09066f916c0c36975f18 /src/network/socket/qsocks5socketengine_p.h | |
| parent | d527f2b9339e20500be0b1c46d81625ba0583895 (diff) | |
| download | qtbase-98fd2eeb6292d3391b7364493b960f818896fa23.tar.gz | |
Handle fragmented responses on SOCKS5 control channel
Server responses may arrive in more than one packet, though this
is rare due to nagle algorithm.
Also fixed IPv6 addresses being discarded from server responses,
which was caught by the new autotest.
Task-number: QTBUG-18564
Change-Id: I32d9e2978037fb3e1fff27b7e618b5da6d222f28
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
Diffstat (limited to 'src/network/socket/qsocks5socketengine_p.h')
| -rw-r--r-- | src/network/socket/qsocks5socketengine_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/network/socket/qsocks5socketengine_p.h b/src/network/socket/qsocks5socketengine_p.h index 662ce0d347..01b9d1ea7d 100644 --- a/src/network/socket/qsocks5socketengine_p.h +++ b/src/network/socket/qsocks5socketengine_p.h @@ -270,6 +270,7 @@ public: #endif QSocks5BindData *bindData; QString peerName; + QByteArray receivedHeaderFragment; mutable bool readNotificationActivated; mutable bool writeNotificationActivated; |