6290 2005-12-29 16:56:35 -0800 XML documents with "html" in dtd name use XHTML entities when they shouldn't 2006-01-31 21:20:40 -0800 1 1 1 Unclassified WebKit WebKit Misc. 420+ PC Linux RESOLVED FIXED http://www.hixie.ch/tests/adhoc/xml/parsing/010.xml P4 Normal --- 4301 1 ian eric oldest_to_newest 27177 0 ian 2005-12-29 16:56:35 -0800 Currently any XML file with a DOCTYPE whose "name" part is "html" triggers "HTML" parsing mode. This is wrong. It should be based on the PUBLIC identifier. TESTCASE: http://www.hixie.ch/tests/adhoc/xml/parsing/010.xml This is a regression caused by bug 4301. 27179 1 eric 2005-12-29 17:02:01 -0800 This is such a trivial edgecase. 27182 2 ian 2005-12-29 17:11:02 -0800 Not that much of an edgecase, XHTML2 will likely trip this, and even if XHTML2 isn't much in use today, it eventually may be. It would be sad for XHTML2 authors if they were confused by old builds of Safari. The bug is that externalSubsetHandler() is checking |name|, but should be checking |externalId|. Here are the IDs to compare against (taken from Mozilla's list, with the MathML DTDs removed): "-//W3C//DTD XHTML 1.0 Transitional//EN" "-//W3C//DTD XHTML 1.1//EN" "-//W3C//DTD XHTML 1.0 Strict//EN" "-//W3C//DTD XHTML 1.0 Frameset//EN" "-//W3C//DTD XHTML Basic 1.0//EN" "-//WAPFORUM//DTD XHTML Mobile 1.0//EN" 27184 3 eric 2005-12-29 17:36:23 -0800 Calling this a regression is pretty strong language. As far as I can tell this test case only "passed" before, because html entities were not supported in xhtml at all in Safari. Perhaps in the expat days this test case passed for valid reasons. Now html entities are supported in anything that looks like an xhtml document. This one happens to look enough like xhtml that we treat it as one. Eventually, we'll need a HashSet, and a list of allowed doc types. 27186 4 ian 2005-12-29 17:38:49 -0800 Why not just a set of six string comparisons in the place of the one comparison you have now? You'll almost always either match the first one or not enter the function, so it shouldn't be a perf hit. It's a regression because before you used to not have this bug, and now you do. That's what a regression is: the introduction of a new bug. 27193 5 5364 eric 2005-12-29 18:36:07 -0800 Created attachment 5364 fix & test 27196 6 ian 2005-12-29 19:01:28 -0800 You have this line: + || (extId == "-//W3C//DTD XHTML Basic 1.0//EN") ...in there twice. (In the Mozilla codebase they have the MathML 2.0 DOCTYPE where you have the second occurance, but you don't want to put that in because that isn't XHTML and has different entities. It's probably sort-of ok to have the XHTML+MathML DOCTYPEs in there, I guess, though. It'll at least work for some pages, anyway.) Other than that, looks great. Thanks. :-) 27202 7 5364 mjs 2005-12-29 20:00:49 -0800 Comment on attachment 5364 fix & test r=me 29396 8 joost 2006-01-22 04:56:38 -0800 Removing keyword(s) since bug is fixed. 29420 9 joost 2006-01-22 05:01:00 -0800 Removing keyword(s) since bug is fixed. 30863 10 eric 2006-01-31 21:20:40 -0800 Removing Regression keyword from bugs already fixed. 5364 2005-12-29 18:36:07 -0800 2005-12-29 20:00:49 -0800 fix & test non-xhtml.patch text/plain 4303 eric SW5kZXg6IExheW91dFRlc3RzL2Zhc3QvcGFyc2VyL3hodG1sLWFsdGVybmF0ZS1lbnRpdGllcy1l eHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogeGh0bWwtYWx0ZXJuYXRlLWVudGl0aWVz LWV4cGVjdGVkLnR4dApkaWZmIC1OIExheW91dFRlc3RzL2Zhc3QvcGFyc2VyL3hodG1sLWFsdGVy bmF0ZS1lbnRpdGllcy1leHBlY3RlZC50eHQKLS0tIExheW91dFRlc3RzL2Zhc3QvcGFyc2VyL3ho dG1sLWFsdGVybmF0ZS1lbnRpdGllcy1leHBlY3RlZC50eHQJMSBKYW4gMTk3MCAwMDowMDowMCAt MDAwMAorKysgTGF5b3V0VGVzdHMvZmFzdC9wYXJzZXIveGh0bWwtYWx0ZXJuYXRlLWVudGl0aWVz LWV4cGVjdGVkLnR4dAkzMCBEZWMgMjAwNSAwMjozNToyNSAtMDAwMApAQCAtMCwwICsxLDI5IEBA CitsYXllciBhdCAoMCwwKSBzaXplIDgwMHg2MDAKKyAgUmVuZGVyQ2FudmFzIGF0ICgwLDApIHNp emUgODAweDYwMAorbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4MTQ4CisgIFJlbmRlckJsb2NrIHto dG1sfSBhdCAoMCwwKSBzaXplIDgwMHgxNDgKKyAgICBSZW5kZXJCbG9jayAoYW5vbnltb3VzKSBh dCAoMCwwKSBzaXplIDgwMHgwCisgICAgICBSZW5kZXJJbmxpbmUge1BBUlNFUkVSUk9SfSBhdCAo MCwwKSBzaXplIDB4MCBbYmdjb2xvcj0jRkZEREREXSBbYm9yZGVyOiAoMnB4IHNvbGlkICNDQzc3 NzcpXQorICAgIFJlbmRlckJsb2NrIChhbm9ueW1vdXMpIGF0ICgwLDE4KSBzaXplIDgwMHg5NAor ICAgICAgUmVuZGVyQmxvY2sge0gzfSBhdCAoMCwwKSBzaXplIDgwMHgyMgorICAgICAgICBSZW5k ZXJUZXh0IHtURVhUfSBhdCAoMCwwKSBzaXplIDMyNHgyMgorICAgICAgICAgIHRleHQgcnVuIGF0 ICgwLDApIHdpZHRoIDMyNDogIlRoaXMgcGFnZSBjb250YWlucyB0aGUgZm9sbG93aW5nIGVycm9y czoiCisgICAgICBSZW5kZXJCbG9jayB7RElWfSBhdCAoMCw0MCkgc2l6ZSA4MDB4MTQKKyAgICAg ICAgUmVuZGVyVGV4dCB7VEVYVH0gYXQgKDAsMCkgc2l6ZSAzODV4MTQKKyAgICAgICAgICB0ZXh0 IHJ1biBhdCAoMCwwKSB3aWR0aCAzODU6ICJlcnJvciBvbiBsaW5lIDQgYXQgY29sdW1uIDE3OiBF bnRpdHkgJ2Zub2YnIG5vdCBkZWZpbmVkIgorICAgICAgUmVuZGVyQmxvY2sge0gzfSBhdCAoMCw3 Mikgc2l6ZSA4MDB4MjIKKyAgICAgICAgUmVuZGVyVGV4dCB7VEVYVH0gYXQgKDAsMCkgc2l6ZSA0 Mjl4MjIKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCA0Mjk6ICJCZWxvdyBpcyBh IHJlbmRlcmluZyBvZiB0aGUgcGFnZSB1cCB0byB0aGUgZmlyc3QgZXJyb3IuIgorICAgIFJlbmRl ckJsb2NrIChhbm9ueW1vdXMpIGF0ICgwLDEzMCkgc2l6ZSA4MDB4MTgKKyAgICAgIFJlbmRlcklu bGluZSB7UEFSU0VSRVJST1J9IGF0ICgwLDApIHNpemUgMHgwIFtiZ2NvbG9yPSNGRkRERERdIFti b3JkZXI6ICgycHggc29saWQgI0NDNzc3NyldCisgICAgICBSZW5kZXJUZXh0IHtURVhUfSBhdCAo MCwwKSBzaXplIDB4MAorICAgICAgUmVuZGVySW5saW5lIHtoMX0gYXQgKDAsMCkgc2l6ZSAweDAK KyAgICAgICAgUmVuZGVyVGV4dCB7VEVYVH0gYXQgKDAsMCkgc2l6ZSAweDAKKyAgICAgIFJlbmRl clRleHQge1RFWFR9IGF0ICgwLDApIHNpemUgMHgwCisgICAgICBSZW5kZXJUZXh0IHtURVhUfSBh dCAoMCwwKSBzaXplIDB4MAorICAgICAgUmVuZGVySW5saW5lIHtwfSBhdCAoMCwwKSBzaXplIDQ4 OXgxOAorICAgICAgICBSZW5kZXJJbmxpbmUge2ZvbnR9IGF0ICgwLDApIHNpemUgNDg5eDE4Cisg ICAgICAgICAgUmVuZGVyVGV4dCB7VEVYVH0gYXQgKDAsMCkgc2l6ZSA0ODl4MTgKKyAgICAgICAg ICAgIHRleHQgcnVuIGF0ICgwLDApIHdpZHRoIDI2MzogIlRoaXMgc2hvdWxkIGJlIHRoZSBvbmx5 IGxpbmUgb24gdGhpcyBwYWdlLiAiCisgICAgICAgICAgICB0ZXh0IHJ1biBhdCAoMjYzLDApIHdp ZHRoIDIyNjogIllvdSBzaG91bGQgc2VlIGEgcGFyc2UgZXJyb3IgYWJvdmUuIgorICAgICAgUmVu ZGVyVGV4dCB7VEVYVH0gYXQgKDAsMCkgc2l6ZSAweDAKSW5kZXg6IExheW91dFRlc3RzL2Zhc3Qv cGFyc2VyL3hodG1sLWFsdGVybmF0ZS1lbnRpdGllcy54bWwKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTog eGh0bWwtYWx0ZXJuYXRlLWVudGl0aWVzLnhtbApkaWZmIC1OIExheW91dFRlc3RzL2Zhc3QvcGFy c2VyL3hodG1sLWFsdGVybmF0ZS1lbnRpdGllcy54bWwKLS0tIExheW91dFRlc3RzL2Zhc3QvcGFy c2VyL3hodG1sLWFsdGVybmF0ZS1lbnRpdGllcy54bWwJMSBKYW4gMTk3MCAwMDowMDowMCAtMDAw MAorKysgTGF5b3V0VGVzdHMvZmFzdC9wYXJzZXIveGh0bWwtYWx0ZXJuYXRlLWVudGl0aWVzLnht bAkzMCBEZWMgMjAwNSAwMjozNToyNSAtMDAwMApAQCAtMCwwICsxLDYgQEAKKzw/eG1sLXN0eWxl c2hlZXQgaHJlZj0iZGF0YTp0ZXh0L2NzcywudGVzdCUyMHslMjBjb2xvcjolMjByZWQ7JTIwfSIg Pz4KKzwhRE9DVFlQRSBodG1sIFBVQkxJQyAiLS8vV0hBVFdHLy9EVEQgWEhUTUwgMS4wIEFsdGVy bmF0ZUVudGl0aWVzLy9FTiIgIjAxMC5kdGQiPgorPGh0bWw+CisgPGgxPiAmZm5vZjsmYXVtbDsm aXVtbDsmSXVtbDsgPC9oMT4gPCEtLSBJZiB5b3UgZ2V0IGEgcGFyc2UgZXJyb3IsIHRoaXMgdGVz dCBoYXMgUEFTU0VELiAtLT4KKyA8cCBjbGFzcz0idGVzdCI+PGZvbnQgY29sb3I9InJlZCI+IFRo aXMgc2hvdWxkIGJlIHRoZSBvbmx5IGxpbmUgb24gdGhpcyBwYWdlLiAgWW91IHNob3VsZCBzZWUg YSBwYXJzZSBlcnJvciBhYm92ZS48L2ZvbnQ+PC9wPgorPC9odG1sPgpJbmRleDogV2ViQ29yZS9r aHRtbC94bWwveG1sX3Rva2VuaXplci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9yb290 L1dlYkNvcmUva2h0bWwveG1sL3htbF90b2tlbml6ZXIuY3BwLHYKcmV0cmlldmluZyByZXZpc2lv biAxLjYxCmRpZmYgLXAgLXUgLXIxLjYxIFdlYkNvcmUva2h0bWwveG1sL3htbF90b2tlbml6ZXIu Y3BwCi0tLSBXZWJDb3JlL2todG1sL3htbC94bWxfdG9rZW5pemVyLmNwcAkyOSBEZWMgMjAwNSAy Mzo0OTowNCAtMDAwMAkxLjYxCisrKyBXZWJDb3JlL2todG1sL3htbC94bWxfdG9rZW5pemVyLmNw cAkzMCBEZWMgMjAwNSAwMjozNTo0MiAtMDAwMApAQCAtNjY2LDggKzY2NiwxNyBAQCBzdGF0aWMg dm9pZCBpbnRlcm5hbFN1YnNldEhhbmRsZXIodm9pZCAqCiAKIHN0YXRpYyB2b2lkIGV4dGVybmFs U3Vic2V0SGFuZGxlcih2b2lkICpjbG9zdXJlLCBjb25zdCB4bWxDaGFyICpuYW1lLCBjb25zdCB4 bWxDaGFyICpleHRlcm5hbElkLCBjb25zdCB4bWxDaGFyICpzeXN0ZW1JZCkKIHsKLSAgICBpZiAo dG9RU3RyaW5nKG5hbWUpLmNvbnRhaW5zKCJodG1sIikpCi0gICAgICAgIGdldFRva2VuaXplcihj bG9zdXJlKS0+c2V0SXNYSFRNTERvY3VtZW50KHRydWUpOworICAgIFFTdHJpbmcgZXh0SWQgPSB0 b1FTdHJpbmcoZXh0ZXJuYWxJZCk7CisgICAgaWYgKChleHRJZCA9PSAiLS8vVzNDLy9EVEQgWEhU TUwgMS4wIFRyYW5zaXRpb25hbC8vRU4iKQorICAgICAgICB8fCAoZXh0SWQgPT0gIi0vL1czQy8v RFREIFhIVE1MIDEuMS8vRU4iKQorICAgICAgICB8fCAoZXh0SWQgPT0gIi0vL1czQy8vRFREIFhI VE1MIDEuMCBTdHJpY3QvL0VOIikKKyAgICAgICAgfHwgKGV4dElkID09ICItLy9XM0MvL0RURCBY SFRNTCAxLjAgRnJhbWVzZXQvL0VOIikKKyAgICAgICAgfHwgKGV4dElkID09ICItLy9XM0MvL0RU RCBYSFRNTCBCYXNpYyAxLjAvL0VOIikKKyAgICAgICAgfHwgKGV4dElkID09ICItLy9XM0MvL0RU RCBYSFRNTCAxLjEgcGx1cyBNYXRoTUwgMi4wLy9FTiIpCisgICAgICAgIHx8IChleHRJZCA9PSAi LS8vVzNDLy9EVEQgWEhUTUwgMS4xIHBsdXMgTWF0aE1MIDIuMCBwbHVzIFNWRyAxLjEvL0VOIikK KyAgICAgICAgfHwgKGV4dElkID09ICItLy9XM0MvL0RURCBYSFRNTCBCYXNpYyAxLjAvL0VOIikK KyAgICAgICAgfHwgKGV4dElkID09ICItLy9XQVBGT1JVTS8vRFREIFhIVE1MIE1vYmlsZSAxLjAv L0VOIikpCisgICAgICAgIGdldFRva2VuaXplcihjbG9zdXJlKS0+c2V0SXNYSFRNTERvY3VtZW50 KHRydWUpOyAvLyBjb250cm9scyBpZiB3ZSByZXBsYWNlIGVudGl0aWVzIG9yIG5vdC4KIH0KIAog dm9pZCBYTUxUb2tlbml6ZXI6OmZpbmlzaCgpCg==