[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 530bb51682f5913131a8a9707ccb9ffc719a1aea
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 27 19:40:46 2002 +0000

    	Fix for 3058119, doctype of HTML docs should be null.
    
            * khtml/dom/dom_doc.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2188 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 197aeb5..a692f12 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,11 @@
 2002-09-28  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3058119, doctype of HTML docs should be null.
+	
+        * khtml/dom/dom_doc.cpp:
+
+2002-09-28  David Hyatt  <hyatt at apple.com>
+
 	DOM compliance. Fix for 3058100, hasFeature of HTML returns
 	false. Oops.
 	
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 197aeb5..a692f12 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,11 @@
 2002-09-28  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3058119, doctype of HTML docs should be null.
+	
+        * khtml/dom/dom_doc.cpp:
+
+2002-09-28  David Hyatt  <hyatt at apple.com>
+
 	DOM compliance. Fix for 3058100, hasFeature of HTML returns
 	false. Oops.
 	
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 197aeb5..a692f12 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,11 @@
 2002-09-28  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3058119, doctype of HTML docs should be null.
+	
+        * khtml/dom/dom_doc.cpp:
+
+2002-09-28  David Hyatt  <hyatt at apple.com>
+
 	DOM compliance. Fix for 3058100, hasFeature of HTML returns
 	false. Oops.
 	
diff --git a/WebCore/khtml/dom/dom_doc.cpp b/WebCore/khtml/dom/dom_doc.cpp
index 2667811..dd54018 100644
--- a/WebCore/khtml/dom/dom_doc.cpp
+++ b/WebCore/khtml/dom/dom_doc.cpp
@@ -209,7 +209,13 @@ Document::~Document()
 
 DocumentType Document::doctype() const
 {
-    if (impl) return ((DocumentImpl *)impl)->doctype();
+    if (impl) {
+      // Doctype is null for HTML documents.
+      if (((DocumentImpl*)impl)->isHTMLDocument())
+	return 0;
+      else
+	return ((DocumentImpl *)impl)->doctype();
+    }
     return 0;
 }
 

-- 
WebKit Debian packaging