79065 2004-04-04 21:20:45 +0000 External CSS style-sheets default to wrong charset 2005-03-22 00:15:04 +0000 1 1 2 Applications konqueror khtml parsing unspecified unspecified Linux RESOLVED FIXED NOR normal --- 1 thiago konqueror-bugs-null illogical1 0 oldest_to_newest 221521 0 thiago 2004-04-04 21:20:45 +0000 Version: 3.2.0 (using KDE 3.2.90 (CVS >= 20040117), compiled sources) Compiler: gcc version 3.3.3 OS: Linux (i686) release 2.6.3 When a webpage (HTML and XHTML) references an external style-sheet through a <LINK> reference, the charset for the loaded file is incorrectly set: it defaults to ISO-8859-1 (Latin 1), even if metadata from the server specifies a different encoding. The attached testpage (valid HTML 4.01 Transitional) demonstrates this error. The external stylesheet when loaded like this: <link rel="StyleSheet" type="text/css" href="test.css"> Causes the text to appear in Konqueror: This should appear « quoted ». And this is a test of UTF-8: €. Changing the load line to the following: <link rel="StyleSheet" type="text/css" charset="utf-8" href="test.css"> Causes the text to appear as it should (and as it does in Mozilla): This should appear « quoted ». And this is a test of UTF-8: €. Note: my locale is UTF-8, so all files are supposed to be loaded UTF-8 (as the webpage showing the Euro symbol demonstrates). Also, when retrieving the webpage from a server, I get: kio_http: (918400) "Content-Type: text/css; charset=utf-8" 221522 1 5531 thiago 2004-04-04 21:21:32 +0000 Created attachment 5531 Test page, HTML 4.01 Transitional, UTF-8 221523 2 5532 thiago 2004-04-04 21:22:11 +0000 Created attachment 5532 Test CSS stylesheet, UTF-8 encoded 221541 3 thiago 2004-04-04 22:25:44 +0000 The functions at fault are: CachedObject::codecForBuffer (khtml/misc/loader.cpp) DocLoader::requestStyleSheet (same) Nowhere in misc/loader.cpp does it try and get the charset from the KIO metadata. 221559 4 5535 thiago 2004-04-05 00:01:35 +0000 Created attachment 5535 Attempt at fixing the problem The attached patch fixes the problem for me, both for remote files and local ones. It does: - move the m_charset member from khtml::CachedCSSStyleSheet and khtml::CachedScript into khtml::CachedObject. It won't be used, of course, for images (khtml::CachedImage). - in khtml::Loader::slotFinished, query the metadata from the job before calling r->object->data. In case of local files, use the charset from QTextCodec::codecForLocale 223629 5 5632 thiago 2004-04-14 05:52:00 +0000 Created attachment 5632 Second attempt at fixing The previous patch made the server charset parameter override the user's. This one inverts that logic. 321647 6 thiago 2005-03-06 22:14:30 +0000 *** Bug 100993 has been marked as a duplicate of this bug. *** 326619 7 kde 2005-03-22 00:15:04 +0000 CVS commit by carewolf: Make charset in <link> actually mean something. Patch is simplified version of one by Thiago Maciera BUG: 79065 M +4 -0 ChangeLog 1.408 M +2 -2 misc/loader.cpp 1.181 --- kdelibs/khtml/ChangeLog #1.407:1.408 @@ -1,2 +1,6 @@ +2005-03-22 Allan Sandfeld Jensen <kde@carewolf.com> + + * misc/loader.cpp: Do not override existing charset with an empty one. + 2005-03-21 Allan Sandfeld Jensen <kde@carewolf.com> --- kdelibs/khtml/misc/loader.cpp #1.180:1.181 @@ -968,5 +968,5 @@ CachedCSSStyleSheet *DocLoader::requestS CachedCSSStyleSheet* s = Cache::requestObject<CachedCSSStyleSheet, CachedObject::CSSStyleSheet>( this, fullURL, accept ); - if ( s ) { + if ( s && !charset.isEmpty() ) { s->setCharset( charset ); } @@ -981,5 +981,5 @@ CachedScript *DocLoader::requestScript( CachedScript* s = Cache::requestObject<CachedScript, CachedObject::Script>( this, fullURL, 0 ); - if ( s ) + if ( s && !charset.isEmpty() ) s->setCharset( charset ); return s; 5531 2004-04-04 21:21:32 +0000 2004-04-04 21:21:32 +0000 Test page, HTML 4.01 Transitional, UTF-8 test.html text/html 397 thiago PCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9XM0MvL0RURCBIVE1MIDQuMDEgVHJhbnNpdGlvbmFs Ly9FTiIgImh0dHA6Ly93d3cudzMub3JnL1RSL2h0bWw0L2xvb3NlLmR0ZCI+CjxodG1sPgogIDxo ZWFkPgogICAgPG1ldGEgaHR0cC1lcXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0L2h0 bWw7IGNoYXJzZXQ9dXRmLTgiPgoKICAgIDxsaW5rIHJlbD0iU3R5bGVTaGVldCIgdHlwZT0idGV4 dC9jc3MiIGhyZWY9InRlc3QuY3NzIj4KICAgIDx0aXRsZT5UZXN0IHBhZ2U8L3RpdGxlPgogIDwv aGVhZD4KICA8Ym9keT4KICAgIDxwPlRoaXMgc2hvdWxkIGFwcGVhciA8cT5xdW90ZWQ8L3E+LiBB bmQgdGhpcyBpcyBhIHRlc3Qgb2YgVVRGLTg6IOKCrC4gPC9wPgogIDwvYm9keT4KPC9odG1sPg== 5532 2004-04-04 21:22:11 +0000 2004-04-04 21:22:11 +0000 Test CSS stylesheet, UTF-8 encoded test.css text/css 66 thiago ICAgICAgcTpiZWZvcmUgeyBjb250ZW50OiAiwqsgIiB9CiAgICAgIHE6YWZ0ZXIgeyBjb250ZW50 OiAiIMK7IiB9 5535 2004-04-05 00:01:35 +0000 2004-04-14 05:52:00 +0000 Attempt at fixing the problem khtml-link-charset.diff text/plain 2983 thiago SW5kZXg6IGxvYWRlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL2tkZS9rZGVsaWJzL2to dG1sL21pc2MvbG9hZGVyLmgsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuNjYKZGlmZiAtdSAtMyAt cCAtcjEuNjYgbG9hZGVyLmgKLS0tIGxvYWRlci5oCTIwIEZlYiAyMDA0IDE0OjA1OjI5IC0wMDAw CTEuNjYKKysrIGxvYWRlci5oCTQgQXByIDIwMDQgMjE6NTc6MjkgLTAwMDAKQEAgLTE1NSw2ICsx NTUsOSBAQCBuYW1lc3BhY2Uga2h0bWwKICAgICAgICAgUVN0cmluZyBhY2NlcHQoKSBjb25zdCB7 IHJldHVybiBtX2FjY2VwdDsgfQogICAgICAgICB2b2lkIHNldEFjY2VwdChjb25zdCBRU3RyaW5n ICZfYWNjZXB0KSB7IG1fYWNjZXB0ID0gX2FjY2VwdDsgfQogCisJUVN0cmluZyBjaGFyc2V0KCkg Y29uc3QgeyByZXR1cm4gbV9jaGFyc2V0OyB9CisgICAgICAgIHZvaWQgc2V0Q2hhcnNldCggY29u c3QgUVN0cmluZyYgY2hhcnNldCApIHsgbV9jaGFyc2V0ID0gY2hhcnNldDsgfQorCiAgICAgcHJv dGVjdGVkOgogICAgICAgICB2b2lkIHNldFNpemUoaW50IHNpemUpOwogICAgICAgICBRUHRyRGlj dDxDYWNoZWRPYmplY3RDbGllbnQ+IG1fY2xpZW50czsKQEAgLTE3MSw2ICsxNzQsNyBAQCBuYW1l c3BhY2Uga2h0bWwKICAgICAgICAgYm9vbCBtX2xvYWRpbmcgOiAxOwogICAgICAgICBib29sIG1f ZnJlZSA6IDE7CiAJYm9vbCBtX2hhZEVycm9yIDogMTsKKyAgICAgICAgUVN0cmluZyBtX2NoYXJz ZXQ7CiAKICAgICBwcml2YXRlOgogICAgICAgICBib29sIGFsbG93SW5MUlVMaXN0KCkgY29uc3Qg eyByZXR1cm4gY2FuRGVsZXRlKCkgJiYgIW1fZnJlZSAmJiBzdGF0dXMoKSAhPSBQZXJzaXN0ZW50 OyB9CkBAIC0yMDAsMTMgKzIwNCwxMSBAQCBuYW1lc3BhY2Uga2h0bWwKIAl2aXJ0dWFsIHZvaWQg ZXJyb3IoIGludCBlcnIsIGNvbnN0IGNoYXIgKnRleHQgKTsKIAogICAgICAgICB2aXJ0dWFsIGJv b2wgc2NoZWR1bGUoKSBjb25zdCB7IHJldHVybiB0cnVlOyB9Ci0gICAgICAgIHZvaWQgc2V0Q2hh cnNldCggY29uc3QgUVN0cmluZyYgY2hhcnNldCApIHsgbV9jaGFyc2V0ID0gY2hhcnNldDsgfQog CiAgICAgcHJvdGVjdGVkOgogICAgICAgICB2b2lkIGNoZWNrTm90aWZ5KCk7CiAKIAlET006OkRP TVN0cmluZyBtX3NoZWV0OwotICAgICAgICBRU3RyaW5nIG1fY2hhcnNldDsKIAlpbnQgbV9lcnI7 CiAJUVN0cmluZyBtX2VyclRleHQ7CiAgICAgfTsKQEAgLTIzMiwxMCArMjM0LDggQEAgbmFtZXNw YWNlIGtodG1sCiAJdm9pZCBjaGVja05vdGlmeSgpOwogCiAgICAgICAgIGJvb2wgaXNMb2FkZWQo KSBjb25zdCB7IHJldHVybiAhbV9sb2FkaW5nOyB9Ci0gICAgICAgIHZvaWQgc2V0Q2hhcnNldCgg Y29uc3QgUVN0cmluZyYgY2hhcnNldCApIHsgbV9jaGFyc2V0ID0gY2hhcnNldDsgfQogCiAgICAg cHJvdGVjdGVkOgotICAgICAgICBRU3RyaW5nIG1fY2hhcnNldDsKIAlET006OkRPTVN0cmluZyBt X3NjcmlwdDsKICAgICB9OwogCkluZGV4OiBsb2FkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6 IC9ob21lL2tkZS9rZGVsaWJzL2todG1sL21pc2MvbG9hZGVyLmNwcCx2CnJldHJpZXZpbmcgcmV2 aXNpb24gMS4xNzEKZGlmZiAtdSAtMyAtcCAtcjEuMTcxIGxvYWRlci5jcHAKLS0tIGxvYWRlci5j cHAJMjAgRmViIDIwMDQgMTQ6MDU6MjkgLTAwMDAJMS4xNzEKKysrIGxvYWRlci5jcHAJNCBBcHIg MjAwNCAyMTo1NzozMCAtMDAwMApAQCAtOTQ5LDcgKzk0OSw3IEBAIENhY2hlZENTU1N0eWxlU2hl ZXQgKkRvY0xvYWRlcjo6cmVxdWVzdFMKICAgICBET0NMT0FERVJfU0VDQ0hFQ0soIXVzZXJTaGVl dCk7CiAKICAgICBDYWNoZWRDU1NTdHlsZVNoZWV0KiBzID0gQ2FjaGU6OnJlcXVlc3RPYmplY3Q8 Q2FjaGVkQ1NTU3R5bGVTaGVldCwgQ2FjaGVkT2JqZWN0OjpDU1NTdHlsZVNoZWV0PiggdGhpcywg ZnVsbFVSTCwgYWNjZXB0ICk7Ci0gICAgaWYgKCBzICkgeworICAgIGlmICggcyAmJiAhY2hhcnNl dC5pc0VtcHR5KCkgKSB7CiAgICAgICAgIHMtPnNldENoYXJzZXQoIGNoYXJzZXQgKTsKICAgICB9 CiAgICAgcmV0dXJuIHM7CkBAIC05NjAsNyArOTYwLDcgQEAgQ2FjaGVkU2NyaXB0ICpEb2NMb2Fk ZXI6OnJlcXVlc3RTY3JpcHQoIAogICAgIERPQ0xPQURFUl9TRUNDSEVDSyh0cnVlKTsKIAogICAg IENhY2hlZFNjcmlwdCogcyA9IENhY2hlOjpyZXF1ZXN0T2JqZWN0PENhY2hlZFNjcmlwdCwgQ2Fj aGVkT2JqZWN0OjpTY3JpcHQ+KCB0aGlzLCBmdWxsVVJMLCAwICk7Ci0gICAgaWYgKCBzICkKKyAg ICBpZiAoIHMgJiYgIWNoYXJzZXQuaXNFbXB0eSgpICkKICAgICAgICAgcy0+c2V0Q2hhcnNldCgg Y2hhcnNldCApOwogICAgIHJldHVybiBzOwogfQpAQCAtMTA4MSw2ICsxMDgxLDEyIEBAIHZvaWQg TG9hZGVyOjpzbG90RmluaXNoZWQoIEtJTzo6Sm9iKiBqb2IKICAgfQogICBlbHNlCiAgIHsKKyAg ICAgIFFTdHJpbmcgY2hhcnNldCA9IGotPnF1ZXJ5TWV0YURhdGEoImNoYXJzZXQiKTsKKyAgICAg IGlmICggIWNoYXJzZXQuaXNOdWxsKCkgKQorCSAgci0+b2JqZWN0LT5zZXRDaGFyc2V0KCBjaGFy c2V0ICk7CisgICAgICBlbHNlIGlmICggY2hhcnNldC5pc051bGwoKSAmJiBqLT51cmwoKS5pc0xv Y2FsRmlsZSgpICkKKwkgIHItPm9iamVjdC0+c2V0Q2hhcnNldCggUVRleHRDb2RlYzo6Y29kZWNG b3JMb2NhbGUoKS0+bmFtZSgpICk7CisKICAgICAgIHItPm9iamVjdC0+ZGF0YShyLT5tX2J1ZmZl ciwgdHJ1ZSk7CiAgICAgICBlbWl0IHJlcXVlc3REb25lKCByLT5tX2RvY0xvYWRlciwgci0+b2Jq ZWN0ICk7CiAgICAgICB0aW1lX3QgZXhwaXJlRGF0ZSA9IGotPnF1ZXJ5TWV0YURhdGEoImV4cGly ZS1kYXRlIikudG9Mb25nKCk7Cg== 5632 2004-04-14 05:52:00 +0000 2004-04-14 05:52:00 +0000 Second attempt at fixing khtml-misc-loader.diff text/plain 3072 thiago SW5kZXg6IG1pc2MvbG9hZGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2hvbWUva2RlL2tkZWxp YnMva2h0bWwvbWlzYy9sb2FkZXIuaCx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS42NwpkaWZmIC11 IC0zIC1wIC1yMS42NyBsb2FkZXIuaAotLS0gbWlzYy9sb2FkZXIuaAkyIEFwciAyMDA0IDIwOjU1 OjM3IC0wMDAwCTEuNjcKKysrIG1pc2MvbG9hZGVyLmgJMTQgQXByIDIwMDQgMDM6NDk6MTQgLTAw MDAKQEAgLTE1NSw2ICsxNTUsOSBAQCBuYW1lc3BhY2Uga2h0bWwKICAgICAgICAgUVN0cmluZyBh Y2NlcHQoKSBjb25zdCB7IHJldHVybiBtX2FjY2VwdDsgfQogICAgICAgICB2b2lkIHNldEFjY2Vw dChjb25zdCBRU3RyaW5nICZfYWNjZXB0KSB7IG1fYWNjZXB0ID0gX2FjY2VwdDsgfQogCisJUVN0 cmluZyBjaGFyc2V0KCkgY29uc3QgeyByZXR1cm4gbV9jaGFyc2V0OyB9CisgICAgICAgIHZvaWQg c2V0Q2hhcnNldCggY29uc3QgUVN0cmluZyYgY2hhcnNldCApIHsgbV9jaGFyc2V0ID0gY2hhcnNl dDsgfQorCiAgICAgcHJvdGVjdGVkOgogICAgICAgICB2b2lkIHNldFNpemUoaW50IHNpemUpOwog ICAgICAgICBRUHRyRGljdDxDYWNoZWRPYmplY3RDbGllbnQ+IG1fY2xpZW50czsKQEAgLTE3MSw2 ICsxNzQsNyBAQCBuYW1lc3BhY2Uga2h0bWwKICAgICAgICAgYm9vbCBtX2xvYWRpbmcgOiAxOwog ICAgICAgICBib29sIG1fZnJlZSA6IDE7CiAJYm9vbCBtX2hhZEVycm9yIDogMTsKKyAgICAgICAg UVN0cmluZyBtX2NoYXJzZXQ7CiAKICAgICBwcml2YXRlOgogICAgICAgICBib29sIGFsbG93SW5M UlVMaXN0KCkgY29uc3QgeyByZXR1cm4gY2FuRGVsZXRlKCkgJiYgIW1fZnJlZSAmJiBzdGF0dXMo KSAhPSBQZXJzaXN0ZW50OyB9CkBAIC0yMDAsMTMgKzIwNCwxMSBAQCBuYW1lc3BhY2Uga2h0bWwK IAl2aXJ0dWFsIHZvaWQgZXJyb3IoIGludCBlcnIsIGNvbnN0IGNoYXIgKnRleHQgKTsKIAogICAg ICAgICB2aXJ0dWFsIGJvb2wgc2NoZWR1bGUoKSBjb25zdCB7IHJldHVybiB0cnVlOyB9Ci0gICAg ICAgIHZvaWQgc2V0Q2hhcnNldCggY29uc3QgUVN0cmluZyYgY2hhcnNldCApIHsgbV9jaGFyc2V0 ID0gY2hhcnNldDsgfQogCiAgICAgcHJvdGVjdGVkOgogICAgICAgICB2b2lkIGNoZWNrTm90aWZ5 KCk7CiAKIAlET006OkRPTVN0cmluZyBtX3NoZWV0OwotICAgICAgICBRU3RyaW5nIG1fY2hhcnNl dDsKIAlpbnQgbV9lcnI7CiAJUVN0cmluZyBtX2VyclRleHQ7CiAgICAgfTsKQEAgLTIzMiwxMCAr MjM0LDggQEAgbmFtZXNwYWNlIGtodG1sCiAJdm9pZCBjaGVja05vdGlmeSgpOwogCiAgICAgICAg IGJvb2wgaXNMb2FkZWQoKSBjb25zdCB7IHJldHVybiAhbV9sb2FkaW5nOyB9Ci0gICAgICAgIHZv aWQgc2V0Q2hhcnNldCggY29uc3QgUVN0cmluZyYgY2hhcnNldCApIHsgbV9jaGFyc2V0ID0gY2hh cnNldDsgfQogCiAgICAgcHJvdGVjdGVkOgotICAgICAgICBRU3RyaW5nIG1fY2hhcnNldDsKIAlE T006OkRPTVN0cmluZyBtX3NjcmlwdDsKICAgICB9OwogCkluZGV4OiBtaXNjL2xvYWRlci5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQpSQ1MgZmlsZTogL2hvbWUva2RlL2tkZWxpYnMva2h0bWwvbWlzYy9sb2FkZXIu Y3BwLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjE3MgpkaWZmIC11IC0zIC1wIC1yMS4xNzIgbG9h ZGVyLmNwcAotLS0gbWlzYy9sb2FkZXIuY3BwCTIgQXByIDIwMDQgMjA6NTU6MzcgLTAwMDAJMS4x NzIKKysrIG1pc2MvbG9hZGVyLmNwcAkxNCBBcHIgMjAwNCAwMzo0OToxNCAtMDAwMApAQCAtOTUw LDcgKzk1MCw3IEBAIENhY2hlZENTU1N0eWxlU2hlZXQgKkRvY0xvYWRlcjo6cmVxdWVzdFMKICAg ICBET0NMT0FERVJfU0VDQ0hFQ0soIXVzZXJTaGVldCk7CiAKICAgICBDYWNoZWRDU1NTdHlsZVNo ZWV0KiBzID0gQ2FjaGU6OnJlcXVlc3RPYmplY3Q8Q2FjaGVkQ1NTU3R5bGVTaGVldCwgQ2FjaGVk T2JqZWN0OjpDU1NTdHlsZVNoZWV0PiggdGhpcywgZnVsbFVSTCwgYWNjZXB0ICk7Ci0gICAgaWYg KCBzICkgeworICAgIGlmICggcyAmJiAhY2hhcnNldC5pc0VtcHR5KCkgKSB7CiAgICAgICAgIHMt PnNldENoYXJzZXQoIGNoYXJzZXQgKTsKICAgICB9CiAgICAgcmV0dXJuIHM7CkBAIC05NjEsNyAr OTYxLDcgQEAgQ2FjaGVkU2NyaXB0ICpEb2NMb2FkZXI6OnJlcXVlc3RTY3JpcHQoIAogICAgIERP Q0xPQURFUl9TRUNDSEVDSyh0cnVlKTsKIAogICAgIENhY2hlZFNjcmlwdCogcyA9IENhY2hlOjpy ZXF1ZXN0T2JqZWN0PENhY2hlZFNjcmlwdCwgQ2FjaGVkT2JqZWN0OjpTY3JpcHQ+KCB0aGlzLCBm dWxsVVJMLCAwICk7Ci0gICAgaWYgKCBzICkKKyAgICBpZiAoIHMgJiYgIWNoYXJzZXQuaXNFbXB0 eSgpICkKICAgICAgICAgcy0+c2V0Q2hhcnNldCggY2hhcnNldCApOwogICAgIHJldHVybiBzOwog fQpAQCAtMTA4Miw2ICsxMDgyLDE1IEBAIHZvaWQgTG9hZGVyOjpzbG90RmluaXNoZWQoIEtJTzo6 Sm9iKiBqb2IKICAgfQogICBlbHNlCiAgIHsKKyAgICAgIGlmIChyLT5vYmplY3QtPmNoYXJzZXQo KS5pc051bGwoKSkKKyAgICAgIHsKKwkgIFFTdHJpbmcgY2hhcnNldCA9IGotPnF1ZXJ5TWV0YURh dGEoImNoYXJzZXQiKTsKKwkgIGlmICggIWNoYXJzZXQuaXNOdWxsKCkgKQorCSAgICAgIHItPm9i amVjdC0+c2V0Q2hhcnNldCggY2hhcnNldCApOworCSAgZWxzZSBpZiAoIGNoYXJzZXQuaXNOdWxs KCkgJiYgai0+dXJsKCkuaXNMb2NhbEZpbGUoKSApCisJICAgICAgci0+b2JqZWN0LT5zZXRDaGFy c2V0KCBRVGV4dENvZGVjOjpjb2RlY0ZvckxvY2FsZSgpLT5uYW1lKCkgKTsKKyAgICAgIH0KKwog ICAgICAgci0+b2JqZWN0LT5kYXRhKHItPm1fYnVmZmVyLCB0cnVlKTsKICAgICAgIGVtaXQgcmVx dWVzdERvbmUoIHItPm1fZG9jTG9hZGVyLCByLT5vYmplY3QgKTsKICAgICAgIHRpbWVfdCBleHBp cmVEYXRlID0gai0+cXVlcnlNZXRhRGF0YSgiZXhwaXJlLWRhdGUiKS50b0xvbmcoKTsK