diff options
| author | Markus Goetz <Markus.Goetz@nokia.com> | 2009-09-23 10:40:05 (GMT) |
|---|---|---|
| committer | Markus Goetz <Markus.Goetz@nokia.com> | 2009-09-23 11:39:00 (GMT) |
| commit | af71faf8cb2c9cbf34c408b81ce7ae1ef6c6403e (patch) | |
| tree | d3332709352660b5256d8656c48b360d31eaf67d /src/network/access/qhttpnetworkreply.cpp | |
| parent | d74b951c7380f8a210c701152ddafe6481c1a43b (diff) | |
| download | Qt-af71faf8cb2c9cbf34c408b81ce7ae1ef6c6403e.zip Qt-af71faf8cb2c9cbf34c408b81ce7ae1ef6c6403e.tar.gz Qt-af71faf8cb2c9cbf34c408b81ce7ae1ef6c6403e.tar.bz2 | |
QNAM HTTP Code: Properly remove aborted requests from processing
This fixes a crash that occured because aborted requests were
not properly removed from the channel.alreadyPipelinedRequests.
Task-number: QTBUG-4507
Reviewed-by: Peter Hartmann
Diffstat (limited to 'src/network/access/qhttpnetworkreply.cpp')
| -rw-r--r-- | src/network/access/qhttpnetworkreply.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/network/access/qhttpnetworkreply.cpp b/src/network/access/qhttpnetworkreply.cpp index c953ebf..e990704 100644 --- a/src/network/access/qhttpnetworkreply.cpp +++ b/src/network/access/qhttpnetworkreply.cpp @@ -198,6 +198,7 @@ QHttpNetworkReplyPrivate::QHttpNetworkReplyPrivate(const QUrl &newUrl) majorVersion(0), minorVersion(0), bodyLength(0), contentRead(0), totalProgress(0), chunkedTransferEncoding(false), connectionCloseEnabled(true), + forceConnectionCloseEnabled(false), currentChunkSize(0), currentChunkRead(0), connection(0), initInflate(false), autoDecompress(false), responseData(), requestIsPrepared(false) ,pipeliningUsed(false) @@ -564,7 +565,7 @@ bool QHttpNetworkReplyPrivate::isChunked() bool QHttpNetworkReplyPrivate::isConnectionCloseEnabled() { - return connectionCloseEnabled; + return connectionCloseEnabled || forceConnectionCloseEnabled; } // note this function can only be used for non-chunked, non-compressed with |