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

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 565405369ccdcff594e0ce00a6842875c38dce5f
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 29 16:51:14 2009 +0000

    2009-12-29  Alexander Pavlov  <apavlov at chromium.org>
    
            Reviewed by Timothy Hatcher.
    
            Discard port from cookie domain when matching cookies.
    
            WebKit cookies do not hold the port information, so we should match only hostnames.
            https://bugs.webkit.org/show_bug.cgi?id=31787
    
            * inspector/front-end/inspector.js:
            (WebInspector.updateResource):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52623 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7bd26f0..1582de8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2009-12-29  Alexander Pavlov  <apavlov at chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Discard port from cookie domain when matching cookies.
+
+        WebKit cookies do not hold the port information, so we should match only hostnames.
+        https://bugs.webkit.org/show_bug.cgi?id=31787
+
+        * inspector/front-end/inspector.js:
+        (WebInspector.updateResource):
+
 2009-12-29  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/inspector/front-end/inspector.js b/WebCore/inspector/front-end/inspector.js
index 47759ea..e6ae7ff 100644
--- a/WebCore/inspector/front-end/inspector.js
+++ b/WebCore/inspector/front-end/inspector.js
@@ -985,9 +985,12 @@ WebInspector.updateResource = function(identifier, payload)
         if (resource.mainResource)
             this.mainResource = resource;
 
-        var match = payload.documentURL.match(/^(http[s]?|file):\/\/([\/]*[^\/]+)/i);
-        if (match)
-            this.addCookieDomain(match[1].toLowerCase() === "file" ? "" : match[2]);
+        var match = payload.documentURL.match(WebInspector.URLRegExp);
+        if (match) {
+            var protocol = match[1].toLowerCase();
+            if (protocol.indexOf("http") === 0 || protocol === "file")
+                this.addCookieDomain(protocol === "file" ? "" : match[2]);
+        }
     }
 
     if (payload.didResponseChange) {

-- 
WebKit Debian packaging