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

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 24edc8d46e3ddd6125c49ade66afeba83e03d1f7
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jun 14 03:10:27 2003 +0000

    	Fix for 3292630, misrendered page because of bad doctype.  Add
    	this bad doctype to our list of quirky doctypes to fix the
    	problem, since the screwed up strict mode rendering is actually
    	correct.
    
            Reviewed by john
    
            * khtml/html/doctypes.cpp:
            (findDoctypeEntry):
            * khtml/html/doctypes.gperf:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4548 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 9f1af3a..eb09b8c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2003-06-13  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3292630, misrendered page because of bad doctype.  Add
+	this bad doctype to our list of quirky doctypes to fix the
+	problem, since the screwed up strict mode rendering is actually
+	correct.
+	
+        Reviewed by john
+
+        * khtml/html/doctypes.cpp:
+        (findDoctypeEntry):
+        * khtml/html/doctypes.gperf:
+
 2003-06-13  Richard Williamson  <rjw at apple.com>
 
 	Fixed 3282087.  Don't use our <pre> optimizations
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 9f1af3a..eb09b8c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2003-06-13  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3292630, misrendered page because of bad doctype.  Add
+	this bad doctype to our list of quirky doctypes to fix the
+	problem, since the screwed up strict mode rendering is actually
+	correct.
+	
+        Reviewed by john
+
+        * khtml/html/doctypes.cpp:
+        (findDoctypeEntry):
+        * khtml/html/doctypes.gperf:
+
 2003-06-13  Richard Williamson  <rjw at apple.com>
 
 	Fixed 3282087.  Don't use our <pre> optimizations
diff --git a/WebCore/khtml/html/doctypes.cpp b/WebCore/khtml/html/doctypes.cpp
index 460f058..e0ae529 100644
--- a/WebCore/khtml/html/doctypes.cpp
+++ b/WebCore/khtml/html/doctypes.cpp
@@ -230,7 +230,7 @@ findDoctypeEntry (register const char *str, register unsigned int len)
 {
   enum
     {
-      TOTAL_KEYWORDS = 76,
+      TOTAL_KEYWORDS = 77,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 80,
       MIN_HASH_VALUE = 4,
@@ -361,7 +361,7 @@ findDoctypeEntry (register const char *str, register unsigned int len)
       {"-//ietf//dtd html level 0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-      {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
+      {"-//w30//dtd w3 html 2.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
diff --git a/WebCore/khtml/html/doctypes.gperf b/WebCore/khtml/html/doctypes.gperf
index 779f8d0..398626e 100644
--- a/WebCore/khtml/html/doctypes.gperf
+++ b/WebCore/khtml/html/doctypes.gperf
@@ -65,6 +65,7 @@ struct PubIDInfo {
 "-//sq//dtd html 2.0 hotmetal + extensions//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
 "-//sun microsystems corp.//dtd hotjava html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
 "-//sun microsystems corp.//dtd hotjava strict html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
+"-//w30//dtd w3 html 2.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
 "-//w3c//dtd html 3 1995-03-24//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
 "-//w3c//dtd html 3.2 draft//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
 "-//w3c//dtd html 3.2 final//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3

-- 
WebKit Debian packaging