diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-12 01:43:06 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-12 01:43:06 (GMT) |
| commit | 84076234b91444b5b5b206d5d2650d04b86c35d0 (patch) | |
| tree | 18428b209b8110b8e85b9bc6db159269d426184d /src/network/access | |
| parent | 350416c26fccc79621ba986794e6f6b48f2e1fe2 (diff) | |
| parent | 371617983a7640a42d74db9c17f7ac3c9c22d29d (diff) | |
| download | Qt-84076234b91444b5b5b206d5d2650d04b86c35d0.zip Qt-84076234b91444b5b5b206d5d2650d04b86c35d0.tar.gz Qt-84076234b91444b5b5b206d5d2650d04b86c35d0.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Fix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd
Fix warning when using QXmlInputSource with non opened QIODevice
HTTP proxy engine - accept standard Connection header
Diffstat (limited to 'src/network/access')
| -rw-r--r-- | src/network/access/qhttpnetworkreply.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/network/access/qhttpnetworkreply.cpp b/src/network/access/qhttpnetworkreply.cpp index 6173b39..3dc8b2f 100644 --- a/src/network/access/qhttpnetworkreply.cpp +++ b/src/network/access/qhttpnetworkreply.cpp @@ -472,8 +472,10 @@ int QHttpNetworkReplyPrivate::gunzipBodyPartially(QByteArray &compressed, QByteA void QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd() { - inflateEnd(&inflateStrm); - initInflate = false; + if (initInflate) { + inflateEnd(&inflateStrm); + initInflate = false; + } } #endif |