[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 5b28837622fc3bfdee8fdbff712393ab8a36d71a
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 13 01:33:49 2002 +0000

    	For now make text/xml files use HTML parsing/documents.
    	This avoids the infinite loop we get into when loading
    	text/xml.  If/when we finally support XML, we can undo
    	this change.
    
            * khtml/khtml_part.cpp:
            (KHTMLPart::begin):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2644 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 9f8dea1..ffa692f 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,15 @@
 2002-11-12  David Hyatt  <hyatt at apple.com>
 
+	For now make text/xml files use HTML parsing/documents.
+	This avoids the infinite loop we get into when loading
+	text/xml.  If/when we finally support XML, we can undo
+	this change.
+	
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::begin):
+
+2002-11-12  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3086321, stylesheets not loading if titles are
 	specified.  Note that 4 of the pages on the PLT were
 	affected by this, so I fully expect a slight performance
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 9f8dea1..ffa692f 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,15 @@
 2002-11-12  David Hyatt  <hyatt at apple.com>
 
+	For now make text/xml files use HTML parsing/documents.
+	This avoids the infinite loop we get into when loading
+	text/xml.  If/when we finally support XML, we can undo
+	this change.
+	
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::begin):
+
+2002-11-12  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3086321, stylesheets not loading if titles are
 	specified.  Note that 4 of the pages on the PLT were
 	affected by this, so I fully expect a slight performance
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 9f8dea1..ffa692f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,15 @@
 2002-11-12  David Hyatt  <hyatt at apple.com>
 
+	For now make text/xml files use HTML parsing/documents.
+	This avoids the infinite loop we get into when loading
+	text/xml.  If/when we finally support XML, we can undo
+	this change.
+	
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::begin):
+
+2002-11-12  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3086321, stylesheets not loading if titles are
 	specified.  Note that 4 of the pages on the PLT were
 	affected by this, so I fully expect a slight performance
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 2a12a69..3b22dec 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -1351,9 +1351,12 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
 #endif
 
   // ### not sure if XHTML documents served as text/xml should use DocumentImpl or HTMLDocumentImpl
+#ifndef APPLE_CHANGES
+  // We can't deal with XML yet, so just give it an HTML document for now. -dwh
   if (args.serviceType == "text/xml")
     d->m_doc = DOMImplementationImpl::instance()->createDocument( d->m_view );
   else
+#endif
     d->m_doc = DOMImplementationImpl::instance()->createHTMLDocument( d->m_view );
 
   d->m_doc->ref();

-- 
WebKit Debian packaging