Reviewed by Darin.

	<rdar://problem/3770306> XMLHttpRequest does not honor character set encoding

        * khtml/ecma/xmlhttprequest.cpp:
        (KJS::XMLHttpRequest::slotData): Get encoding from the transfer job.
        * kwq/KWQKJobClasses.h:
        * kwq/KWQKJobClasses.mm:
        (KIO::TransferJobPrivate::TransferJobPrivate): Added retrievedCharset
	flag.
        (KIO::TransferJob::retrieveCharset): New method, gets the charset
	from the response.
        (KIO::TransferJob::queryMetaData): Handle charset.
        (KIO::TransferJob::emitReceivedResponse): Clear retreivedCharset flag.
        * kwq/KWQLoader.h:
        * kwq/KWQLoader.mm:
        (KWQResponseTextEncodingName): New function, gets the encoding from the response.

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

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 7684b30a9cbb87fe0b22fc599751ecfe379f23c7..7790aba52a61e86f1eb89851446577ae9fbe67ef 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,23 @@
+2004-08-23  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Darin.
+
+       <rdar://problem/3770306> XMLHttpRequest does not honor character set encoding
+
+        * khtml/ecma/xmlhttprequest.cpp:
+        (KJS::XMLHttpRequest::slotData): Get encoding from the transfer job.
+        * kwq/KWQKJobClasses.h:
+        * kwq/KWQKJobClasses.mm:
+        (KIO::TransferJobPrivate::TransferJobPrivate): Added retrievedCharset
+       flag.
+        (KIO::TransferJob::retrieveCharset): New method, gets the charset
+       from the response.
+        (KIO::TransferJob::queryMetaData): Handle charset.
+        (KIO::TransferJob::emitReceivedResponse): Clear retreivedCharset flag.
+        * kwq/KWQLoader.h:
+        * kwq/KWQLoader.mm:
+        (KWQResponseTextEncodingName): New function, gets the encoding from the response.
+
 2004-08-23  David Hyatt  <hyatt@apple.com>
 
        Apply leo's fix to marquees.

diff --git a/WebCore/khtml/ecma/xmlhttprequest.cpp b/WebCore/khtml/ecma/xmlhttprequest.cpp
index 32d46952b3b4b65f99cd566f70b8e6c2d540731b..b7b404855030285036a8db80d8944add1d3fb5b7 100644 (file)
--- a/WebCore/khtml/ecma/xmlhttprequest.cpp
+++ b/WebCore/khtml/ecma/xmlhttprequest.cpp
@@ -528,6 +528,7 @@ void XMLHttpRequest::slotData(KIO::Job*, const QByteArray &_data)
 {
   if (state < Loaded) {
     responseHeaders = job->queryMetaData("HTTP-Headers");
+    encoding = job->queryMetaData("charset");
     changeState(Loaded);
   }
   

diff --git a/WebCore/kwq/KWQKJobClasses.h b/WebCore/kwq/KWQKJobClasses.h
index f8b1deebb442665d3052ed46e6061b9078729339..f86f45a9d941ebf763e013fe44c287c83901e5f6 100644 (file)
--- a/WebCore/kwq/KWQKJobClasses.h
+++ b/WebCore/kwq/KWQKJobClasses.h
@@ -77,6 +77,7 @@ public:
     QString method() const;
 private:
     void assembleResponseHeaders() const;
+    void retrieveCharset() const;
 
     TransferJobPrivate *d;
 

diff --git a/WebCore/kwq/KWQKJobClasses.mm b/WebCore/kwq/KWQKJobClasses.mm
index 9349c802532401c714451caa70bac56151603bcf..8146d41b8aea729ee8e3127ff4a9e1f7944e3d52 100644 (file)
--- a/WebCore/kwq/KWQKJobClasses.mm
+++ b/WebCore/kwq/KWQKJobClasses.mm
@@ -49,7 +49,8 @@ public:
        , loader(nil)
        , method("GET")
        , response(0)
-       , assembledResponseHeaders(true)
+        , assembledResponseHeaders(true)
+        , retrievedCharset(true)
     {
     }
 
@@ -62,6 +63,7 @@ public:
        , postData(_postData)
        , response(0)
        , assembledResponseHeaders(true)
+        , retrievedCharset(true)
     {
     }
 
@@ -81,6 +83,7 @@ public:
 
     void *response;
     bool assembledResponseHeaders;
+    bool retrievedCharset;
     QString responseHeaders;
 };
 
@@ -138,7 +141,17 @@ void TransferJob::assembleResponseHeaders() const
        d->responseHeaders = QString::fromNSString((NSString *)KWQResponseHeaderString(d->response));
        d->assembledResponseHeaders = true;
     }
+}
 
+void TransferJob::retrieveCharset() const
+{
+    if (!d->retrievedCharset) {
+        NSString *charset = (NSString *)KWQResponseTextEncodingName(d->response);
+        if (charset) {
+            [d->metaData setObject:charset forKey:@"charset"];
+        }
+        d->retrievedCharset = true;
+    }
 }
 
 QString TransferJob::queryMetaData(const QString &key) const
@@ -146,6 +159,11 @@ QString TransferJob::queryMetaData(const QString &key) const
     if (key == "HTTP-Headers") {
        assembleResponseHeaders();
        return d->responseHeaders;
+    } 
+
+    if (key == "charset") {
+        // this will put it in the regular metadata dictionary
+        retrieveCharset();
     }
 
     NSString *value = [d->metaData objectForKey:key.getNSString()]; 
@@ -212,6 +230,7 @@ void TransferJob::emitResult()
 void TransferJob::emitReceivedResponse(void *response)
 {
     d->assembledResponseHeaders = false;
+    d->retrievedCharset = false;
     d->response = response;
     KWQRetainResponse(d->response);
 

diff --git a/WebCore/kwq/KWQLoader.h b/WebCore/kwq/KWQLoader.h
index cc68105363c01db51ada89afb8224cbcc86ba816..df3f3ae7b666e2378a397660642f19edf2b1d4bc 100644 (file)
--- a/WebCore/kwq/KWQLoader.h
+++ b/WebCore/kwq/KWQLoader.h
@@ -47,6 +47,7 @@ bool KWQCheckIfReloading(khtml::DocLoader *loader);
 void KWQRetainResponse(void *response);
 void KWQReleaseResponse(void *response);
 void *KWQResponseMIMEType(void *response);
+void *KWQResponseTextEncodingName(void *response);
 void *KWQResponseHeaderString(void *response);
 int KWQNumberOfPendingOrLoadingRequests(khtml::DocLoader *dl);
 time_t KWQCacheObjectExpiresTime(khtml::DocLoader *docLoader, void *response);

diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index 8986981c2c76e7fca139591ee2a56fd1ea6079c8..82020ee62082b51901f79f812a99a36dc259e50c 100644 (file)
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -281,6 +281,15 @@ void *KWQResponseMIMEType(void *response)
     return NULL;
 }
 
+void *KWQResponseTextEncodingName(void *response)
+{
+    KWQ_BLOCK_EXCEPTIONS;
+    return [(NSURLResponse *)response textEncodingName];
+    KWQ_UNBLOCK_EXCEPTIONS;
+
+    return NULL;
+}
+
 void *KWQResponseHeaderString(void *response)
 {
     KWQ_BLOCK_EXCEPTIONS;