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

commit-queue at webkit.org commit-queue at webkit.org
Wed Dec 22 12:33:41 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 3122e3048b9e72f6f797006a6214ed4bfc71bb89
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 25 11:36:54 2010 +0000

    2010-08-25  Yongjun Zhang  <yongjun_zhang at apple.com>
    
            Reviewed by Alexey Proskuryakov.
    
            https://bugs.webkit.org/show_bug.cgi?id=44461
            Assertion failure at WebCore/platform/network/CredentialStorage.cpp:85.
    
            Remove the assertion at CredentialStorage.cpp:85 since it is legal to have
            multiple forward slashes after the path component.
    
            No test needed.
    
            * platform/network/CredentialStorage.cpp:
            (WebCore::protectionSpaceMapKeyFromURL):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66005 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5aaa269..6184e38 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-25  Yongjun Zhang  <yongjun_zhang at apple.com>
+
+        Reviewed by Alexey Proskuryakov.
+
+        https://bugs.webkit.org/show_bug.cgi?id=44461
+        Assertion failure at WebCore/platform/network/CredentialStorage.cpp:85.
+
+        Remove the assertion at CredentialStorage.cpp:85 since it is legal to have
+        multiple forward slashes after the path component.
+
+        No test needed.
+
+        * platform/network/CredentialStorage.cpp:
+        (WebCore::protectionSpaceMapKeyFromURL):
+
 2010-08-25  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Yury Semikhatsky.
diff --git a/WebCore/platform/network/CredentialStorage.cpp b/WebCore/platform/network/CredentialStorage.cpp
index 4fb7799..38f71a4 100644
--- a/WebCore/platform/network/CredentialStorage.cpp
+++ b/WebCore/platform/network/CredentialStorage.cpp
@@ -79,7 +79,6 @@ static String protectionSpaceMapKeyFromURL(const KURL& url)
         ASSERT(index != notFound);
         directoryURL = directoryURL.substring(0, (index != directoryURLPathStart) ? index : directoryURLPathStart + 1);
     }
-    ASSERT(directoryURL.length() == directoryURLPathStart + 1 || directoryURL[directoryURL.length() - 1] != '/');
 
     return directoryURL;
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list