[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit ad2679b8e1abceb6fa5d5615881119add013d9ac
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 25 17:02:34 2009 +0000

    [Qt] Remove the Referer header when redirecting to a non-secure site
    https://bugs.webkit.org/show_bug.cgi?id=31785
    
    Patch by Jakub Wieczorek <faw217 at gmail.com> on 2009-11-22
    Reviewed by Adam Barth.
    
    This makes Qt pass two tests introduced in r50226.
    
    WebCore:
    
    * platform/network/qt/QNetworkReplyHandler.cpp:
    (WebCore::QNetworkReplyHandler::sendResponseIfNeeded):
    
    LayoutTests:
    
    * platform/qt/Skipped:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51387 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 72a4423..06fbabd 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2009-11-22  Jakub Wieczorek  <faw217 at gmail.com>
+
+        Reviewed by Adam Barth.
+
+        [Qt] Remove the Referer header when redirecting to a non-secure site
+        https://bugs.webkit.org/show_bug.cgi?id=31785
+
+        This makes Qt pass two tests introduced in r50226.
+
+        * platform/qt/Skipped:
+
 2009-11-24  Chris Marrin  <cmarrin at apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 8816f9a..20219cf 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -42,10 +42,6 @@ http/tests/wml
 # Failing URL test
 http/tests/uri/escaped-entity.html
 
-# Failing HTTP SSL tests
-http/tests/ssl/referer-301.html
-http/tests/ssl/referer-303.html
-
 # Failing HTTP Loading tests
 http/tests/loading/bad-server-subframe.html
 http/tests/loading/bad-scheme-subframe.html
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 199603c..af85129 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2009-11-22  Jakub Wieczorek  <faw217 at gmail.com>
+
+        Reviewed by Adam Barth.
+
+        [Qt] Remove the Referer header when redirecting to a non-secure site
+        https://bugs.webkit.org/show_bug.cgi?id=31785
+
+        This makes Qt pass two tests introduced in r50226.
+
+        * platform/network/qt/QNetworkReplyHandler.cpp:
+        (WebCore::QNetworkReplyHandler::sendResponseIfNeeded):
+
 2009-11-25  Andrei Popescu  <andreip at google.com>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebCore/platform/network/qt/QNetworkReplyHandler.cpp b/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
index 32f5e30..3e0250d 100644
--- a/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
+++ b/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
@@ -323,6 +323,10 @@ void QNetworkReplyHandler::sendResponseIfNeeded()
             newRequest.setHTTPMethod("GET");
         }
 
+        // Should not set Referer after a redirect from a secure resource to non-secure one.
+        if (!newRequest.url().protocolIs("https") && protocolIs(newRequest.httpReferrer(), "https"))
+            newRequest.clearHTTPReferrer();
+
         client->willSendRequest(m_resourceHandle, newRequest, response);
         m_redirected = true;
         m_request = newRequest.toNetworkRequest(m_resourceHandle->getInternal()->m_frame);

-- 
WebKit Debian packaging