[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit ba4f18a78775a8b5276d051d6456ecb805724d82
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 14 03:21:25 2010 +0000

    2010-12-13  Gavin Peters  <gavinp at chromium.org>
    
            Reviewed by Adam Barth.
    
            Re land Purpose after bad merge
            https://bugs.webkit.org/show_bug.cgi?id=51000
    
            * http/tests/misc/resources/prefetch-purpose.php:
    2010-12-13  Gavin Peters  <gavinp at chromium.org>
    
            Reviewed by Adam Barth.
    
            Re land Purpose after bad merge
            https://bugs.webkit.org/show_bug.cgi?id=51000
    
            * loader/loader.cpp:
            (WebCore::Loader::load):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73996 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 45a6189..1bad5e7 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-13  Gavin Peters  <gavinp at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Re land Purpose after bad merge
+        https://bugs.webkit.org/show_bug.cgi?id=51000
+
+        * http/tests/misc/resources/prefetch-purpose.php:
+
 2010-12-13  Mihai Parparita  <mihaip at chromium.org>
 
         Unreviewed Chromium test expectations update.
diff --git a/LayoutTests/http/tests/misc/resources/prefetch-purpose.php b/LayoutTests/http/tests/misc/resources/prefetch-purpose.php
index cad3320..a31e8e5 100644
--- a/LayoutTests/http/tests/misc/resources/prefetch-purpose.php
+++ b/LayoutTests/http/tests/misc/resources/prefetch-purpose.php
@@ -1,4 +1,4 @@
-<?php setcookie("Purpose", $_SERVER["HTTP_X_PURPOSE"]);
+<?php setcookie("Purpose", $_SERVER["HTTP_PURPOSE"]);
 
 if (isset($_COOKIE['Purpose'])) {
     setcookie("Purpose", "", time() - 3600);
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 96bbde8..2fbbb0a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-13  Gavin Peters  <gavinp at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Re land Purpose after bad merge
+        https://bugs.webkit.org/show_bug.cgi?id=51000
+
+        * loader/loader.cpp:
+        (WebCore::Loader::load):
+
 2010-12-13  Dan Bernstein  <mitz at apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/WebCore/loader/loader.cpp b/WebCore/loader/loader.cpp
index 4df2854..b8cfa12 100644
--- a/WebCore/loader/loader.cpp
+++ b/WebCore/loader/loader.cpp
@@ -109,7 +109,7 @@ PassRefPtr<Loader> Loader::load(CachedResourceLoader* cachedResourceLoader, Cach
     
 #if ENABLE(LINK_PREFETCH)
     if (resource->type() == CachedResource::LinkPrefetch)
-        resourceRequest.setHTTPHeaderField("X-Purpose", "prefetch");
+        resourceRequest.setHTTPHeaderField("Purpose", "prefetch");
 #endif
     
     ResourceLoadPriority priority = resource->loadPriority();

-- 
WebKit Debian packaging