41264 2010-06-27 12:21:53 -0700 Implement remaining StartTag processing for InHeadNoscriptMode 2010-06-27 15:45:33 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 41123 1 abarth abarth commit-queue eric oldest_to_newest 243486 0 abarth 2010-06-27 12:21:53 -0700 Implement remaining StartTag processing for InHeadNoscriptMode 243487 1 59860 abarth 2010-06-27 12:25:03 -0700 Created attachment 59860 Patch 243488 2 eric 2010-06-27 12:28:26 -0700 Attachment 59860 did not build on mac: Build output: http://webkit-commit-queue.appspot.com/results/3337818 243493 3 59860 abarth 2010-06-27 12:43:26 -0700 Comment on attachment 59860 Patch I see. I probably need ASSERT_UNUSED to make this patch compile on mac. 243508 4 59860 eric 2010-06-27 14:54:03 -0700 Comment on attachment 59860 Patch OK. 243510 5 59863 abarth 2010-06-27 15:01:09 -0700 Created attachment 59863 Patch for landing 243517 6 59863 commit-queue 2010-06-27 15:45:29 -0700 Comment on attachment 59863 Patch for landing Clearing flags on attachment: 59863 Committed r61973: <http://trac.webkit.org/changeset/61973> 243518 7 commit-queue 2010-06-27 15:45:33 -0700 All reviewed patches have been landed. Closing bug. 59860 2010-06-27 12:25:03 -0700 2010-06-27 15:00:59 -0700 Patch bug-41264-20100627122502.patch text/plain 6583 abarth ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NDBmMjk0ZjFiMmQ5MDY4YmQzYWU1MjAwMTE4NmUwMmE4MDMxNzJiYS4uMTE4ZWFiZjI4M2NlMzg5 ZGFiMjhkZTc1MzliMTMxOGIxYmIwMWZkZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTIsNiArMiwyNiBAQAogCiAgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgogCisgICAgICAgIEltcGxlbWVudCByZW1haW5pbmcgU3Rh cnRUYWcgcHJvY2Vzc2luZyBmb3IgSW5IZWFkTm9zY3JpcHRNb2RlCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MTI2NAorCisgICAgICAgIFRoZSBJbkhl YWROb3NjcmlwdE1vZGUgcHJvY2Vzc2VzIHNvbWUgc3RhcnQgdGFncyAiYXMgaWYiIHRoZSB0cmVl CisgICAgICAgIGJ1aWxkZXIgd2VyZSBpbiB0aGUgSW5IZWFkTW9kZS4gIFRoaXMgaXMgYW4gaWRp b20gd2UnbGwgc2VlIG1vcmUgb2YKKyAgICAgICAgbGF0ZXIuICBNeSBhcHByb2FjaCBpcyB0aGlz IHBhdGNoIGlzIHRvIGZhY3RvciBhbGwgdGhlIGxvZ2ljIGZvcgorICAgICAgICBwcm9jZXNzaW5n IHN0YXJ0IHRhZ3MgaW4gdGhlIEluSGVhZE1vZGUgaW50byBhIHNlcGFyYXRlIGZ1bmN0aW9uIHRo YXQKKyAgICAgICAgY2FuIGJlIGNhbGxlZCBmcm9tIGJvdGggbG9jYXRpb25zLiAgVGhpcyBzZWVt cyBjbGVhbmVyIHRoYW4ganVzdAorICAgICAgICBzcGxpdHRpbmcgb3V0IHRoZSBwYXJ0cyB0aGF0 IGFyZSBhY3R1YWxseSB1c2VkIGJ5IGJvdGggbW9kZXMuCisKKyAgICAgICAgKiBodG1sL0hUTUxU cmVlQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6OnByb2Nl c3NTdGFydFRhZyk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NT dGFydFRhZ0ZvckluSGVhZCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6Omlu c2VydFNlbGZDbG9zaW5nRWxlbWVudCk6CisgICAgICAgICogaHRtbC9IVE1MVHJlZUJ1aWxkZXIu aDoKKworMjAxMC0wNi0yNyAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCiAgICAgICAgIEFkZCBzdXBwb3J0IGZv ciA8dGl0bGU+IGFuZCA8c3R5bGU+IGVsZW1lbnRzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MTI2MwogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwv SFRNTFRyZWVCdWlsZGVyLmNwcCBiL1dlYkNvcmUvaHRtbC9IVE1MVHJlZUJ1aWxkZXIuY3BwCmlu ZGV4IGNiZmZlNDFlZGJkMjI4NTRiOTBjNmZkYjY3Y2VlNTU1ZGNmYjU3MmIuLmViODI5MGYyMzhm NDg5YjY0MmY1NDE5OGRiYzI3YjVlNDgzMTk5ZmIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9I VE1MVHJlZUJ1aWxkZXIuY3BwCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MVHJlZUJ1aWxkZXIuY3Bw CkBAIC0zMTcsNDggKzMxNyw4IEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzU3RhcnRU YWcoQXRvbWljSFRNTFRva2VuJiB0b2tlbikKICAgICAgICAgLy8gRmFsbCB0aHJvdWdoLgogICAg IGNhc2UgSW5IZWFkTW9kZToKICAgICAgICAgQVNTRVJUKGluc2VydGlvbk1vZGUoKSA9PSBJbkhl YWRNb2RlKTsKLSAgICAgICAgaWYgKHRva2VuLm5hbWUoKSA9PSBodG1sVGFnKSB7Ci0gICAgICAg ICAgICBpbnNlcnRIVE1MU3RhcnRUYWdJbkJvZHkodG9rZW4pOwotICAgICAgICAgICAgcmV0dXJu OwotICAgICAgICB9Ci0gICAgICAgIC8vIEZJWE1FOiBBdG9taXplICJjb21tYW5kIi4KLSAgICAg ICAgaWYgKHRva2VuLm5hbWUoKSA9PSBiYXNlVGFnIHx8IHRva2VuLm5hbWUoKSA9PSAiY29tbWFu ZCIgfHwgdG9rZW4ubmFtZSgpID09IGxpbmtUYWcpIHsKLSAgICAgICAgICAgIGluc2VydEVsZW1l bnQodG9rZW4pOwotICAgICAgICAgICAgbV9vcGVuRWxlbWVudHMucG9wKCk7Ci0gICAgICAgICAg ICBub3RJbXBsZW1lbnRlZCgpOwotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0gICAg ICAgIGlmICh0b2tlbi5uYW1lKCkgPT0gbWV0YVRhZykgewotICAgICAgICAgICAgaW5zZXJ0RWxl bWVudCh0b2tlbik7Ci0gICAgICAgICAgICBtX29wZW5FbGVtZW50cy5wb3AoKTsKLSAgICAgICAg ICAgIG5vdEltcGxlbWVudGVkKCk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLSAg ICAgICAgaWYgKHRva2VuLm5hbWUoKSA9PSB0aXRsZVRhZykgewotICAgICAgICAgICAgaW5zZXJ0 R2VuZXJpY1JDREFUQUVsZW1lbnQodG9rZW4pOwotICAgICAgICAgICAgcmV0dXJuOwotICAgICAg ICB9Ci0gICAgICAgIGlmICh0b2tlbi5uYW1lKCkgPT0gbm9zY3JpcHRUYWcpIHsKLSAgICAgICAg ICAgIGlmIChpc1NjcmlwdGluZ0ZsYWdFbmFibGVkKG1fZG9jdW1lbnQtPmZyYW1lKCkpKSB7Ci0g ICAgICAgICAgICAgICAgaW5zZXJ0R2VuZXJpY1Jhd1RleHRFbGVtZW50KHRva2VuKTsKLSAgICAg ICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBpbnNlcnRFbGVt ZW50KHRva2VuKTsKLSAgICAgICAgICAgIHNldEluc2VydGlvbk1vZGUoSW5IZWFkTm9zY3JpcHRN b2RlKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotICAgICAgICBpZiAodG9rZW4u bmFtZSgpID09IG5vZnJhbWVzVGFnIHx8IHRva2VuLm5hbWUoKSA9PSBzdHlsZVRhZykgewotICAg ICAgICAgICAgaW5zZXJ0R2VuZXJpY1Jhd1RleHRFbGVtZW50KHRva2VuKTsKLSAgICAgICAgICAg IHJldHVybjsKLSAgICAgICAgfQotICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09IHNjcmlwdFRh ZykgewotICAgICAgICAgICAgaW5zZXJ0U2NyaXB0RWxlbWVudCh0b2tlbik7CisgICAgICAgIGlm IChwcm9jZXNzU3RhcnRUYWdGb3JJbkhlYWQodG9rZW4pKQogICAgICAgICAgICAgcmV0dXJuOwot ICAgICAgICB9Ci0gICAgICAgIGlmICh0b2tlbi5uYW1lKCkgPT0gaGVhZFRhZykgewotICAgICAg ICAgICAgbm90SW1wbGVtZW50ZWQoKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQog ICAgICAgICBwcm9jZXNzRGVmYXVsdEZvckluSGVhZE1vZGUodG9rZW4pOwogICAgICAgICAvLyBG YWxsIHRocm91Z2guCiAgICAgY2FzZSBBZnRlckhlYWRNb2RlOgpAQCAtNDAyLDcgKzM2Miw4IEBA IHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzU3RhcnRUYWcoQXRvbWljSFRNTFRva2VuJiB0 b2tlbikKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogICAgICAgICBpZiAodG9rZW4u bmFtZSgpID09IGxpbmtUYWcgfHwgdG9rZW4ubmFtZSgpID09IG1ldGFUYWcgfHwgdG9rZW4ubmFt ZSgpID09IG5vZnJhbWVzVGFnIHx8IHRva2VuLm5hbWUoKSA9PSBzdHlsZVRhZykgewotICAgICAg ICAgICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICAgICAgICAgIGJvb2wgZGlkUHJvY2VzcyA9IHBy b2Nlc3NTdGFydFRhZ0ZvckluSGVhZCh0b2tlbik7CisgICAgICAgICAgICBBU1NFUlQoZGlkUHJv Y2Vzcyk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICAgICAgaWYgKHRva2Vu Lm5hbWUoKSA9PSBodG1sVGFnIHx8IHRva2VuLm5hbWUoKSA9PSBub3NjcmlwdFRhZykgewpAQCAt NTkzLDYgKzU1NCw0NiBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc0RlZmF1bHRGb3JB ZnRlckhlYWRNb2RlKEF0b21pY0hUTUxUb2tlbiYpCiAgICAgbV9mcmFtZXNldE9rID0gdHJ1ZTsK IH0KIAorYm9vbCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NTdGFydFRhZ0ZvckluSGVhZChBdG9t aWNIVE1MVG9rZW4mIHRva2VuKQoreworICAgIGlmICh0b2tlbi5uYW1lKCkgPT0gaHRtbFRhZykg eworICAgICAgICBpbnNlcnRIVE1MU3RhcnRUYWdJbkJvZHkodG9rZW4pOworICAgICAgICByZXR1 cm4gdHJ1ZTsKKyAgICB9CisgICAgLy8gRklYTUU6IEF0b21pemUgImNvbW1hbmQiLgorICAgIGlm ICh0b2tlbi5uYW1lKCkgPT0gYmFzZVRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gImNvbW1hbmQiIHx8 IHRva2VuLm5hbWUoKSA9PSBsaW5rVGFnIHx8IHRva2VuLm5hbWUoKSA9PSBtZXRhVGFnKSB7Cisg ICAgICAgIGluc2VydFNlbGZDbG9zaW5nRWxlbWVudCh0b2tlbik7CisgICAgICAgIC8vIE5vdGU6 IFRoZSBjdXN0b20gcHJvY2Vzc2luZyBmb3IgdGhlIDxtZXRhPiB0YWcgaXMgZG9uZSBpbiBIVE1M TWV0YUVsZW1lbnQ6OnByb2Nlc3MoKS4KKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorICAg IGlmICh0b2tlbi5uYW1lKCkgPT0gdGl0bGVUYWcpIHsKKyAgICAgICAgaW5zZXJ0R2VuZXJpY1JD REFUQUVsZW1lbnQodG9rZW4pOworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisgICAgaWYg KHRva2VuLm5hbWUoKSA9PSBub3NjcmlwdFRhZykgeworICAgICAgICBpZiAoaXNTY3JpcHRpbmdG bGFnRW5hYmxlZChtX2RvY3VtZW50LT5mcmFtZSgpKSkgeworICAgICAgICAgICAgaW5zZXJ0R2Vu ZXJpY1Jhd1RleHRFbGVtZW50KHRva2VuKTsKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAg ICAgICB9CisgICAgICAgIGluc2VydEVsZW1lbnQodG9rZW4pOworICAgICAgICBzZXRJbnNlcnRp b25Nb2RlKEluSGVhZE5vc2NyaXB0TW9kZSk7CisgICAgICAgIHJldHVybiB0cnVlOworICAgIH0K KyAgICBpZiAodG9rZW4ubmFtZSgpID09IG5vZnJhbWVzVGFnIHx8IHRva2VuLm5hbWUoKSA9PSBz dHlsZVRhZykgeworICAgICAgICBpbnNlcnRHZW5lcmljUmF3VGV4dEVsZW1lbnQodG9rZW4pOwor ICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisgICAgaWYgKHRva2VuLm5hbWUoKSA9PSBzY3Jp cHRUYWcpIHsKKyAgICAgICAgaW5zZXJ0U2NyaXB0RWxlbWVudCh0b2tlbik7CisgICAgICAgIHJl dHVybiB0cnVlOworICAgIH0KKyAgICBpZiAodG9rZW4ubmFtZSgpID09IGhlYWRUYWcpIHsKKyAg ICAgICAgcGFyc2VFcnJvcih0b2tlbik7CisgICAgICAgIHJldHVybiB0cnVlOworICAgIH0KKyAg ICByZXR1cm4gZmFsc2U7Cit9CisKIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjppbnNlcnREb2N0eXBl KEF0b21pY0hUTUxUb2tlbiYgdG9rZW4pCiB7CiAgICAgQVNTRVJUKHRva2VuLnR5cGUoKSA9PSBI VE1MVG9rZW46OkRPQ1RZUEUpOwpAQCAtNjE4LDYgKzYxOSwxNSBAQCB2b2lkIEhUTUxUcmVlQnVp bGRlcjo6aW5zZXJ0RWxlbWVudChBdG9taWNIVE1MVG9rZW4mIHRva2VuKQogICAgIG1fb3BlbkVs ZW1lbnRzLnB1c2goZWxlbWVudC5yZWxlYXNlKCkpOwogfQogCit2b2lkIEhUTUxUcmVlQnVpbGRl cjo6aW5zZXJ0U2VsZkNsb3NpbmdFbGVtZW50KEF0b21pY0hUTUxUb2tlbiYgdG9rZW4pCit7Cisg ICAgQVNTRVJUKHRva2VuLnR5cGUoKSA9PSBIVE1MVG9rZW46OlN0YXJ0VGFnKTsKKyAgICBpbnNl cnRFbGVtZW50KHRva2VuKTsKKyAgICBtX29wZW5FbGVtZW50cy5wb3AoKTsKKyAgICAvLyBGSVhN RTogRG8gd2Ugd2FudCB0byBhY2tub3dsZWRnZSB0aGUgdG9rZW4ncyBzZWxmLWNsb3NpbmcgZmxh Zz8KKyAgICAvLyBodHRwOi8vd3d3LndoYXR3Zy5vcmcvc3BlY3Mvd2ViLWFwcHMvY3VycmVudC13 b3JrL211bHRpcGFnZS90b2tlbml6YXRpb24uaHRtbCNhY2tub3dsZWRnZS1zZWxmLWNsb3Npbmct ZmxhZworfQorCiB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6aW5zZXJ0Q2hhcmFjdGVyKFVDaGFyIGNj KQogewogICAgIEFTU0VSVF9VTlVTRUQoY2MsIGNjKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRt bC9IVE1MVHJlZUJ1aWxkZXIuaCBiL1dlYkNvcmUvaHRtbC9IVE1MVHJlZUJ1aWxkZXIuaAppbmRl eCA0ZThlYWNmNWQ0MGQ5MTJhN2JlYmQyZGEzMjI2NjQyMDc4MzA4ZmRkLi4wOGZjMTFlNDc0NGQ5 MWRhYzA3YTU5Y2FhZjZmOTExNzk5MTRiZjU1IDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0bWwvSFRN TFRyZWVCdWlsZGVyLmgKKysrIGIvV2ViQ29yZS9odG1sL0hUTUxUcmVlQnVpbGRlci5oCkBAIC0x NzMsOSArMTczLDEyIEBAIHByaXZhdGU6CiAgICAgdm9pZCBwcm9jZXNzRGVmYXVsdEZvckluSGVh ZE5vc2NyaXB0TW9kZShBdG9taWNIVE1MVG9rZW4mKTsKICAgICB2b2lkIHByb2Nlc3NEZWZhdWx0 Rm9yQWZ0ZXJIZWFkTW9kZShBdG9taWNIVE1MVG9rZW4mKTsKIAorICAgIGJvb2wgcHJvY2Vzc1N0 YXJ0VGFnRm9ySW5IZWFkKEF0b21pY0hUTUxUb2tlbiYpOworCiAgICAgdm9pZCBpbnNlcnREb2N0 eXBlKEF0b21pY0hUTUxUb2tlbiYpOwogICAgIHZvaWQgaW5zZXJ0Q29tbWVudChBdG9taWNIVE1M VG9rZW4mKTsKICAgICB2b2lkIGluc2VydEVsZW1lbnQoQXRvbWljSFRNTFRva2VuJik7CisgICAg dm9pZCBpbnNlcnRTZWxmQ2xvc2luZ0VsZW1lbnQoQXRvbWljSFRNTFRva2VuJik7CiAgICAgdm9p ZCBpbnNlcnRDaGFyYWN0ZXIoVUNoYXIgY2MpOwogICAgIHZvaWQgaW5zZXJ0R2VuZXJpY1JDREFU QUVsZW1lbnQoQXRvbWljSFRNTFRva2VuJik7CiAgICAgdm9pZCBpbnNlcnRHZW5lcmljUmF3VGV4 dEVsZW1lbnQoQXRvbWljSFRNTFRva2VuJik7Cg== 59863 2010-06-27 15:01:09 -0700 2010-06-27 15:45:29 -0700 Patch for landing bug-41264-20100627150108.patch text/plain 6354 abarth SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MTk3MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTAtMDYtMjcgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KKworICAgICAgICBJbXBsZW1l bnQgcmVtYWluaW5nIFN0YXJ0VGFnIHByb2Nlc3NpbmcgZm9yIEluSGVhZE5vc2NyaXB0TW9kZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDEyNjQKKwor ICAgICAgICBUaGUgSW5IZWFkTm9zY3JpcHRNb2RlIHByb2Nlc3NlcyBzb21lIHN0YXJ0IHRhZ3Mg ImFzIGlmIiB0aGUgdHJlZQorICAgICAgICBidWlsZGVyIHdlcmUgaW4gdGhlIEluSGVhZE1vZGUu ICBUaGlzIGlzIGFuIGlkaW9tIHdlJ2xsIHNlZSBtb3JlIG9mCisgICAgICAgIGxhdGVyLiAgTXkg YXBwcm9hY2ggaXMgdGhpcyBwYXRjaCBpcyB0byBmYWN0b3IgYWxsIHRoZSBsb2dpYyBmb3IKKyAg ICAgICAgcHJvY2Vzc2luZyBzdGFydCB0YWdzIGluIHRoZSBJbkhlYWRNb2RlIGludG8gYSBzZXBh cmF0ZSBmdW5jdGlvbiB0aGF0CisgICAgICAgIGNhbiBiZSBjYWxsZWQgZnJvbSBib3RoIGxvY2F0 aW9ucy4gIFRoaXMgc2VlbXMgY2xlYW5lciB0aGFuIGp1c3QKKyAgICAgICAgc3BsaXR0aW5nIG91 dCB0aGUgcGFydHMgdGhhdCBhcmUgYWN0dWFsbHkgdXNlZCBieSBib3RoIG1vZGVzLgorCisgICAg ICAgICogaHRtbC9IVE1MVHJlZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRy ZWVCdWlsZGVyOjpwcm9jZXNzU3RhcnRUYWcpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRyZWVC dWlsZGVyOjpwcm9jZXNzU3RhcnRUYWdGb3JJbkhlYWQpOgorICAgICAgICAoV2ViQ29yZTo6SFRN TFRyZWVCdWlsZGVyOjppbnNlcnRTZWxmQ2xvc2luZ0VsZW1lbnQpOgorICAgICAgICAqIGh0bWwv SFRNTFRyZWVCdWlsZGVyLmg6CisKIDIwMTAtMDYtMjcgIEFuZHJlYXMgS2xpbmcgIDxhbmRyZWFz LmtsaW5nQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KSW5k ZXg6IFdlYkNvcmUvaHRtbC9IVE1MVHJlZUJ1aWxkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvaHRtbC9IVE1MVHJlZUJ1aWxkZXIuY3BwCShyZXZpc2lvbiA2MTk3MCkKKysrIFdlYkNvcmUv aHRtbC9IVE1MVHJlZUJ1aWxkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMTYsNDggKzMxNiw4 IEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzU3RhcnRUYWcoQXQKICAgICAgICAgLy8g RmFsbCB0aHJvdWdoLgogICAgIGNhc2UgSW5IZWFkTW9kZToKICAgICAgICAgQVNTRVJUKGluc2Vy dGlvbk1vZGUoKSA9PSBJbkhlYWRNb2RlKTsKLSAgICAgICAgaWYgKHRva2VuLm5hbWUoKSA9PSBo dG1sVGFnKSB7Ci0gICAgICAgICAgICBpbnNlcnRIVE1MU3RhcnRUYWdJbkJvZHkodG9rZW4pOwot ICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0gICAgICAgIC8vIEZJWE1FOiBBdG9taXpl ICJjb21tYW5kIi4KLSAgICAgICAgaWYgKHRva2VuLm5hbWUoKSA9PSBiYXNlVGFnIHx8IHRva2Vu Lm5hbWUoKSA9PSAiY29tbWFuZCIgfHwgdG9rZW4ubmFtZSgpID09IGxpbmtUYWcpIHsKLSAgICAg ICAgICAgIGluc2VydEVsZW1lbnQodG9rZW4pOwotICAgICAgICAgICAgbV9vcGVuRWxlbWVudHMu cG9wKCk7Ci0gICAgICAgICAgICBub3RJbXBsZW1lbnRlZCgpOwotICAgICAgICAgICAgcmV0dXJu OwotICAgICAgICB9Ci0gICAgICAgIGlmICh0b2tlbi5uYW1lKCkgPT0gbWV0YVRhZykgewotICAg ICAgICAgICAgaW5zZXJ0RWxlbWVudCh0b2tlbik7Ci0gICAgICAgICAgICBtX29wZW5FbGVtZW50 cy5wb3AoKTsKLSAgICAgICAgICAgIG5vdEltcGxlbWVudGVkKCk7Ci0gICAgICAgICAgICByZXR1 cm47Ci0gICAgICAgIH0KLSAgICAgICAgaWYgKHRva2VuLm5hbWUoKSA9PSB0aXRsZVRhZykgewot ICAgICAgICAgICAgaW5zZXJ0R2VuZXJpY1JDREFUQUVsZW1lbnQodG9rZW4pOwotICAgICAgICAg ICAgcmV0dXJuOwotICAgICAgICB9Ci0gICAgICAgIGlmICh0b2tlbi5uYW1lKCkgPT0gbm9zY3Jp cHRUYWcpIHsKLSAgICAgICAgICAgIGlmIChpc1NjcmlwdGluZ0ZsYWdFbmFibGVkKG1fZG9jdW1l bnQtPmZyYW1lKCkpKSB7Ci0gICAgICAgICAgICAgICAgaW5zZXJ0R2VuZXJpY1Jhd1RleHRFbGVt ZW50KHRva2VuKTsKLSAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICB9Ci0gICAg ICAgICAgICBpbnNlcnRFbGVtZW50KHRva2VuKTsKLSAgICAgICAgICAgIHNldEluc2VydGlvbk1v ZGUoSW5IZWFkTm9zY3JpcHRNb2RlKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQot ICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09IG5vZnJhbWVzVGFnIHx8IHRva2VuLm5hbWUoKSA9 PSBzdHlsZVRhZykgewotICAgICAgICAgICAgaW5zZXJ0R2VuZXJpY1Jhd1RleHRFbGVtZW50KHRv a2VuKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotICAgICAgICBpZiAodG9rZW4u bmFtZSgpID09IHNjcmlwdFRhZykgewotICAgICAgICAgICAgaW5zZXJ0U2NyaXB0RWxlbWVudCh0 b2tlbik7CisgICAgICAgIGlmIChwcm9jZXNzU3RhcnRUYWdGb3JJbkhlYWQodG9rZW4pKQogICAg ICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0gICAgICAgIGlmICh0b2tlbi5uYW1lKCkgPT0g aGVhZFRhZykgewotICAgICAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsKLSAgICAgICAgICAgIHJl dHVybjsKLSAgICAgICAgfQogICAgICAgICBwcm9jZXNzRGVmYXVsdEZvckluSGVhZE1vZGUodG9r ZW4pOwogICAgICAgICAvLyBGYWxsIHRocm91Z2guCiAgICAgY2FzZSBBZnRlckhlYWRNb2RlOgpA QCAtNDAxLDcgKzM2MSw4IEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzU3RhcnRUYWco QXQKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogICAgICAgICBpZiAodG9rZW4ubmFt ZSgpID09IGxpbmtUYWcgfHwgdG9rZW4ubmFtZSgpID09IG1ldGFUYWcgfHwgdG9rZW4ubmFtZSgp ID09IG5vZnJhbWVzVGFnIHx8IHRva2VuLm5hbWUoKSA9PSBzdHlsZVRhZykgewotICAgICAgICAg ICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICAgICAgICAgIGJvb2wgZGlkUHJvY2VzcyA9IHByb2Nl c3NTdGFydFRhZ0ZvckluSGVhZCh0b2tlbik7CisgICAgICAgICAgICBBU1NFUlRfVU5VU0VEKGRp ZFByb2Nlc3MsIGRpZFByb2Nlc3MpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAg ICAgICAgIGlmICh0b2tlbi5uYW1lKCkgPT0gaHRtbFRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gbm9z Y3JpcHRUYWcpIHsKQEAgLTU5MCw2ICs1NTEsNDYgQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnBy b2Nlc3NEZWZhdWx0Rm9yQQogICAgIG1fZnJhbWVzZXRPayA9IHRydWU7CiB9CiAKK2Jvb2wgSFRN TFRyZWVCdWlsZGVyOjpwcm9jZXNzU3RhcnRUYWdGb3JJbkhlYWQoQXRvbWljSFRNTFRva2VuJiB0 b2tlbikKK3sKKyAgICBpZiAodG9rZW4ubmFtZSgpID09IGh0bWxUYWcpIHsKKyAgICAgICAgaW5z ZXJ0SFRNTFN0YXJ0VGFnSW5Cb2R5KHRva2VuKTsKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAg fQorICAgIC8vIEZJWE1FOiBBdG9taXplICJjb21tYW5kIi4KKyAgICBpZiAodG9rZW4ubmFtZSgp ID09IGJhc2VUYWcgfHwgdG9rZW4ubmFtZSgpID09ICJjb21tYW5kIiB8fCB0b2tlbi5uYW1lKCkg PT0gbGlua1RhZyB8fCB0b2tlbi5uYW1lKCkgPT0gbWV0YVRhZykgeworICAgICAgICBpbnNlcnRT ZWxmQ2xvc2luZ0VsZW1lbnQodG9rZW4pOworICAgICAgICAvLyBOb3RlOiBUaGUgY3VzdG9tIHBy b2Nlc3NpbmcgZm9yIHRoZSA8bWV0YT4gdGFnIGlzIGRvbmUgaW4gSFRNTE1ldGFFbGVtZW50Ojpw cm9jZXNzKCkuCisgICAgICAgIHJldHVybiB0cnVlOworICAgIH0KKyAgICBpZiAodG9rZW4ubmFt ZSgpID09IHRpdGxlVGFnKSB7CisgICAgICAgIGluc2VydEdlbmVyaWNSQ0RBVEFFbGVtZW50KHRv a2VuKTsKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorICAgIGlmICh0b2tlbi5uYW1lKCkg PT0gbm9zY3JpcHRUYWcpIHsKKyAgICAgICAgaWYgKGlzU2NyaXB0aW5nRmxhZ0VuYWJsZWQobV9k b2N1bWVudC0+ZnJhbWUoKSkpIHsKKyAgICAgICAgICAgIGluc2VydEdlbmVyaWNSYXdUZXh0RWxl bWVudCh0b2tlbik7CisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgfQorICAgICAg ICBpbnNlcnRFbGVtZW50KHRva2VuKTsKKyAgICAgICAgc2V0SW5zZXJ0aW9uTW9kZShJbkhlYWRO b3NjcmlwdE1vZGUpOworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisgICAgaWYgKHRva2Vu Lm5hbWUoKSA9PSBub2ZyYW1lc1RhZyB8fCB0b2tlbi5uYW1lKCkgPT0gc3R5bGVUYWcpIHsKKyAg ICAgICAgaW5zZXJ0R2VuZXJpY1Jhd1RleHRFbGVtZW50KHRva2VuKTsKKyAgICAgICAgcmV0dXJu IHRydWU7CisgICAgfQorICAgIGlmICh0b2tlbi5uYW1lKCkgPT0gc2NyaXB0VGFnKSB7CisgICAg ICAgIGluc2VydFNjcmlwdEVsZW1lbnQodG9rZW4pOworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAg ICB9CisgICAgaWYgKHRva2VuLm5hbWUoKSA9PSBoZWFkVGFnKSB7CisgICAgICAgIHBhcnNlRXJy b3IodG9rZW4pOworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisgICAgcmV0dXJuIGZhbHNl OworfQorCiB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6aW5zZXJ0RG9jdHlwZShBdG9taWNIVE1MVG9r ZW4mIHRva2VuKQogewogICAgIEFTU0VSVF9VTlVTRUQodG9rZW4sIHRva2VuLnR5cGUoKSA9PSBI VE1MVG9rZW46OkRPQ1RZUEUpOwpAQCAtNjEwLDYgKzYxMSwxNSBAQCB2b2lkIEhUTUxUcmVlQnVp bGRlcjo6aW5zZXJ0RWxlbWVudChBdG9tCiAgICAgbV9vcGVuRWxlbWVudHMucHVzaChlbGVtZW50 LnJlbGVhc2UoKSk7CiB9CiAKK3ZvaWQgSFRNTFRyZWVCdWlsZGVyOjppbnNlcnRTZWxmQ2xvc2lu Z0VsZW1lbnQoQXRvbWljSFRNTFRva2VuJiB0b2tlbikKK3sKKyAgICBBU1NFUlQodG9rZW4udHlw ZSgpID09IEhUTUxUb2tlbjo6U3RhcnRUYWcpOworICAgIGluc2VydEVsZW1lbnQodG9rZW4pOwor ICAgIG1fb3BlbkVsZW1lbnRzLnBvcCgpOworICAgIC8vIEZJWE1FOiBEbyB3ZSB3YW50IHRvIGFj a25vd2xlZGdlIHRoZSB0b2tlbidzIHNlbGYtY2xvc2luZyBmbGFnPworICAgIC8vIGh0dHA6Ly93 d3cud2hhdHdnLm9yZy9zcGVjcy93ZWItYXBwcy9jdXJyZW50LXdvcmsvbXVsdGlwYWdlL3Rva2Vu aXphdGlvbi5odG1sI2Fja25vd2xlZGdlLXNlbGYtY2xvc2luZy1mbGFnCit9CisKIHZvaWQgSFRN TFRyZWVCdWlsZGVyOjppbnNlcnRDaGFyYWN0ZXIoVUNoYXIgY2MpCiB7CiAgICAgQVNTRVJUX1VO VVNFRChjYywgY2MpOwpJbmRleDogV2ViQ29yZS9odG1sL0hUTUxUcmVlQnVpbGRlci5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvaHRtbC9IVE1MVHJlZUJ1aWxkZXIuaAkocmV2aXNpb24gNjE5NzAp CisrKyBXZWJDb3JlL2h0bWwvSFRNTFRyZWVCdWlsZGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTE3 Myw5ICsxNzMsMTIgQEAgcHJpdmF0ZToKICAgICB2b2lkIHByb2Nlc3NEZWZhdWx0Rm9ySW5IZWFk Tm9zY3JpcHRNb2RlKEF0b21pY0hUTUxUb2tlbiYpOwogICAgIHZvaWQgcHJvY2Vzc0RlZmF1bHRG b3JBZnRlckhlYWRNb2RlKEF0b21pY0hUTUxUb2tlbiYpOwogCisgICAgYm9vbCBwcm9jZXNzU3Rh cnRUYWdGb3JJbkhlYWQoQXRvbWljSFRNTFRva2VuJik7CisKICAgICB2b2lkIGluc2VydERvY3R5 cGUoQXRvbWljSFRNTFRva2VuJik7CiAgICAgdm9pZCBpbnNlcnRDb21tZW50KEF0b21pY0hUTUxU b2tlbiYpOwogICAgIHZvaWQgaW5zZXJ0RWxlbWVudChBdG9taWNIVE1MVG9rZW4mKTsKKyAgICB2 b2lkIGluc2VydFNlbGZDbG9zaW5nRWxlbWVudChBdG9taWNIVE1MVG9rZW4mKTsKICAgICB2b2lk IGluc2VydENoYXJhY3RlcihVQ2hhciBjYyk7CiAgICAgdm9pZCBpbnNlcnRHZW5lcmljUkNEQVRB RWxlbWVudChBdG9taWNIVE1MVG9rZW4mKTsKICAgICB2b2lkIGluc2VydEdlbmVyaWNSYXdUZXh0 RWxlbWVudChBdG9taWNIVE1MVG9rZW4mKTsK