[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 921df8779357ef13ca313d4a78582a66c419c6e2
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 29 00:48:58 2002 +0000

    	Lowercase the text encoding name.
    
            * kwq/KWQCharsets.mm:
            (KWQCFStringEncodingFromIANACharsetName):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2497 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 32ddc59..91497ac 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-10-28  Chris Blumenberg  <cblu at apple.com>
+
+	Lowercase the text encoding name.
+
+        * kwq/KWQCharsets.mm:
+        (KWQCFStringEncodingFromIANACharsetName):
+
 2002-10-28  Richard Williamson   <rjw at apple.com>
     
         Fixed 3086188 - REGRESSION: Justified text is broken
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 32ddc59..91497ac 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2002-10-28  Chris Blumenberg  <cblu at apple.com>
+
+	Lowercase the text encoding name.
+
+        * kwq/KWQCharsets.mm:
+        (KWQCFStringEncodingFromIANACharsetName):
+
 2002-10-28  Richard Williamson   <rjw at apple.com>
     
         Fixed 3086188 - REGRESSION: Justified text is broken
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 32ddc59..91497ac 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2002-10-28  Chris Blumenberg  <cblu at apple.com>
+
+	Lowercase the text encoding name.
+
+        * kwq/KWQCharsets.mm:
+        (KWQCFStringEncodingFromIANACharsetName):
+
 2002-10-28  Richard Williamson   <rjw at apple.com>
     
         Fixed 3086188 - REGRESSION: Justified text is broken
diff --git a/WebCore/kwq/KWQCharsets.mm b/WebCore/kwq/KWQCharsets.mm
index e4d4a60..aeccd16 100644
--- a/WebCore/kwq/KWQCharsets.mm
+++ b/WebCore/kwq/KWQCharsets.mm
@@ -69,17 +69,25 @@ static void buildDictionaries()
 
 CFStringEncoding KWQCFStringEncodingFromIANACharsetName(CFStringRef charsetName)
 {
+    CFStringEncoding encoding;
     const void *value;
     
     if (nameToEncoding == NULL) {
         buildDictionaries ();
     }
+
+    CFMutableStringRef lowercaseCharsetName = CFStringCreateMutableCopy(NULL, 0, charsetName);
+    CFStringLowercase(lowercaseCharsetName, NULL);
     
-    if (CFDictionaryGetValueIfPresent(nameToEncoding, (void *)charsetName, &value)) {
-        return (CFStringEncoding)value;
+    if (CFDictionaryGetValueIfPresent(nameToEncoding, (void *)lowercaseCharsetName, &value)) {
+        encoding = (CFStringEncoding)value;
     } else {
-        return kCFStringEncodingInvalidId;
+        encoding = kCFStringEncodingInvalidId;
     }
+
+    CFRelease(lowercaseCharsetName);
+
+    return encoding;
 }
 
 

-- 
WebKit Debian packaging