Add the deprecated text/xsl MIME type (introduced by Internet Explorer 5) as an...
authorhyatt <hyatt@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 3 Aug 2004 23:22:06 +0000 (23:22 +0000)
committerhyatt <hyatt@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 3 Aug 2004 23:22:06 +0000 (23:22 +0000)
documents.

        Reviewed by john

        * khtml/ecma/xmlhttprequest.cpp:
        (KJS::XMLHttpRequest::getValueProperty):
        * khtml/khtml_part.cpp:
        (KHTMLPart::begin):
        * khtml/misc/loader.cpp:
        (CachedXBLDocument::CachedXBLDocument):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@7186 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog-2005-08-23
WebCore/khtml/ecma/xmlhttprequest.cpp
WebCore/khtml/khtml_part.cpp
WebCore/khtml/misc/loader.cpp

index 9351736..35056a1 100644 (file)
@@ -1,3 +1,17 @@
+2004-08-03  David Hyatt  <hyatt@apple.com>
+
+       Add the deprecated text/xsl MIME type (introduced by Internet Explorer 5) as an acceptable MIME type for XML
+       documents.
+       
+        Reviewed by john
+
+        * khtml/ecma/xmlhttprequest.cpp:
+        (KJS::XMLHttpRequest::getValueProperty):
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::begin):
+        * khtml/misc/loader.cpp:
+        (CachedXBLDocument::CachedXBLDocument):
+
 2004-08-03  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by Ken.
index 975c891..32d4695 100644 (file)
@@ -149,7 +149,8 @@ Value XMLHttpRequest::getValueProperty(ExecState *exec, int token) const
         mimeType = MIMETypeOverride;
       }
       
-      if (mimeType == "text/xml" || mimeType == "application/xml" || mimeType == "application/xhtml+xml") {
+      if (mimeType == "text/xml" || mimeType == "application/xml" || mimeType == "application/xhtml+xml" ||
+          mimeType == "text/xsl") {
        responseXML = DOM::Document(doc->implementation()->createDocument());
 
        DOM::DocumentImpl *docImpl = static_cast<DOM::DocumentImpl *>(responseXML.handle());
index 4a20ff3..002e9aa 100644 (file)
@@ -1489,8 +1489,8 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
     emit setWindowCaption( i18n( "no title", "* Unknown *" ) );
 #endif
 
-  // ### not sure if XHTML documents served as text/xml should use DocumentImpl or HTMLDocumentImpl
-  if (args.serviceType == "text/xml" || args.serviceType == "application/xml" || args.serviceType == "application/xhtml+xml")
+  if (args.serviceType == "text/xml" || args.serviceType == "application/xml" || args.serviceType == "application/xhtml+xml" ||
+      args.serviceType == "text/xsl")
     d->m_doc = DOMImplementationImpl::instance()->createDocument( d->m_view );
   else
     d->m_doc = DOMImplementationImpl::instance()->createHTMLDocument( d->m_view );
index 709f7ac..8bdd794 100644 (file)
@@ -990,7 +990,7 @@ CachedXBLDocument::CachedXBLDocument(DocLoader* dl, const DOMString &url, KIO::C
 : CachedObject(url, XBL, _cachePolicy, _expireDate), m_document(0)
 {
     // It's XML we want.
-    setAccept( QString::fromLatin1("text/xml, application/xml, application/xml+xhtml") );
+    setAccept( QString::fromLatin1("text/xml, application/xml, application/xml+xhtml, text/xsl") );
     
     // Load the file
     Cache::loader()->load(dl, this, false);