Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6

1 files changed, 9 insertions, 0 deletions

diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index 27c0ed4381..1124337ddb 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -191,6 +191,15 @@ void QHttpNetworkConnectionPrivate::prepareRequest(HttpMessagePair &messagePair)
         request.d->autoDecompress = false;
 #endif
     }
+
+    // some websites mandate an accept-language header and fail
+    // if it is not sent. This is a problem with the website and
+    // not with us, but we work around this by setting a
+    // universal one always.
+    value = request.headerField("accept-language");
+    if (value.isEmpty())
+        request.setHeaderField("accept-language", "en,*");
+
     // set the User Agent
     value = request.headerField("user-agent");
     if (value.isEmpty())