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

[jochen at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 47d24468662a184a9be88fbdaf3f8d7940e7eee0
Author: jochen at chromium.org <jochen at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 21 14:19:44 2010 +0000

    2010-09-21  Jochen Eisinger  <jochen at chromium.org>
    
            Reviewed by Jeremy Orlow.
    
            Use @ to concatenate the database name and the database identifier when building
            the filename to use for indexed databases. That character is valid for filenames
            but cannot occur in a database identifier derived from a security origin.
            https://bugs.webkit.org/show_bug.cgi?id=46178
    
            * storage/IDBFactoryBackendImpl.cpp:
            (WebCore::IDBFactoryBackendImpl::databaseFileName):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67950 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fc79393..d3b90fe 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-21  Jochen Eisinger  <jochen at chromium.org>
+
+        Reviewed by Jeremy Orlow.
+
+        Use @ to concatenate the database name and the database identifier when building
+        the filename to use for indexed databases. That character is valid for filenames
+        but cannot occur in a database identifier derived from a security origin.
+        https://bugs.webkit.org/show_bug.cgi?id=46178
+
+        * storage/IDBFactoryBackendImpl.cpp:
+        (WebCore::IDBFactoryBackendImpl::databaseFileName):
+
 2010-09-21  Steve Block  <steveblock at google.com>
 
         Reviewed by Jeremy Orlow.
diff --git a/WebCore/storage/IDBFactoryBackendImpl.cpp b/WebCore/storage/IDBFactoryBackendImpl.cpp
index b7ffdca..26473ae 100644
--- a/WebCore/storage/IDBFactoryBackendImpl.cpp
+++ b/WebCore/storage/IDBFactoryBackendImpl.cpp
@@ -150,7 +150,7 @@ String IDBFactoryBackendImpl::databaseFileName(const String& name, SecurityOrigi
 {
     String databaseIdentifier = securityOrigin->databaseIdentifier();
     String santizedName = encodeForFileName(name);
-    return databaseIdentifier + "_" + santizedName + ".indexeddb";
+    return databaseIdentifier + "@" + santizedName + ".indexeddb";
 }
 
 } // namespace WebCore

-- 
WebKit Debian packaging