diff options
| author | aavit <qt_aavit@ovi.com> | 2011-11-14 15:10:54 (GMT) |
|---|---|---|
| committer | aavit <qt_aavit@ovi.com> | 2011-11-14 15:10:54 (GMT) |
| commit | 6ca7e2a2118f717a5285dadc16a9ce5fbbab266d (patch) | |
| tree | f78b189d8c1b3414ad4da383681b6b0062b1cc37 /src/network/socket/qhttpsocketengine.cpp | |
| parent | f322c563baabab704044810373041d99a2b03a6f (diff) | |
| parent | 0b90bb86d2ef0b925158a9cf185981eaea1776c2 (diff) | |
| download | Qt-6ca7e2a2118f717a5285dadc16a9ce5fbbab266d.zip Qt-6ca7e2a2118f717a5285dadc16a9ce5fbbab266d.tar.gz Qt-6ca7e2a2118f717a5285dadc16a9ce5fbbab266d.tar.bz2 | |
Merge remote-tracking branch 'qt-mainline/4.8'
Diffstat (limited to 'src/network/socket/qhttpsocketengine.cpp')
| -rw-r--r-- | src/network/socket/qhttpsocketengine.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/network/socket/qhttpsocketengine.cpp b/src/network/socket/qhttpsocketengine.cpp index 5c672ec..b62bc05 100644 --- a/src/network/socket/qhttpsocketengine.cpp +++ b/src/network/socket/qhttpsocketengine.cpp @@ -614,6 +614,10 @@ void QHttpSocketEngine::slotSocketReadNotification() bool willClose; QString proxyConnectionHeader = responseHeader.value(QLatin1String("Proxy-Connection")); + // Although most proxies use the unofficial Proxy-Connection header, the Connection header + // from http spec is also allowed. + if (proxyConnectionHeader.isEmpty()) + proxyConnectionHeader = responseHeader.value(QLatin1String("Connection")); proxyConnectionHeader = proxyConnectionHeader.toLower(); if (proxyConnectionHeader == QLatin1String("close")) { willClose = true; |