diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-05 09:43:18 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-05 09:43:18 (GMT) |
| commit | 117e27d4f24e686d66f8333dd69e55f16fe6a5d3 (patch) | |
| tree | 147793e18a3a8c86a668020d35c3280ea5b65ed2 /src/network | |
| parent | a77ea15b08380d3af877c2ee2e28e4d80717177e (diff) | |
| parent | 0ca343973a8417da2bb5bea1e5c3d8ac525f2815 (diff) | |
| download | Qt-117e27d4f24e686d66f8333dd69e55f16fe6a5d3.zip Qt-117e27d4f24e686d66f8333dd69e55f16fe6a5d3.tar.gz Qt-117e27d4f24e686d66f8333dd69e55f16fe6a5d3.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Create auto test for http HEAD request
QNAM - fix poor performance of HEAD request with authentication
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/access/qhttpnetworkreply.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/access/qhttpnetworkreply.cpp b/src/network/access/qhttpnetworkreply.cpp index 0f2fcba..129e2c6 100644 --- a/src/network/access/qhttpnetworkreply.cpp +++ b/src/network/access/qhttpnetworkreply.cpp @@ -816,7 +816,7 @@ bool QHttpNetworkReplyPrivate::expectContent() || statusCode == 204 || statusCode == 304) return false; if (request.operation() == QHttpNetworkRequest::Head) - return !shouldEmitSignals(); + return false; // no body expected for HEAD request qint64 expectedContentLength = contentLength(); if (expectedContentLength == 0) return false; |