5548 2005-10-29 10:15:58 -0700 UTF-16 charset incorrectly specified in an 8-bit document at www.ponyexpress.ru 2005-11-27 01:02:50 -0800 1 1 1 Unclassified WebKit DOM 420+ Mac OS X 10.4 VERIFIED FIXED http://www.ponyexpress.ru P1 Normal --- 5823 1 ap ap darin oldest_to_newest 23231 0 ap 2005-10-29 10:15:58 -0700 This site has pages that begin with: <?xml version="1.0" encoding="UTF-16"?> <html xmlns:msxsl="urn:schemas-microsoft-com:xslt"> <head> <meta content="text/html; charset=windows-1251" http-equiv="Content-Type"> The actual encoding is windows-1251. Since UTF-16 is impossible in eight-bit documents like this, it can/should be ignored. Firefox and MacIE render this site correctly. The proposed patch fixes this problem, and provides test cases for it and for rdar://3182977 ("unicode" encoding handled as UTF-16 rather than UTF-8 at www.delcom-eng.com). 23232 1 4525 ap 2005-10-29 10:16:27 -0700 Created attachment 4525 proposed patch 23233 2 ap 2005-10-29 10:18:18 -0700 (the test cases go to fast/encoding) 23356 3 4525 ap 2005-10-30 05:37:42 -0800 Comment on attachment 4525 proposed patch Um, this doesn't look right, clearing the review flag... 23381 4 4525 darin 2005-10-31 10:01:02 -0800 Comment on attachment 4525 proposed patch This doesn't look quite right to me. Testing with other browsers long ago, I found that pages marked "UTF-16" (not XML pages, but HTML ones) in <meta> tags were treated as UTF-8 by other browsers. Not default encoding (Windows Latin-1 for the "default default"), but specifically UTF-8. This patch changes that behavior to make some XML cases work better; I think that's incorrect. 23387 5 ap 2005-10-31 11:24:50 -0800 Perhaps, Decoder should know if it's decoding HTML or XML (in Firefox, encoding from <meta> tags doesn't seem to be used for XML)... I'll try to figure out the correct behavior. 23628 6 4584 ap 2005-11-03 11:03:42 -0800 Created attachment 4584 allow meta to override encoding from XML declaration WinIE (but not Firefox) indeed treats HTML pages marked UTF-16 in <meta> tags as UTF-8, thank you for noticing! This new patch includes a regression test for this, too. Allowing <meta> to override XML encoding seems to match what Firefox does for HTML. For XHTML, Firefox ignores <meta>, but Safari doesn't - the patch doesn't change this (although also allows such overriding). 23635 7 4584 darin 2005-11-03 12:27:45 -0800 Comment on attachment 4584 allow meta to override encoding from XML declaration I don't understand the logic here. You say that Gecko ignores <meta> elements entirely for "real XHTML". And you say that this patch leaves WebKit respecting <meta> elements for "real XHTML" and goes further, allowing such <meta> tags to override the character set specified in the XML declaration. This sounds like the wrong direction to go if we're looking for compatibility with Gecko. Can you clarify why this is a desirable change? 23636 8 4584 darin 2005-11-03 12:30:07 -0800 Comment on attachment 4584 allow meta to override encoding from XML declaration I think I see what's going on. This site isn't "real XHTML". It's "XHTML being served with a plain HTML MIME type". I guess in that case we want to match what the other major browsers do. Do they look at the character set in the XML header at all in cases like this? 23637 9 ap 2005-11-03 12:59:09 -0800 (In reply to comment #8) > Do they look at the character set in the XML header at all in cases like this? Yes, Firefox and Opera do look at it - a test is at <http://nypop.com/~ap/webkit/xhtml.html>. MacIE doesn't; cannot say about WinIE (browsershots.org doesn't work with it at the moment). Although it's unfortunate that this patch slightly changes the "real XHTML" behavior, making it less similar to Firefox, I think that this can only be handled by making Decoder know about what kind of source it parses, which looks like a separate undertaking. 23640 10 4584 darin 2005-11-03 13:06:49 -0800 Comment on attachment 4584 allow meta to override encoding from XML declaration OK, I'm convinced now. r=me 23644 11 ap 2005-11-03 13:36:31 -0800 Filed the <meta> in "real XHTML" issue as bug 5620. 24530 12 ap 2005-11-24 21:43:29 -0800 Bumping priority to P1, because the patch also fixes a regression in bug 5823. 24596 13 eric 2005-11-26 17:12:50 -0800 ap: landing would be even easier if you provided the test case in patch form... ChangeLog entry as a bonus. :) 24597 14 eric 2005-11-26 18:03:25 -0800 nm, I now see that's included in your patch! Thanks, landing now. 4525 2005-10-29 10:16:27 -0700 2005-11-03 11:03:42 -0800 proposed patch InvalidXMLEncodingPatch.txt text/plain 4226 ap SW5kZXg6IGNoYXJzZXQtdW5pY29kZS1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpkaWZmIC1OcHUg Y2hhcnNldC11bmljb2RlLWV4cGVjdGVkLnR4dAotLS0gY2hhcnNldC11bmljb2RlLWV4cGVjdGVk LnR4dAkxIEphbiAxOTcwIDAwOjAwOjAwIC0wMDAwCisrKyBjaGFyc2V0LXVuaWNvZGUtZXhwZWN0 ZWQudHh0CTI5IE9jdCAyMDA1IDE3OjA2OjIyIC0wMDAwCkBAIC0wLDAgKzEgQEAKK0FjY2VudGVk IGU6IOKAnMOp4oCdLgpJbmRleDogY2hhcnNldC11bmljb2RlLmh0bWwKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpkaWZm IC1OcHUgY2hhcnNldC11bmljb2RlLmh0bWwKLS0tIGNoYXJzZXQtdW5pY29kZS5odG1sCTEgSmFu IDE5NzAgMDA6MDA6MDAgLTAwMDAKKysrIGNoYXJzZXQtdW5pY29kZS5odG1sCTI5IE9jdCAyMDA1 IDE3OjA1OjI2IC0wMDAwCkBAIC0wLDAgKzEsOSBAQAorPCFET0NUWVBFIEhUTUwgUFVCTElDICIt Ly9XM0MvL0RURCBIVE1MIDQuMCBUcmFuc2l0aW9uYWwvL0VOIj48aHRtbD4KKzxoZWFkPgorPG1l dGEgY29udGVudD0idGV4dC9odG1sOyBjaGFyc2V0PXVuaWNvZGUiIGh0dHAtZXF1aXY9IkNvbnRl bnQtVHlwZSI+Cis8L2hlYWQ+Cis8Ym9keT4KK0FjY2VudGVkIGU6IOKAnMOp4oCdLgorPHNjcmlw dD5pZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKSBsYXlvdXRUZXN0Q29udHJvbGxlci5k dW1wQXNUZXh0KCk7PC9zY3JpcHQ+Cis8L2JvZHk+Cis8aHRtbD4KSW5kZXg6IGludmFsaWQteG1s LWVuY29kaW5nLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CmRpZmYgLU5wdSBpbnZhbGlkLXhtbC1l bmNvZGluZy1leHBlY3RlZC50eHQKLS0tIGludmFsaWQteG1sLWVuY29kaW5nLWV4cGVjdGVkLnR4 dAkxIEphbiAxOTcwIDAwOjAwOjAwIC0wMDAwCisrKyBpbnZhbGlkLXhtbC1lbmNvZGluZy1leHBl Y3RlZC50eHQJMjkgT2N0IDIwMDUgMTc6MDY6MjIgLTAwMDAKQEAgLTAsMCArMSBAQAorVGhpcyBz aG91bGQgbG9vayBsaWtlIGEgUm9tYW4g4oCYQuKAmTog4oCY0JLigJkuCkluZGV4OiBpbnZhbGlk LXhtbC1lbmNvZGluZy5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KZGlmZiAtTnB1IGludmFsaWQteG1sLWVuY29k aW5nLmh0bWwKLS0tIGludmFsaWQteG1sLWVuY29kaW5nLmh0bWwJMSBKYW4gMTk3MCAwMDowMDow MCAtMDAwMAorKysgaW52YWxpZC14bWwtZW5jb2RpbmcuaHRtbAkyOSBPY3QgMjAwNSAxNzowNTo1 OCAtMDAwMApAQCAtMCwwICsxLDExIEBACis8P3htbCB2ZXJzaW9uPSIxLjAiIGVuY29kaW5nPSJV VEYtMTYiPz4KKzxodG1sPgorPGhlYWQ+Cis8bWV0YSBjb250ZW50PSJ0ZXh0L2h0bWw7IGNoYXJz ZXQ9d2luZG93cy0xMjUxIiBodHRwLWVxdWl2PSJDb250ZW50LVR5cGUiPgorPC9tZXRhPgorPC9o ZWFkPgorPGJvZHk+CitUaGlzIHNob3VsZCBsb29rIGxpa2UgYSBSb21hbiCRQpI6IJHCki4KKzxz Y3JpcHQ+aWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikgbGF5b3V0VGVzdENvbnRyb2xs ZXIuZHVtcEFzVGV4dCgpOzwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpJbmRleDogV2ViQ29y ZS9raHRtbC9taXNjL2RlY29kZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnMvcm9vdC9X ZWJDb3JlL2todG1sL21pc2MvZGVjb2Rlci5jcHAsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuNDUK ZGlmZiAtcCAtdSAtcjEuNDUgV2ViQ29yZS9raHRtbC9taXNjL2RlY29kZXIuY3BwCi0tLSBXZWJD b3JlL2todG1sL21pc2MvZGVjb2Rlci5jcHAJMyBPY3QgMjAwNSAyMToxMjozNSAtMDAwMAkxLjQ1 CisrKyBXZWJDb3JlL2todG1sL21pc2MvZGVjb2Rlci5jcHAJMjkgT2N0IDIwMDUgMTc6MTU6MTIg LTAwMDAKQEAgLTUyNiw3ICs1MjYsNyBAQCBRU3RyaW5nIERlY29kZXI6OmRlY29kZShjb25zdCBj aGFyICpkYXRhCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdvdG8gZm91bmQ7CiAg ICAgICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAgICAgICBzZXRFbmNv ZGluZygiVVRGLTgiLCBFbmNvZGluZ0Zyb21YTUxIZWFkZXIpOwotICAgICAgICAgICAgICAgICAg ICAgICAgZ290byBmb3VuZDsKKyAgICAgICAgICAgICAgICAgICAgICAgIC8vIGNvbnRpbnVlIGxv b2tpbmcgZm9yIGEgY2hhcnNldCAtIGl0IG1heSBiZSBzcGVjaWZpZWQgaW4gYW4gSFRUUC1FcXVp diBtZXRhCiAgICAgICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAocHRyWzBdID09IDAgJiYgcHRy WzFdID09ICc/JyAmJiBwdHJbMl0gPT0gMCAmJiBwdHJbM10gPT0gJ3gnICYmIHB0cls0XSA9PSAw ICYmIHB0cls1XSA9PSAnbScgJiYgcHRyWzZdID09IDAgJiYgcHRyWzddID09ICdsJykgewogICAg ICAgICAgICAgICAgICAgICAgICAgLy8gVVRGLTE2IHdpdGhvdXQgQk9NCiAjaWYgQVBQTEVfQ0hB TkdFUwpAQCAtNjAyLDcgKzYwMiw3IEBAIFFTdHJpbmcgRGVjb2Rlcjo6ZGVjb2RlKGNvbnN0IGNo YXIgKmRhdGEKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAodGFnICE9IGhlYWRUYWcp ICYmIGlzYWxwaGEodG1wWzBdKSkgewogICAgICAgICAgICAgICAgICAgICAgICAgYm9keSA9IHRy dWU7CiAjaWZkZWYgREVDT0RFX0RFQlVHCi0gICAgICAgICAgICAgICAgICAgICAgICBrZERlYnVn KCA2MDA1ICkgPDwgIkRlY29kZXI6IG5vIGNoYXJzZXQgZm91bmQgKGJhaWxpbmcgYmVjYXVzZSBv ZiBcIiIgPDwgdGFnLmFzY2lpKCkgPDwgIlwiKS4iIDw8IGVuZGw7CisgICAgICAgICAgICAgICAg ICAgICAgICBrZERlYnVnKCA2MDA1ICkgPDwgIkRlY29kZXI6IG5vIGNoYXJzZXQgZm91bmQgKGJh aWxpbmcgYmVjYXVzZSBvZiBcIiIgPDwgdGFnLnFzdHJpbmcoKS5hc2NpaSgpIDw8ICJcIikuIiA8 PCBlbmRsOwogI2VuZGlmCiAgICAgICAgICAgICAgICAgICAgICAgICBnb3RvIGZvdW5kOwogICAg ICAgICAgICAgICAgICAgICB9CkluZGV4OiBXZWJDb3JlL2t3cS9LV1FUZXh0Q29kZWMubW0KPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQpSQ1MgZmlsZTogL2N2cy9yb290L1dlYkNvcmUva3dxL0tXUVRleHRDb2RlYy5tbSx2 CnJldHJpZXZpbmcgcmV2aXNpb24gMS41NwpkaWZmIC1wIC11IC1yMS41NyBXZWJDb3JlL2t3cS9L V1FUZXh0Q29kZWMubW0KLS0tIFdlYkNvcmUva3dxL0tXUVRleHRDb2RlYy5tbQk5IE9jdCAyMDA1 IDAzOjMxOjEwIC0wMDAwCTEuNTcKKysrIFdlYkNvcmUva3dxL0tXUVRleHRDb2RlYy5tbQkyOSBP Y3QgMjAwNSAxNzoxNToyMiAtMDAwMApAQCAtMTExLDEwICsxMTEsMTMgQEAgUVRleHRDb2RlYyAq UVRleHRDb2RlYzo6Y29kZWNGb3JOYW1lRWlnaAogewogICAgIEtXUUVuY29kaW5nRmxhZ3MgZmxh Z3M7CiAgICAgQ0ZTdHJpbmdFbmNvZGluZyBlbmNvZGluZyA9IEtXUUNGU3RyaW5nRW5jb2RpbmdG cm9tSUFOQUNoYXJzZXROYW1lKG5hbWUsICZmbGFncyk7Ci0gICAgc3dpdGNoIChlbmNvZGluZykg ewotICAgICAgICBjYXNlIGtDRlN0cmluZ0VuY29kaW5nVW5pY29kZToKKyAgICBpZiAoZW5jb2Rp bmcgPT0ga0NGU3RyaW5nRW5jb2RpbmdVbmljb2RlKSB7CisgICAgICAgIGlmICgwID09IHN0cmNt cChuYW1lLCAidW5pY29kZSIpKSB7ICAvLyAidW5pY29kZSIgd2FzIHNwZWNpZmllZCwgaW1wbHlp bmcgInV0Zi04IgogICAgICAgICAgICAgZW5jb2RpbmcgPSBrQ0ZTdHJpbmdFbmNvZGluZ1VURjg7 Ci0gICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIGZsYWdzID0gTm9FbmNvZGluZ0ZsYWdz OworICAgICAgICB9IGVsc2UgeyAvLyB1dGYtMTYgd2FzIHNwZWNpZmllZCwgaW1wbHlpbmcgdGhh dCBpdCdzIGp1c3QgYWNjaWRlbnRhbAorICAgICAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIH0K ICAgICB9CiAgICAgcmV0dXJuIGNvZGVjRm9yQ0ZTdHJpbmdFbmNvZGluZyhlbmNvZGluZywgZmxh Z3MpOwogfQo= 4584 2005-11-03 11:03:42 -0800 2005-11-03 13:06:49 -0800 allow meta to override encoding from XML declaration XMLEncodingPatch2.txt text/plain 4574 ap SW5kZXg6IGNoYXJzZXQtdW5pY29kZS1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpkaWZmIC1OcHUg Y2hhcnNldC11bmljb2RlLWV4cGVjdGVkLnR4dAotLS0gY2hhcnNldC11bmljb2RlLWV4cGVjdGVk LnR4dAkxIEphbiAxOTcwIDAwOjAwOjAwIC0wMDAwCisrKyBjaGFyc2V0LXVuaWNvZGUtZXhwZWN0 ZWQudHh0CTI5IE9jdCAyMDA1IDE3OjA2OjIyIC0wMDAwCkBAIC0wLDAgKzEgQEAKK0FjY2VudGVk IGU6IOKAnMOp4oCdLgpJbmRleDogY2hhcnNldC11bmljb2RlLmh0bWwKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpkaWZm IC1OcHUgY2hhcnNldC11bmljb2RlLmh0bWwKLS0tIGNoYXJzZXQtdW5pY29kZS5odG1sCTEgSmFu IDE5NzAgMDA6MDA6MDAgLTAwMDAKKysrIGNoYXJzZXQtdW5pY29kZS5odG1sCTI5IE9jdCAyMDA1 IDE3OjA1OjI2IC0wMDAwCkBAIC0wLDAgKzEsOSBAQAorPCFET0NUWVBFIEhUTUwgUFVCTElDICIt Ly9XM0MvL0RURCBIVE1MIDQuMCBUcmFuc2l0aW9uYWwvL0VOIj48aHRtbD4KKzxoZWFkPgorPG1l dGEgY29udGVudD0idGV4dC9odG1sOyBjaGFyc2V0PXVuaWNvZGUiIGh0dHAtZXF1aXY9IkNvbnRl bnQtVHlwZSI+Cis8L2hlYWQ+Cis8Ym9keT4KK0FjY2VudGVkIGU6IOKAnMOp4oCdLgorPHNjcmlw dD5pZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKSBsYXlvdXRUZXN0Q29udHJvbGxlci5k dW1wQXNUZXh0KCk7PC9zY3JpcHQ+Cis8L2JvZHk+Cis8aHRtbD4KSW5kZXg6IGNoYXJzZXQtdXRm MTYtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KZGlmZiAtTnB1IGNoYXJzZXQtdXRmMTYtZXhwZWN0 ZWQudHh0Ci0tLSBjaGFyc2V0LXV0ZjE2LWV4cGVjdGVkLnR4dAkxIEphbiAxOTcwIDAwOjAwOjAw IC0wMDAwCisrKyBjaGFyc2V0LXV0ZjE2LWV4cGVjdGVkLnR4dAkzIE5vdiAyMDA1IDE4OjI2OjU4 IC0wMDAwCkBAIC0wLDAgKzEgQEAKK1RoaXMgc2hvdWxkIGxvb2sgbGlrZSBhIFJvbWFuIOKAmELi gJk6IOKAmNCS4oCZLgpJbmRleDogY2hhcnNldC11dGYxNi5odG1sCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KZGlmZiAt TnB1IGNoYXJzZXQtdXRmMTYuaHRtbAotLS0gY2hhcnNldC11dGYxNi5odG1sCTEgSmFuIDE5NzAg MDA6MDA6MDAgLTAwMDAKKysrIGNoYXJzZXQtdXRmMTYuaHRtbAkzIE5vdiAyMDA1IDE4OjE3OjM5 IC0wMDAwCkBAIC0wLDAgKzEsMTEgQEAKKzxodG1sPgorPGhlYWQ+Cis8bWV0YSBjb250ZW50PSJ0 ZXh0L2h0bWw7IGNoYXJzZXQ9dXRmLTE2IiBodHRwLWVxdWl2PSJDb250ZW50LVR5cGUiPgorPC9t ZXRhPgorPC9oZWFkPgorPGJvZHk+CitUaGlzIHNob3VsZCBsb29rIGxpa2UgYSBSb21hbiDigJhC 4oCZOiDigJjQkuKAmS4KKzxzY3JpcHQ+aWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikg bGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOzwvc2NyaXB0PgorPC9ib2R5PgorPC9o dG1sPgorPCEtLSBNU0lFIHRyZWF0cyB1dGYtMTYgaW4gbWV0YSBhcyB1dGYtOCAtLT4KSW5kZXg6 IHhtbC1jaGFyc2V0LXV0ZjE2LWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CmRpZmYgLU5wdSB4bWwt Y2hhcnNldC11dGYxNi1leHBlY3RlZC50eHQKLS0tIHhtbC1jaGFyc2V0LXV0ZjE2LWV4cGVjdGVk LnR4dAkxIEphbiAxOTcwIDAwOjAwOjAwIC0wMDAwCisrKyB4bWwtY2hhcnNldC11dGYxNi1leHBl Y3RlZC50eHQJMjkgT2N0IDIwMDUgMTc6MDY6MjIgLTAwMDAKQEAgLTAsMCArMSBAQAorVGhpcyBz aG91bGQgbG9vayBsaWtlIGEgUm9tYW4g4oCYQuKAmTog4oCY0JLigJkuCkluZGV4OiB4bWwtY2hh cnNldC11dGYxNi5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KZGlmZiAtTnB1IHhtbC1jaGFyc2V0LXV0ZjE2Lmh0 bWwKLS0tIHhtbC1jaGFyc2V0LXV0ZjE2Lmh0bWwJMSBKYW4gMTk3MCAwMDowMDowMCAtMDAwMAor KysgeG1sLWNoYXJzZXQtdXRmMTYuaHRtbAkyOSBPY3QgMjAwNSAxNzowNTo1OCAtMDAwMApAQCAt MCwwICsxLDExIEBACis8P3htbCB2ZXJzaW9uPSIxLjAiIGVuY29kaW5nPSJVVEYtMTYiPz4KKzxo dG1sPgorPGhlYWQ+Cis8bWV0YSBjb250ZW50PSJ0ZXh0L2h0bWw7IGNoYXJzZXQ9d2luZG93cy0x MjUxIiBodHRwLWVxdWl2PSJDb250ZW50LVR5cGUiPgorPC9tZXRhPgorPC9oZWFkPgorPGJvZHk+ CitUaGlzIHNob3VsZCBsb29rIGxpa2UgYSBSb21hbiCRQpI6IJHCki4KKzxzY3JpcHQ+aWYgKHdp bmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4 dCgpOzwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpJbmRleDogV2ViQ29yZS9raHRtbC9taXNj L2RlY29kZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnMvcm9vdC9XZWJDb3JlL2todG1s L21pc2MvZGVjb2Rlci5jcHAsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuNDUKZGlmZiAtcCAtdSAt cjEuNDUgV2ViQ29yZS9raHRtbC9taXNjL2RlY29kZXIuY3BwCi0tLSBXZWJDb3JlL2todG1sL21p c2MvZGVjb2Rlci5jcHAJMyBPY3QgMjAwNSAyMToxMjozNSAtMDAwMAkxLjQ1CisrKyBXZWJDb3Jl L2todG1sL21pc2MvZGVjb2Rlci5jcHAJMyBOb3YgMjAwNSAxODozMzo0MiAtMDAwMApAQCAtNTIw LDEzICs1MjAsMTEgQEAgUVN0cmluZyBEZWNvZGVyOjpkZWNvZGUoY29uc3QgY2hhciAqZGF0YQog ICAgICAgICAgICAgICAgICAgICAgICAgUUNTdHJpbmcgc3RyKHB0ciwgZW5kIC0gcHRyKTsKICAg ICAgICAgICAgICAgICAgICAgICAgIGludCBsZW47CiAgICAgICAgICAgICAgICAgICAgICAgICBp bnQgcG9zID0gZmluZFhNTEVuY29kaW5nKHN0ciwgbGVuKTsKLSAgICAgICAgICAgICAgICAgICAg ICAgIGlmIChwb3MgIT0gLTEpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGlmIChwb3MgIT0g LTEpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2V0RW5jb2Rpbmcoc3RyLm1pZChwb3Ms IGxlbiksIEVuY29kaW5nRnJvbVhNTEhlYWRlcik7Ci0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgaWYgKG1fdHlwZSA9PSBFbmNvZGluZ0Zyb21YTUxIZWFkZXIpCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGdvdG8gZm91bmQ7Ci0gICAgICAgICAgICAgICAgICAgICAgICB9Ci0g ICAgICAgICAgICAgICAgICAgICAgICBzZXRFbmNvZGluZygiVVRGLTgiLCBFbmNvZGluZ0Zyb21Y TUxIZWFkZXIpOwotICAgICAgICAgICAgICAgICAgICAgICAgZ290byBmb3VuZDsKKyAgICAgICAg ICAgICAgICAgICAgICAgIGlmIChtX3R5cGUgIT0gRW5jb2RpbmdGcm9tWE1MSGVhZGVyKQorICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHNldEVuY29kaW5nKCJVVEYtOCIsIEVuY29kaW5nRnJv bVhNTEhlYWRlcik7CisgICAgICAgICAgICAgICAgICAgICAgICAvLyBjb250aW51ZSBsb29raW5n IGZvciBhIGNoYXJzZXQgLSBpdCBtYXkgYmUgc3BlY2lmaWVkIGluIGFuIEhUVFAtRXF1aXYgbWV0 YQogICAgICAgICAgICAgICAgICAgICB9IGVsc2UgaWYgKHB0clswXSA9PSAwICYmIHB0clsxXSA9 PSAnPycgJiYgcHRyWzJdID09IDAgJiYgcHRyWzNdID09ICd4JyAmJiBwdHJbNF0gPT0gMCAmJiBw dHJbNV0gPT0gJ20nICYmIHB0cls2XSA9PSAwICYmIHB0cls3XSA9PSAnbCcpIHsKICAgICAgICAg ICAgICAgICAgICAgICAgIC8vIFVURi0xNiB3aXRob3V0IEJPTQogI2lmIEFQUExFX0NIQU5HRVMK QEAgLTYwMiw3ICs2MDAsNyBAQCBRU3RyaW5nIERlY29kZXI6OmRlY29kZShjb25zdCBjaGFyICpk YXRhCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHRhZyAhPSBoZWFkVGFnKSAmJiBp c2FscGhhKHRtcFswXSkpIHsKICAgICAgICAgICAgICAgICAgICAgICAgIGJvZHkgPSB0cnVlOwog I2lmZGVmIERFQ09ERV9ERUJVRwotICAgICAgICAgICAgICAgICAgICAgICAga2REZWJ1ZyggNjAw NSApIDw8ICJEZWNvZGVyOiBubyBjaGFyc2V0IGZvdW5kIChiYWlsaW5nIGJlY2F1c2Ugb2YgXCIi IDw8IHRhZy5hc2NpaSgpIDw8ICJcIikuIiA8PCBlbmRsOworICAgICAgICAgICAgICAgICAgICAg ICAga2REZWJ1ZyggNjAwNSApIDw8ICJEZWNvZGVyOiBubyBjaGFyc2V0IGZvdW5kIChiYWlsaW5n IGJlY2F1c2Ugb2YgXCIiIDw8IHRhZy5xc3RyaW5nKCkuYXNjaWkoKSA8PCAiXCIpLiIgPDwgZW5k bDsKICNlbmRpZgogICAgICAgICAgICAgICAgICAgICAgICAgZ290byBmb3VuZDsKICAgICAgICAg ICAgICAgICAgICAgfQo=