Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (40 commits)
  Fix for QMessageBox's autotest.
  Fix for the button size calculation in qmessagebox.cpp
  Fixed wrong QGroupBox check state
  Added base 10 to be used with QIntValidator.
  Fix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd
  Mac: Fix the color of check marks in menus with stylesheet
  Fix warning when using QXmlInputSource with non opened QIODevice
  HTTP proxy engine - accept standard Connection header
  Russian translation update
  Don't directly access QList contents
  Fix QPlainTextEdit when using Qt::TextSelectableByKeyboard flag
  Fix QDateEdit calendar pop-up having wrong date
  Repaint QProgressBar when minimum or maximum changed
  Fix QProgressBar causing timer event spam
  Fix memory leak in QCursorData
  fix gdb_dwarf_index.prf for applications, take two
  Compile fix for Mac OS X 10.7 with 10.6 sdk
  Update supported platforms and remove commercial page.
  networking: regenerate effective TLD table for cookies
  fix gdb_dwarf_index.prf for executables
  ...

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;