css charset

css 2.1 is strict about wanting precisely '@charset "charsetname";'

1 files changed, 19 insertions, 1 deletions

diff --git a/src/html.cc b/src/html.cc
index d08884ba..79be4253 100644
--- a/src/html.cc
+++ b/src/html.cc
@@ -2896,8 +2896,26 @@ void a_Html_load_stylesheet(DilloHtml *html, DilloUrl *url)
    _MSG("Html_load_stylesheet: ");
    if (a_Capi_get_buf(url, &data, &len)) {
       _MSG("cached URL=%s len=%d", URL_STR(url), len);
-      if (a_Capi_get_flags_with_redirection(url) & CAPI_Completed)
+      if (a_Capi_get_flags_with_redirection(url) & CAPI_Completed) {
+         if (strncmp("@charset \"", data, 10) == 0) {
+            char *endq = strchr(data+10, '"');
+
+            if (endq && (endq - data <= 51)) {
+               /* IANA limits charset names to 40 characters */
+               const char *ignored;
+               char *content_type;
+
+               *endq = '\0';
+               content_type = dStrconcat("text/css; charset=", data+10, NULL);
+               *endq = '"';
+               a_Capi_unref_buf(url);
+               ignored = a_Capi_set_content_type(url, content_type, "meta");
+               dFree(content_type);
+               a_Capi_get_buf(url, &data, &len);
+            }
+         }
          html->styleEngine->parse(html, url, data, len, CSS_ORIGIN_AUTHOR);
+      }
       a_Capi_unref_buf(url);
    } else {
       /* Fill a Web structure for the cache query */