32706 2009-12-18 03:19:43 -0800 <noscript> is taking effect even though the Javascript is enabled, when XHTMLMP is enabled 2009-12-28 22:41:41 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 charles.wei webkit-unassigned charles.wei commit-queue dbates staikos webkit.review.bot oldest_to_newest 173098 0 charles.wei 2009-12-18 03:19:43 -0800 <noscript> is designed for browsers that doesn't support Javascript , or Javascript is disabled. But It's working even when Javascript is enabled with WebKit, this happens when XHTMLMP is enabled. to verify , use the following html snippets: <html> <noscript> <meta http-equiv=refresh content="0; URL=http://www.google.com" /> </noscript> <body> If you see this text and not re-directed to google when your browser is Javascript enabled, it succeeds, otherwise it fails . </body> </html> 173897 1 45308 charles.wei 2009-12-20 23:46:47 -0800 Created attachment 45308 patch This patch fixes the problem "contents inside <noscript> is taking effect even when Javascript is enabled, this happens only when XHTMLMP is enabled". <noscript> is enabled when XHTMLMP is enabled, but the implementation only hides the contents inside <noscript> when Javascript is turned on, which is incorrect. The correct solution is to skip the parsing of all the contents inside <noscript> if Javascript is turned on . 173898 2 webkit.review.bot 2009-12-20 23:49:18 -0800 style-queue ran check-webkit-style on attachment 45308 without any errors. 173956 3 45308 manyoso 2009-12-21 06:13:02 -0800 Comment on attachment 45308 patch Can you programmatically turn on/off JavaScript and test rather than just assume it is on and only test that case? Also it isn't clear to me why the change to HTMLParser should be XHTMLMP only... If JS is on, then noscript should be skipped regardless of whether XHTMLMP is enabled or not, right? Also what about the previous changes to HTMLNoSCriptElement? 174476 4 45411 dbates 2009-12-22 16:50:09 -0800 Created attachment 45411 Layout tests A DRT test that checks that both <meta> and <script> are not processed within <noscript> under XHTML-MP. 174510 5 45415 charles.wei 2009-12-22 19:44:37 -0800 Created attachment 45415 another patch Another patch that addresses the comments of the reviewer 174512 6 webkit.review.bot 2009-12-22 19:48:50 -0800 style-queue ran check-webkit-style on attachment 45415 without any errors. 174518 7 45308 eric 2009-12-22 20:25:24 -0800 Comment on attachment 45308 patch Clearing cq+ on this obsolete patch. 174534 8 45415 eric 2009-12-22 22:43:13 -0800 Comment on attachment 45415 another patch The change looks fine, but I can't understand what you're trying to say in the ChangeLog. 174602 9 dbates 2009-12-23 10:13:00 -0800 (In reply to comment #1) > The correct solution is to skip the parsing of all the contents inside > <noscript> if Javascript is turned on . Note, by section 9.2.1.2 of the XHTML-MP 1.1 spec., we must process <noscript> even when scripting is enabled so long as we have encountered an script with an unsupported scripting language <http://www.openmobilealliance.org/Technical/release_program/docs/Browsing/V2_2-20061020-A/OMA-WAP-XHTMLMP-V1_1-20061020-A.pdf>. 174611 10 dbates 2009-12-23 11:05:10 -0800 (In reply to comment #0) > <noscript> is designed for browsers that doesn't support Javascript , or > Javascript is disabled. But It's working even when Javascript is enabled > with WebKit, this happens when XHTMLMP is enabled. > > to verify , use the following html snippets: > > <html> > <noscript> > <meta http-equiv=refresh content="0; URL=http://www.google.com" /> > </noscript> > > <body> > If you see this text and not re-directed to google when your browser is > Javascript enabled, it succeeds, otherwise it fails . > </body> > </html> I am unclear from your snippet whether this is a valid XHTML-MP document and whether this document would or should be interpreted as being an XHTML-MP document. I mean, it's missing a DOCTYPE and an xml namespace. So, how does the browser know to interpret this as XHTML-MP? by file extension? by MIME type "application/vnd.wap.xhtml+xml"? when XHTML-MP is enabled in WebKit do we just interpret all documents as XHTML-MP? some combination? (I briefly looked through some of the XHTML-MP code, and from my understanding, it looks for the DOCTYPE and xml namespace declarations as well as accepts the MIME type "application/vnd.wap.xhtml+xml".) I would suggest only using the XHTML-MP logic when we clearly know that the document we received is an XHTML-MP document since by the HTML 5 spec. <noscript> has a precisely defined behavior under HTML, but has no meaning under XHTML (*). Hence, the expected result of interpreting your example as XHTML should be a redirect (regardless of whether JavaScript is enabled). And the expected result of interpreting the document as HTML with JavaScript enabled is no redirect. Assuming JavaScript is enabled, then interpreting your example as an XHTML-MP document should not cause a redirect. But, consider the slightly modified example: <html> <script type="unsupported-script-lang">...</script> <noscript> <meta http-equiv=refresh content="0; URL=http://www.google.com" /> </noscript> <body> If you see this text and not re-directed to google when your browser is Javascript enabled, it succeeds, otherwise it fails . </body> </html> Assume JavaScript is enabled and suppose this is interpreted as being an XHTML-MP document. Then by section 9.2.1.2 of the XHTML-MP 1.1 spec.<http://www.openmobilealliance.org/Technical/release_program/docs/Browsing/V2_2-20061020-A/OMA-WAP-XHTMLMP-V1_1-20061020-A.pdf>, we must process the <noscript> since we first encountered a <script> with an unsupported scripting language (i.e. "unsupported-script-lang"). So, the expected result is a redirect. (*) Section 4.3.2 of the HTML 5 spec. states "...the noscript element is handled differently by the HTML parser based on whether scripting was enabled or not when the parser was invoked....The noscript element is only effective in the HTML syntax, it has no effect in the XHTML syntax" (http://dev.w3.org/html5/spec/Overview.html#the-noscript-element). 174772 11 charles.wei 2009-12-24 06:50:06 -0800 > I am unclear from your snippet whether this is a valid XHTML-MP document and > whether this document would or should be interpreted as being an XHTML-MP > document. I mean, it's missing a DOCTYPE and an xml namespace. So, how does the > browser know to interpret this as XHTML-MP? by file extension? by MIME type > "application/vnd.wap.xhtml+xml"? when XHTML-MP is enabled in WebKit do we just > interpret all documents as XHTML-MP? some combination? > > (I briefly looked through some of the XHTML-MP code, and from my understanding, > it looks for the DOCTYPE and xml namespace declarations as well as accepts the > MIME type "application/vnd.wap.xhtml+xml".) > > I would suggest only using the XHTML-MP logic when we clearly know that the > document we received is an XHTML-MP document since by the HTML 5 spec. > <noscript> has a precisely defined behavior under HTML, but has no meaning > under XHTML (*). Hence, the expected result of interpreting your example as > XHTML should be a redirect (regardless of whether JavaScript is enabled). And > the expected result of interpreting the document as HTML with JavaScript > enabled is no redirect. > > Assuming JavaScript is enabled, then interpreting your example as an XHTML-MP > document should not cause a redirect. But, consider the slightly modified > example: > > <html> > <script type="unsupported-script-lang">...</script> > <noscript> > <meta http-equiv=refresh content="0; URL=http://www.google.com" /> > </noscript> > > <body> > If you see this text and not re-directed to google when your browser is > Javascript enabled, it succeeds, otherwise it fails . > </body> > </html> > > Assume JavaScript is enabled and suppose this is interpreted as being an > XHTML-MP document. Then by section 9.2.1.2 of the XHTML-MP 1.1 > spec.<http://www.openmobilealliance.org/Technical/release_program/docs/Browsing/V2_2-20061020-A/OMA-WAP-XHTMLMP-V1_1-20061020-A.pdf>, > we must process the <noscript> since we first encountered a <script> with an > unsupported scripting language (i.e. "unsupported-script-lang"). So, the > expected result is a redirect. > > (*) Section 4.3.2 of the HTML 5 spec. states "...the noscript element is > handled differently by the HTML parser based on whether scripting was enabled > or not when the parser was invoked....The noscript element is only effective in > the HTML syntax, it has no effect in the XHTML syntax" > (http://dev.w3.org/html5/spec/Overview.html#the-noscript-element). Thanks, Daniel, for the comment. This bug is introduced by XHTML-MP for HTML document -- when XHTML-MP is enabled, it's causing regressions for HTML documents , and that's what my patch tries to fix. When XHTML-MP is enabled, it still distinguishes XHTML-MP document and HTML documents, and uses different parsers for different documents. The documents will be distinguished by MIME type /file extension. You are right that we should only use XHTML-MP logic when we know that the document IS a XHTML-MP document. The problem is, when the author of XHTML-MP introduced this feature to WebKit, it causes regressions to HTML document by disabling some code of HTMLParser with : #if !ENABLE(XHTMLMP) original HTMLParser code for <noscript> processing #endif That causes problems with <noscript> processing for HTML documents -- contents inside <noscript> are always parsed and processed no matter Javascript is enabled or not, which is incorrect for HTML document. That's my patch tries to fix -- to make contents inside <noscript> ignored when Javascript is enabled for HTML document. Hope this makes it clear . Thanks 175195 12 45415 mjs 2009-12-28 01:56:09 -0800 Comment on attachment 45415 another patch Tests look correct and I agree the #ifdef is bogus. r=me 175420 13 45415 commit-queue 2009-12-28 22:41:36 -0800 Comment on attachment 45415 another patch Clearing flags on attachment: 45415 Committed r52609: <http://trac.webkit.org/changeset/52609> 175421 14 commit-queue 2009-12-28 22:41:41 -0800 All reviewed patches have been landed. Closing bug. 45308 2009-12-20 23:46:47 -0800 2009-12-22 20:25:24 -0800 patch 32706.patch text/plain 3081 charles.wei SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MjQzNikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMDktMTItMjAgIENoYXJsZXMgV2VpICA8Y2hhcmxlcy53ZWlAdG9y Y2htb2JpbGUuY29tLmNuPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFRoaXMgaXMgdG8gcmVzb2x2ZSB0aGUgcHJvYmxlbSAiQ29udGVudCBpbnNpZGUg PG5vc2NyaXB0PiBpcyB3b3JraW5nIGV2ZW4gd2hlbiBKYXZhc2NyaXB0IGlzIGVuYWJsZWQuIAor ICAgICAgICB0aGlzIGhhcHBlbnMgd2hlbiBYSFRNTE1QIGlzIHR1cm5lZCBvbiIuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMjcwNgorCisgICAgICAg IFRlc3Q6IGZhc3QvcGFyc2VyL25vc2NyaXB0Lmh0bWwKKworICAgICAgICAqIGh0bWwvSFRNTFBh cnNlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MUGFyc2VyOjpwYXJzZVRva2VuKToKKwog MjAwOS0xMi0yMCAgS2VudCBUYW11cmEgIDx0a2VudEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCkluZGV4OiBXZWJDb3JlL2h0bWwvSFRNTFBhcnNlci5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9odG1sL0hUTUxQYXJzZXIuY3BwCShyZXZpc2lvbiA1 MjQzMCkKKysrIFdlYkNvcmUvaHRtbC9IVE1MUGFyc2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MjQ4LDYgKzI0OCwxMSBAQCBQYXNzUmVmUHRyPE5vZGU+IEhUTUxQYXJzZXI6OnBhcnNlVG9rZW4o CiAgICAgICAgIHJldHVybiAwOwogICAgIH0KIAorI2lmIEVOQUJMRShYSFRNTE1QKQorICAgIGlm ICh0LT50YWdOYW1lID09IG5vc2NyaXB0VGFnICYmICFtX2RvY3VtZW50LT5zaG91bGRQcm9jZXNz Tm9zY3JpcHRFbGVtZW50KCkpCisgICAgICAgIHNldFNraXBNb2RlKG5vc2NyaXB0VGFnKTsKKyNl bmRpZgorCiAgICAgLy8gSWdub3JlIHNwYWNlcywgaWYgd2UncmUgbm90IGluc2lkZSBhIHBhcmFn cmFwaCBvciBvdGhlciBpbmxpbmUgY29kZS4KICAgICAvLyBEbyBub3QgYWx0ZXIgdGhlIHRleHQg aWYgaXQgaXMgcGFydCBvZiBhIHNjcmlwdFRhZy4KICAgICBpZiAodC0+dGFnTmFtZSA9PSB0ZXh0 QXRvbSAmJiB0LT50ZXh0ICYmIG1fY3VycmVudC0+bG9jYWxOYW1lKCkgIT0gc2NyaXB0VGFnKSB7 CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCShyZXZpc2lvbiA1MjQzNikKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDA5LTEyLTIwICBDaGFybGVzIFdlaSAgPGNo YXJsZXMud2VpQHRvcmNobW9iaWxlLmNvbS5jbj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGZpeGVzIDMyNzA2LCB3aGljaCBzYXlzICJjb250 ZW50IGluc2lkZSA8bm9zY3JpcHQ+IGlzIHdvcmtpbmcsIGV2ZW4gd2hlbiBKYXZhc2NyaXB0IGlz IGVuYWJsZWQuCisgICAgICAgIFRoaXMgaGFwcGVucyB3aGVuIFhIVE1MTVAgaXMgdHVybmVkIG9u IgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzI3MDYK KworICAgICAgICAqIGZhc3QvcGFyc2VyL25vc2NyaXB0LWV4cGVjdGVkLnR4dDogQWRkZWQuCisg ICAgICAgICogZmFzdC9wYXJzZXIvbm9zY3JpcHQuaHRtbDogQWRkZWQuCisKIDIwMDktMTItMjAg IEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IERhcmluIEFkbGVyLgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9wYXJzZXIvbm9zY3JpcHQtZXhw ZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvcGFyc2VyL25vc2NyaXB0 LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3QvcGFyc2VyL25v c2NyaXB0LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwyIEBACitDT05TT0xF IE1FU1NBR0U6IGxpbmUgMjE6IFJlZmVyZW5jZUVycm9yOiBDYW4ndCBmaW5kIHZhcmlhYmxlOiBp bml0CitTdWNjZWVkZWQhCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L3BhcnNlci9ub3NjcmlwdC5o dG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvcGFyc2VyL25vc2NyaXB0Lmh0bWwJ KHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L3BhcnNlci9ub3NjcmlwdC5odG1sCShy ZXZpc2lvbiAwKQpAQCAtMCwwICsxLDI2IEBACis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdD4KK2lm ICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIu ZHVtcEFzVGV4dCgpOworPC9zY3JpcHQ+CisKKzxub3NjcmlwdD4gCisKKzxzY3JpcHQgdHlwZT0i dGV4dC9qYXZhc2NyaXB0Ij4KKyAgICBmdW5jdGlvbiBpbml0KCkgeworICAgICAgICB2YXIgZWxl bWVudCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjb25zb2xlIik7CisgICAgICAgIGVsZW1l bnQuaW5uZXJIVE1MPSI8cD5mYWlsZWQhPC9wPiI7CisgICAgfQorPC9zY3JpcHQ+CisKKzwvbm9z Y3JpcHQ+CisKKzwvaGVhZD4KKworPGJvZHkgb25sb2FkPSJpbml0KCk7Ij4KKyAgICA8ZGl2IGlk PSJjb25zb2xlIj4KKyAgICAgIFN1Y2NlZWRlZCEKKyAgICA8L2Rpdj4KKzwvYm9keT4KKzwvaHRt bD4K 45411 2009-12-22 16:50:09 -0800 2009-12-22 16:50:09 -0800 Layout tests Bug32706LT.diff text/plain 3102 dbates SW5kZXg6IExheW91dFRlc3RzL2Zhc3QveGh0bWxtcC94aHRtbG1wLWRvbnQtcHJvY2Vzcy1ub3Nj cmlwdC13aGVuLXNjcmlwdC1lbmFibGVkLnhodG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3Rz L2Zhc3QveGh0bWxtcC94aHRtbG1wLWRvbnQtcHJvY2Vzcy1ub3NjcmlwdC13aGVuLXNjcmlwdC1l bmFibGVkLnhodG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC94aHRtbG1wL3ho dG1sbXAtZG9udC1wcm9jZXNzLW5vc2NyaXB0LXdoZW4tc2NyaXB0LWVuYWJsZWQueGh0bWwJKHJl dmlzaW9uIDApCkBAIC0wLDAgKzEsNjIgQEAKKzxodG1sIHhtbG5zPSJodHRwOi8vd3d3LnczLm9y Zy8xOTk5L3hodG1sIj4KKzxoZWFkPgorPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSIuLi9q cy9yZXNvdXJjZXMvanMtdGVzdC1zdHlsZS5jc3MiLz4KKzxzY3JpcHQgc3JjPSIuLi9qcy9yZXNv dXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFz Y3JpcHQiPgorPCFbQ0RBVEFbCisgICAgdmFyIGRpZFByb2Nlc3NTY3JpcHRUYWcgPSBmYWxzZTsK KyAgICB2YXIgZGlkUHJvY2Vzc01ldGFUYWcgPSBmYWxzZTsKKworICAgIGlmICh3aW5kb3cubGF5 b3V0VGVzdENvbnRyb2xsZXIpIHsKKyAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFz VGV4dCgpOworICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci53YWl0VW50aWxEb25lKCk7Cisg ICAgfQorCisgICAgZnVuY3Rpb24gdGVzdCgpCisgICAgeworICAgICAgICB0ZXN0TWV0YVRhZygp OworICAgICAgICB0ZXN0U2NyaXB0VGFnKCk7CisKKyAgICAgICAgZGVidWcoJzxiciAvPjxzcGFu IGNsYXNzPSJwYXNzIj5URVNUIENPTVBMRVRFPC9zcGFuPicpOworICAgICAgICBpZiAod2luZG93 LmxheW91dFRlc3RDb250cm9sbGVyKQorICAgICAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIu bm90aWZ5RG9uZSgpOworICAgIH0KKworICAgIGZ1bmN0aW9uIHRlc3RNZXRhVGFnKCkKKyAgICB7 CisgICAgICAgIGlmIChkaWRQcm9jZXNzTWV0YVRhZykKKyAgICAgICAgICAgIHRlc3RGYWlsZWQo InNob3VsZCBub3QgaGF2ZSBwcm9jZXNzZWQgPG1ldGE+LCBidXQgZGlkLiIpOworICAgICAgICBl bHNlCisgICAgICAgICAgICB0ZXN0UGFzc2VkKCJkaWQgbm90IHByb2Nlc3MgPG1ldGE+LiIpOwor ICAgIH0KKworICAgIGZ1bmN0aW9uIHRlc3RTY3JpcHRUYWcoKQorICAgIHsKKyAgICAgICAgaWYg KGRpZFByb2Nlc3NTY3JpcHRUYWcpCisgICAgICAgICAgICB0ZXN0RmFpbGVkKCJzaG91bGQgbm90 IGhhdmUgcHJvY2Vzc2VkIDxzY3JpcHQ+LCBidXQgZGlkLiIpOworICAgICAgICBlbHNlCisgICAg ICAgICAgICB0ZXN0UGFzc2VkKCJkaWQgbm90IHByb2Nlc3MgPHNjcmlwdD4uIik7CisgICAgfQor CisgICAgd2luZG93Lm9ubG9hZCA9IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHdpbmRvdy5z ZXRUaW1lb3V0KHRlc3QsIDEwMDApOworICAgIH0KK11dPgorPC9zY3JpcHQ+Cis8bm9zY3JpcHQ+ CisgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPmRpZFByb2Nlc3NTY3JpcHRUYWcg PSB0cnVlOzwvc2NyaXB0PgorICAgIDxtZXRhIGh0dHAtZXF1aXY9InJlZnJlc2giIGNvbnRlbnQ9 IjA7IFVSTD1qYXZhc2NyaXB0OmRpZFByb2Nlc3NNZXRhVGFnID0gdHJ1ZTsiIC8+Cis8L25vc2Ny aXB0PgorPC9oZWFkPgorPGJvZHk+CisgICAgPHAgaWQ9ImRlc2NyaXB0aW9uIj48L3A+CisgICAg PGRpdiBpZD0iY29uc29sZSI+PC9kaXY+CisgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3Jp cHQiPgorICAgIDwhW0NEQVRBWworICAgICAgICBkZXNjcmlwdGlvbigiVGhpcyB0ZXN0IGNoZWNr cyB0aGF0IHRoZSAmbHQ7bm9zY3JpcHQmZ3Q7IHRhZyBpcyBub3QgcHJvY2Vzc2VkIHdoZW4gc2Ny aXB0cyBhcmUgZW5hYmxlZCBhbmQgbm8gdW5zdXBwb3J0ZWQgc2NyaXB0IGhhcyBiZWVuIGVuY291 bnRlcmVkIGFzIHBlciBzZWN0aW9uIDkuMi4xLjIgb2YgdGhlIHNwZWMuIDxhIGhyZWY9XCJodHRw Oi8vd3d3Lm9wZW5tb2JpbGVhbGxpYW5jZS5vcmcvVGVjaG5pY2FsL3JlbGVhc2VfcHJvZ3JhbS9k b2NzL0Jyb3dzaW5nL1YyXzItMjAwNjEwMjAtQS9PTUEtV0FQLVhIVE1MTVAtVjFfMS0yMDA2MTAy MC1BLnBkZlwiPlhIVE1MIE1vYmlsZSBQcm9maWxlIDEuMTwvYT4uIik7CisgICAgICAgIHZhciBz dWNjZXNzZnVsbHlQYXJzZWQgPSB0cnVlOworICAgIF1dPgorICAgIDwvc2NyaXB0PgorPC9ib2R5 PgorPC9odG1sPgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC94aHRtbG1wL3hodG1sbXAtZG9udC1w cm9jZXNzLW5vc2NyaXB0LXdoZW4tc2NyaXB0LWVuYWJsZWQtZXhwZWN0ZWQudHh0Cj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIExheW91dFRlc3RzL2Zhc3QveGh0bWxtcC94aHRtbG1wLWRvbnQtcHJvY2Vzcy1ub3Nj cmlwdC13aGVuLXNjcmlwdC1lbmFibGVkLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKKysrIExh eW91dFRlc3RzL2Zhc3QveGh0bWxtcC94aHRtbG1wLWRvbnQtcHJvY2Vzcy1ub3NjcmlwdC13aGVu LXNjcmlwdC1lbmFibGVkLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwxMCBA QAorVGhpcyB0ZXN0IGNoZWNrcyB0aGF0IHRoZSA8bm9zY3JpcHQ+IHRhZyBpcyBub3QgcHJvY2Vz c2VkIHdoZW4gc2NyaXB0cyBhcmUgZW5hYmxlZCBhbmQgbm8gdW5zdXBwb3J0ZWQgc2NyaXB0IGhh cyBiZWVuIGVuY291bnRlcmVkIGFzIHBlciBzZWN0aW9uIDkuMi4xLjIgb2YgdGhlIHNwZWMuIFhI VE1MIE1vYmlsZSBQcm9maWxlIDEuMS4KKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2Vy aWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisK K1BBU1MgZGlkIG5vdCBwcm9jZXNzIDxzY3JpcHQ+LgorUEFTUyBkaWQgbm90IHByb2Nlc3MgPG1l dGE+LgorCitURVNUIENPTVBMRVRFCisK 45415 2009-12-22 19:44:37 -0800 2009-12-28 22:41:36 -0800 another patch 32706.patch text/plain 5102 charles.wei SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MjQ4NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMDktMTItMjEgIENoYXJsZXMgV2VpICA8Y2hhcmxlcy53ZWlAdG9y Y2htb2JpbGUuY29tLmNuPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFJlbW92ZSB0aGUgbWFjcm8gRU5BQkxFKFhIVE1MTVApIGZvciBub3NjcmlwdEFy ZWF0ZUVycm9yQ2hlY2sgaW4gSFRNTFBhcnNlciwKKyAgICAgICAgc2luY2Ugd2l0aCBYSFRNTE1Q IGVuYWJsZWQsIGl0J3Mgbm90IGNoZWNraW5nIGNyZWF0ZSBFcnJvcnMsICBhbmQgdGhlbiBjb250 ZW50cyBpbnNpZGUgCisgICAgICAgIDxub3NjcmlwdD4gYXJlIGFsd2F5cyBwYXJzZWQgYW5kIHJl bmRlcmVkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MzI3MDYKKworICAgICAgICBUZXN0czogZmFzdC9wYXJzZXIvbm9zY3JpcHQtd2l0aC1qYXZhc2Ny aXB0LWRpc2FibGVkLmh0bWwKKyAgICAgICAgICAgICAgIGZhc3QvcGFyc2VyL25vc2NyaXB0LXdp dGgtamF2YXNjcmlwdC1lbmFibGVkLmh0bWwKKworICAgICAgICAqIGh0bWwvSFRNTFBhcnNlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MUGFyc2VyOjpnZXROb2RlKToKKwogMjAwOS0xMi0y MSAgS3dhbmcgWXVsIFNlbyAgPHNreXVsQGNvbXBhbnkxMDAubmV0PgogCiAgICAgICAgIFJldmll d2VkIGJ5IEVyaWMgU2VpZGVsLgpJbmRleDogV2ViQ29yZS9odG1sL0hUTUxQYXJzZXIuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvaHRtbC9IVE1MUGFyc2VyLmNwcAkocmV2aXNpb24gNTI0ODQp CisrKyBXZWJDb3JlL2h0bWwvSFRNTFBhcnNlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk0MSw5 ICs5NDEsNyBAQCBQYXNzUmVmUHRyPE5vZGU+IEhUTUxQYXJzZXI6OmdldE5vZGUoVG9rCiAgICAg ICAgIGdGdW5jdGlvbk1hcC5zZXQobm9iclRhZy5sb2NhbE5hbWUoKS5pbXBsKCksICZIVE1MUGFy c2VyOjpuZXN0ZWRDcmVhdGVFcnJvckNoZWNrKTsKICAgICAgICAgZ0Z1bmN0aW9uTWFwLnNldChu b2VtYmVkVGFnLmxvY2FsTmFtZSgpLmltcGwoKSwgJkhUTUxQYXJzZXI6Om5vZW1iZWRDcmVhdGVF cnJvckNoZWNrKTsKICAgICAgICAgZ0Z1bmN0aW9uTWFwLnNldChub2ZyYW1lc1RhZy5sb2NhbE5h bWUoKS5pbXBsKCksICZIVE1MUGFyc2VyOjpub2ZyYW1lc0NyZWF0ZUVycm9yQ2hlY2spOwotI2lm ICFFTkFCTEUoWEhUTUxNUCkKICAgICAgICAgZ0Z1bmN0aW9uTWFwLnNldChub3NjcmlwdFRhZy5s b2NhbE5hbWUoKS5pbXBsKCksICZIVE1MUGFyc2VyOjpub3NjcmlwdENyZWF0ZUVycm9yQ2hlY2sp OwotI2VuZGlmCiAgICAgICAgIGdGdW5jdGlvbk1hcC5zZXQob2xUYWcubG9jYWxOYW1lKCkuaW1w bCgpLCAmSFRNTFBhcnNlcjo6cENsb3NlckNyZWF0ZUVycm9yQ2hlY2spOwogICAgICAgICBnRnVu Y3Rpb25NYXAuc2V0KHBUYWcubG9jYWxOYW1lKCkuaW1wbCgpLCAmSFRNTFBhcnNlcjo6cENsb3Nl ckNyZWF0ZUVycm9yQ2hlY2spOwogICAgICAgICBnRnVuY3Rpb25NYXAuc2V0KHBsYWludGV4dFRh Zy5sb2NhbE5hbWUoKS5pbXBsKCksICZIVE1MUGFyc2VyOjpwQ2xvc2VyQ3JlYXRlRXJyb3JDaGVj ayk7CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA1MjQ4NCkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwko d29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDA5LTEyLTIxICBDaGFybGVzIFdlaSAg PGNoYXJsZXMud2VpQHRvcmNobW9iaWxlLmNvbS5jbj4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgdGVzdCBjYXNlcyBmb3IgPG5vc2NyaXB0PiB3 aXRoIGJvdGggSmF2YXNjcmlwdCBlbmFibGVkIGFuZCBkaXNhYmxlZAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzI3MDYKKworCisgICAgICAgICogZmFz dC9wYXJzZXIvbm9zY3JpcHQtd2l0aC1qYXZhc2NyaXB0LWRpc2FibGVkLWV4cGVjdGVkLnR4dDog QWRkZWQuCisgICAgICAgICogZmFzdC9wYXJzZXIvbm9zY3JpcHQtd2l0aC1qYXZhc2NyaXB0LWRp c2FibGVkLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3QvcGFyc2VyL25vc2NyaXB0LXdpdGgt amF2YXNjcmlwdC1lbmFibGVkLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9w YXJzZXIvbm9zY3JpcHQtd2l0aC1qYXZhc2NyaXB0LWVuYWJsZWQuaHRtbDogQWRkZWQuCisKIDIw MDktMTItMjEgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L3BhcnNlci9u b3NjcmlwdC13aXRoLWphdmFzY3JpcHQtZGlzYWJsZWQtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIExheW91dFRlc3RzL2Zhc3QvcGFyc2VyL25vc2NyaXB0LXdpdGgtamF2YXNjcmlwdC1kaXNh YmxlZC1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L3BhcnNl ci9ub3NjcmlwdC13aXRoLWphdmFzY3JpcHQtZGlzYWJsZWQtZXhwZWN0ZWQudHh0CShyZXZpc2lv biAwKQpAQCAtMCwwICsxLDIgQEAKK1RoaXMgdGVzdCBjYXNlIHZlcmlmaWVzIHRoYXQgY29udGVu dHMgaW5zaWRlIDxub3NjcmlwdD4gYXJlIHJlbmRlcmVkIHdoZW4gSmF2YXNjcmlwdCBpcyBkaXNh YmxlZC4KK1N1Y2NlZWRlZCEKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvcGFyc2VyL25vc2NyaXB0 LXdpdGgtamF2YXNjcmlwdC1kaXNhYmxlZC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3Rz L2Zhc3QvcGFyc2VyL25vc2NyaXB0LXdpdGgtamF2YXNjcmlwdC1kaXNhYmxlZC5odG1sCShyZXZp c2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9wYXJzZXIvbm9zY3JpcHQtd2l0aC1qYXZhc2Ny aXB0LWRpc2FibGVkLmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMTcgQEAKKzxodG1sPgor Cis8c2NyaXB0PgoraWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAgICBsYXlvdXRU ZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIub3Zl cnJpZGVQcmVmZXJlbmNlKCJXZWJLaXRKYXZhU2NyaXB0RW5hYmxlZCIsIGZhbHNlKTsKKzwvc2Ny aXB0PgorCis8bm9zY3JpcHQ+IAorPGJvZHk+CisgICAgVGhpcyB0ZXN0IGNhc2UgdmVyaWZpZXMg dGhhdCBjb250ZW50cyBpbnNpZGUgJmx0O25vc2NyaXB0Jmd0OyBhcmUgcmVuZGVyZWQgd2hlbiBK YXZhc2NyaXB0IGlzIGRpc2FibGVkLgorCisgICAgPHA+U3VjY2VlZGVkITwvcD4KKzwvbm9zY3Jp cHQ+CisKKzwvYm9keT4KKzwvaHRtbD4KSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvcGFyc2VyL25v c2NyaXB0LXdpdGgtamF2YXNjcmlwdC1lbmFibGVkLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBMYXlvdXRUZXN0cy9mYXN0L3BhcnNlci9ub3NjcmlwdC13aXRoLWphdmFzY3JpcHQtZW5hYmxl ZC1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L3BhcnNlci9u b3NjcmlwdC13aXRoLWphdmFzY3JpcHQtZW5hYmxlZC1leHBlY3RlZC50eHQJKHJldmlzaW9uIDAp CkBAIC0wLDAgKzEsMiBAQAorVGhpcyB0ZXN0IGNhc2UgdmVyaWZpZXMgdGhhdCBjb250ZW50cyBp bnNpZGUgPG5vc2NyaXB0PiBhcmUgaWdub3JlZCB3aGVuIEphdmFzY3JpcHQgaXMgZW5hYmxlZC4K K1N1Y2NlZWRlZCEKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvcGFyc2VyL25vc2NyaXB0LXdpdGgt amF2YXNjcmlwdC1lbmFibGVkLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9w YXJzZXIvbm9zY3JpcHQtd2l0aC1qYXZhc2NyaXB0LWVuYWJsZWQuaHRtbAkocmV2aXNpb24gMCkK KysrIExheW91dFRlc3RzL2Zhc3QvcGFyc2VyL25vc2NyaXB0LXdpdGgtamF2YXNjcmlwdC1lbmFi bGVkLmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMjQgQEAKKzxodG1sPgorPGhlYWQ+Cis8 c2NyaXB0PgoraWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAgICBsYXlvdXRUZXN0 Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIub3ZlcnJp ZGVQcmVmZXJlbmNlKCJXZWJLaXRKYXZhU2NyaXB0RW5hYmxlZCIsIHRydWUpOworPC9zY3JpcHQ+ CisKKzxub3NjcmlwdD4gCis8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCI+CisgICAgdmFy IGVsZW1lbnQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY29uc29sZSIpOworICAgIGVsZW1l bnQuaW5uZXJIVE1MPSI8cD5GYWlsZWQhPC9wPiI7Cis8L3NjcmlwdD4KKzwvbm9zY3JpcHQ+CisK KzwvaGVhZD4KKworPGJvZHk+CisgICAgVGhpcyB0ZXN0IGNhc2UgdmVyaWZpZXMgdGhhdCBjb250 ZW50cyBpbnNpZGUgJmx0O25vc2NyaXB0Jmd0OyBhcmUgaWdub3JlZCB3aGVuIEphdmFzY3JpcHQg aXMgZW5hYmxlZC4KKyAgICA8ZGl2IGlkPSJjb25zb2xlIj4KKyAgICAgICAgU3VjY2VlZGVkIQor ICAgIDwvZGl2PgorPC9ib2R5PgorPC9odG1sPgo=