diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2012-06-22 10:45:51 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-22 11:47:24 +0200 |
| commit | 66589cd545e302ca535579f248071f77bc8b261b (patch) | |
| tree | 6388aa0f45382e82e38edc8c1bef7dcde7af2203 | |
| parent | 4a8d9eed87565b20c1f10b173c652be26ea608f7 (diff) | |
Ensure that Proxy-Connection: Keep-Alive is respected for HTTP 1.0
When doing a NTML authentication it would close the connection after
the second phase before replying when the reply was a HTTP 1.0 version
reply. Since the Proxy-Connection header is set to Keep-Alive in this
case we want to ensure we do not close in this siutation.
Task-number: QTBUG-26037
Change-Id: Icaaf2277efc0d05a946c52fb42b5191964e2e0fe
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
| -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 dc6f9972b3..6790e1b9ca 100644 --- a/src/network/access/qhttpnetworkreply.cpp +++ b/src/network/access/qhttpnetworkreply.cpp @@ -537,7 +537,8 @@ qint64 QHttpNetworkReplyPrivate::readHeader(QAbstractSocket *socket) // check for explicit indication of close or the implicit connection close of HTTP/1.0 connectionCloseEnabled = (connectionHeaderField.toLower().contains("close") || headerField("proxy-connection").toLower().contains("close")) || - (majorVersion == 1 && minorVersion == 0 && connectionHeaderField.isEmpty()); + (majorVersion == 1 && minorVersion == 0 && + (connectionHeaderField.isEmpty() && !headerField("proxy-connection").toLower().contains("keep-alive"))); #ifndef QT_NO_COMPRESS if (autoDecompress && isCompressed()) { |