41627 2010-07-05 11:29:55 -0700 Implement InSelectMode 2010-07-05 21:58:34 -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 246726 0 abarth 2010-07-05 11:29:55 -0700 Implement InSelectMode 246728 1 60559 abarth 2010-07-05 11:30:48 -0700 Created attachment 60559 Patch 246831 2 60577 abarth 2010-07-05 20:46:55 -0700 Created attachment 60577 Patch 246832 3 60577 eric 2010-07-05 20:58:47 -0700 Comment on attachment 60577 Patch WebCore/html/HTMLTreeBuilder.cpp:913 + insertElement(token); Why no return after this? We need to figure out what the right pattern here is. WebCore/html/HTMLTreeBuilder.cpp:924 + insertElement(token); Here again? No return? Looks OK, I think. 246833 4 60578 abarth 2010-07-05 21:03:07 -0700 Created attachment 60578 Patch for landing 246849 5 60578 commit-queue 2010-07-05 21:58:29 -0700 Comment on attachment 60578 Patch for landing Clearing flags on attachment: 60578 Committed r62519: <http://trac.webkit.org/changeset/62519> 246850 6 commit-queue 2010-07-05 21:58:34 -0700 All reviewed patches have been landed. Closing bug. 60559 2010-07-05 11:30:48 -0700 2010-07-05 20:46:51 -0700 Patch bug-41627-20100705113047.patch text/plain 5314 abarth ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OWI0MDllYzIyNjdhYzZmMTMxYjhiYThmNjMzNzAwNjVjYTczNWRhNy4uMWFkMWYwZmJiM2UwMmZh MTJhMTA3MzY4ZTFkMzRmYTBmNjJjMDIxMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTIsNiArMiwyNCBAQAogCiAgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgogCisgICAgICAgIEltcGxlbWVudCBJblNlbGVjdE1vZGUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxNjI3CisK KyAgICAgICAgTm8gbmV3IHRlc3RzLiAoT09QUyEpCisKKyAgICAgICAgVGhpcyBwYXRjaCBpcyBi bG9ja2VkIG9uICJyZXNldCB0aGUgaW5zZXJ0aW9uIG1vZGUgYXBwcm9wcmlhdGVseSIKKyAgICAg ICAgKHdoaWNoIEkgdGhpbmsgRXJpYyBhbHJlYWR5IGltcGxlbWVudGVkIGluIGFub3RoZXIgcGF0 Y2gpLgorCisgICAgICAgICogaHRtbC9IVE1MVHJlZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6SFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzU3RhcnRUYWcpOgorICAgICAgICAoV2ViQ29y ZTo6SFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzRW5kVGFnKToKKyAgICAgICAgKFdlYkNvcmU6OkhU TUxUcmVlQnVpbGRlcjo6cHJvY2Vzc0NoYXJhY3Rlcik6CisgICAgICAgIChXZWJDb3JlOjpIVE1M VHJlZUJ1aWxkZXI6OnByb2Nlc3NFbmRPZkZpbGUpOgorCisyMDEwLTA3LTA1ICBBZGFtIEJhcnRo ICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKICAgICAgICAgSW1wbGVtZW50IGJhc2ljIHRleHQgbm9kZSBjb2FsZXNjaW5nCiAgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MTYyMwogCmRpZmYg LS1naXQgYS9XZWJDb3JlL2h0bWwvSFRNTFRyZWVCdWlsZGVyLmNwcCBiL1dlYkNvcmUvaHRtbC9I VE1MVHJlZUJ1aWxkZXIuY3BwCmluZGV4IDY5Y2Y3NDE4Y2E3OGY4ZjkwZDU3M2QyMzAzMjc0YWVk NWJhNTYzZDEuLjNkNjBhNzVlMThlZTIzMjIwYzMzZmE3MzEzMjEwYTZiM2ZjNGM0MTIgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MVHJlZUJ1aWxkZXIuY3BwCisrKyBiL1dlYkNvcmUvaHRt bC9IVE1MVHJlZUJ1aWxkZXIuY3BwCkBAIC04NjUsNiArODY1LDUwIEBAIHZvaWQgSFRNTFRyZWVC dWlsZGVyOjpwcm9jZXNzU3RhcnRUYWcoQXRvbWljSFRNTFRva2VuJiB0b2tlbikKICAgICAgICAg fQogICAgICAgICBwYXJzZUVycm9yKHRva2VuKTsKICAgICAgICAgYnJlYWs7CisgICAgY2FzZSBJ blNlbGVjdE1vZGU6CisgICAgICAgIEFTU0VSVChpbnNlcnRpb25Nb2RlKCkgPT0gSW5TZWxlY3RN b2RlKTsKKyAgICAgICAgaWYgKHRva2VuLm5hbWUoKSA9PSBodG1sVGFnKSB7CisgICAgICAgICAg ICBpbnNlcnRIVE1MU3RhcnRUYWdJbkJvZHkodG9rZW4pOworICAgICAgICAgICAgcmV0dXJuOwor ICAgICAgICB9CisgICAgICAgIGlmICh0b2tlbi5uYW1lKCkgPT0gb3B0aW9uVGFnKSB7CisgICAg ICAgICAgICBpZiAoY3VycmVudEVsZW1lbnQoKS0+aGFzVGFnTmFtZShvcHRpb25UYWcpKSB7Cisg ICAgICAgICAgICAgICAgQXRvbWljSFRNTFRva2VuIGVuZE9wdGlvbihIVE1MVG9rZW46OkVuZFRh Zywgb3B0aW9uVGFnLmxvY2FsTmFtZSgpKTsKKyAgICAgICAgICAgICAgICBwcm9jZXNzRW5kVGFn KGVuZE9wdGlvbik7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBpbnNlcnRFbGVtZW50KHRv a2VuKTsKKyAgICAgICAgfQorICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09IG9wdGdyb3VwVGFn KSB7CisgICAgICAgICAgICBpZiAoY3VycmVudEVsZW1lbnQoKS0+aGFzVGFnTmFtZShvcHRpb25U YWcpKSB7CisgICAgICAgICAgICAgICAgQXRvbWljSFRNTFRva2VuIGVuZE9wdGlvbihIVE1MVG9r ZW46OkVuZFRhZywgb3B0aW9uVGFnLmxvY2FsTmFtZSgpKTsKKyAgICAgICAgICAgICAgICBwcm9j ZXNzRW5kVGFnKGVuZE9wdGlvbik7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBpZiAoY3Vy cmVudEVsZW1lbnQoKS0+aGFzVGFnTmFtZShvcHRncm91cFRhZykpIHsKKyAgICAgICAgICAgICAg ICBBdG9taWNIVE1MVG9rZW4gZW5kT3B0Z3JvdXAoSFRNTFRva2VuOjpFbmRUYWcsIG9wdGdyb3Vw VGFnLmxvY2FsTmFtZSgpKTsKKyAgICAgICAgICAgICAgICBwcm9jZXNzRW5kVGFnKGVuZE9wdGdy b3VwKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGluc2VydEVsZW1lbnQodG9rZW4pOwor ICAgICAgICB9CisgICAgICAgIGlmICh0b2tlbi5uYW1lKCkgPT0gc2VsZWN0VGFnKSB7CisgICAg ICAgICAgICBwYXJzZUVycm9yKHRva2VuKTsKKyAgICAgICAgICAgIEF0b21pY0hUTUxUb2tlbiBl bmRTZWxlY3QoSFRNTFRva2VuOjpFbmRUYWcsIHNlbGVjdFRhZy5sb2NhbE5hbWUoKSk7CisgICAg ICAgICAgICBwcm9jZXNzRW5kVGFnKGVuZFNlbGVjdCk7CisgICAgICAgICAgICByZXR1cm47Cisg ICAgICAgIH0KKyAgICAgICAgaWYgKHRva2VuLm5hbWUoKSA9PSBpbnB1dFRhZyB8fCB0b2tlbi5u YW1lKCkgPT0ga2V5Z2VuVGFnIHx8IHRva2VuLm5hbWUoKSA9PSB0ZXh0YXJlYVRhZykgeworICAg ICAgICAgICAgcGFyc2VFcnJvcih0b2tlbik7CisgICAgICAgICAgICBub3RJbXBsZW1lbnRlZCgp OyAvLyBmcmFnbWVudCBjYXNlCisgICAgICAgICAgICBBdG9taWNIVE1MVG9rZW4gZW5kU2VsZWN0 KEhUTUxUb2tlbjo6RW5kVGFnLCBzZWxlY3RUYWcubG9jYWxOYW1lKCkpOworICAgICAgICAgICAg cHJvY2Vzc0VuZFRhZyhlbmRTZWxlY3QpOworICAgICAgICAgICAgcHJvY2Vzc1N0YXJ0VGFnKHRv a2VuKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBpZiAodG9rZW4u bmFtZSgpID09IHNjcmlwdFRhZykgeworICAgICAgICAgICAgYm9vbCBkaWRQcm9jZXNzID0gcHJv Y2Vzc1N0YXJ0VGFnRm9ySW5IZWFkKHRva2VuKTsKKyAgICAgICAgICAgIEFTU0VSVF9VTlVTRUQo ZGlkUHJvY2VzcywgZGlkUHJvY2Vzcyk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0K KyAgICAgICAgYnJlYWs7CiAgICAgZGVmYXVsdDoKICAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsK ICAgICB9CkBAIC0xMjY3LDYgKzEzMTEsMzMgQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nl c3NFbmRUYWcoQXRvbWljSFRNTFRva2VuJiB0b2tlbikKICAgICAgICAgQVNTRVJUKGluc2VydGlv bk1vZGUoKSA9PSBBZnRlckZyYW1lc2V0TW9kZSB8fCBpbnNlcnRpb25Nb2RlKCkgPT0gQWZ0ZXJB ZnRlckZyYW1lc2V0TW9kZSk7CiAgICAgICAgIHBhcnNlRXJyb3IodG9rZW4pOwogICAgICAgICBi cmVhazsKKyAgICBjYXNlIEluU2VsZWN0TW9kZToKKyAgICAgICAgQVNTRVJUKGluc2VydGlvbk1v ZGUoKSA9PSBJblNlbGVjdE1vZGUpOworICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09IG9wdGdy b3VwVGFnKSB7CisgICAgICAgICAgICBpZiAoY3VycmVudEVsZW1lbnQoKS0+aGFzVGFnTmFtZShv cHRpb25UYWcpKQorICAgICAgICAgICAgICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgICAgICAg ICBpZiAoY3VycmVudEVsZW1lbnQoKS0+aGFzVGFnTmFtZShvcHRncm91cFRhZykpIHsKKyAgICAg ICAgICAgICAgICBtX29wZW5FbGVtZW50cy5wb3AoKTsKKyAgICAgICAgICAgICAgICByZXR1cm47 CisgICAgICAgICAgICB9CisgICAgICAgICAgICBwYXJzZUVycm9yKHRva2VuKTsKKyAgICAgICAg ICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09IG9wdGlv blRhZykgeworICAgICAgICAgICAgaWYgKGN1cnJlbnRFbGVtZW50KCktPmhhc1RhZ05hbWUob3B0 aW9uVGFnKSkgeworICAgICAgICAgICAgICAgIG1fb3BlbkVsZW1lbnRzLnBvcCgpOworICAgICAg ICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIHBhcnNlRXJyb3Io dG9rZW4pOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAgIGlmICh0b2tl bi5uYW1lKCkgPT0gc2VsZWN0VGFnKSB7CisgICAgICAgICAgICBub3RJbXBsZW1lbnRlZCgpOyAv LyBmcmFnbWVudCBjYXNlCisgICAgICAgICAgICBtX29wZW5FbGVtZW50cy5wb3BVbnRpbChzZWxl Y3RUYWcubG9jYWxOYW1lKCkpOworICAgICAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsgLy8gUmVz ZXQgdGhlIGluc2VydGlvbiBtb2RlIGFwcHJvcHJpYXRlbHkuCisgICAgICAgICAgICByZXR1cm47 CisgICAgICAgIH0KKyAgICAgICAgYnJlYWs7CiAgICAgZGVmYXVsdDoKICAgICAgICAgbm90SW1w bGVtZW50ZWQoKTsKICAgICB9CkBAIC0xMzQxLDYgKzE0MTIsMTAgQEAgdm9pZCBIVE1MVHJlZUJ1 aWxkZXI6OnByb2Nlc3NDaGFyYWN0ZXIoQXRvbWljSFRNTFRva2VuJiB0b2tlbikKICAgICAgICAg QVNTRVJUKGluc2VydGlvbk1vZGUoKSA9PSBJbkZyYW1lc2V0TW9kZSB8fCBpbnNlcnRpb25Nb2Rl KCkgPT0gQWZ0ZXJGcmFtZXNldE1vZGUgfHwgaW5zZXJ0aW9uTW9kZSgpID09IEFmdGVyQWZ0ZXJG cmFtZXNldE1vZGUpOwogICAgICAgICBwYXJzZUVycm9yKHRva2VuKTsKICAgICAgICAgYnJlYWs7 CisgICAgY2FzZSBJblNlbGVjdE1vZGU6CisgICAgICAgIEFTU0VSVChpbnNlcnRpb25Nb2RlKCkg PT0gSW5TZWxlY3RNb2RlKTsKKyAgICAgICAgaW5zZXJ0VGV4dE5vZGUodG9rZW4pOworICAgICAg ICBicmVhazsKICAgICBkZWZhdWx0OgogICAgICAgICBub3RJbXBsZW1lbnRlZCgpOwogICAgIH0K QEAgLTEzOTIsNiArMTQ2NywxMSBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc0VuZE9m RmlsZShBdG9taWNIVE1MVG9rZW4mIHRva2VuKQogICAgIGNhc2UgQWZ0ZXJBZnRlckZyYW1lc2V0 TW9kZToKICAgICAgICAgQVNTRVJUKGluc2VydGlvbk1vZGUoKSA9PSBBZnRlckZyYW1lc2V0TW9k ZSB8fCBpbnNlcnRpb25Nb2RlKCkgPT0gQWZ0ZXJBZnRlckZyYW1lc2V0TW9kZSk7CiAgICAgICAg IGJyZWFrOworICAgIGNhc2UgSW5TZWxlY3RNb2RlOgorICAgICAgICBBU1NFUlQoaW5zZXJ0aW9u TW9kZSgpID09IEluU2VsZWN0TW9kZSk7CisgICAgICAgIGlmIChjdXJyZW50RWxlbWVudCgpICE9 IG1fb3BlbkVsZW1lbnRzLmh0bWxFbGVtZW50KCkpCisgICAgICAgICAgICBwYXJzZUVycm9yKHRv a2VuKTsKKyAgICAgICAgYnJlYWs7CiAgICAgZGVmYXVsdDoKICAgICAgICAgbm90SW1wbGVtZW50 ZWQoKTsKICAgICB9Cg== 60577 2010-07-05 20:46:55 -0700 2010-07-05 21:03:02 -0700 Patch bug-41627-20100705204653.patch text/plain 12402 abarth ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA4ZGRhZGE5MDZlMzFhN2Q4YjcyN2FhN2Y4YzdjMWY0NzU5NzJmNTEwLi44OGRjZDdi MWY5MjU3ODhkNTdhMTQwMDE4ZTM0YzZkMjI0YjIxYmI0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTYgQEAK IDIwMTAtMDctMDUgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAorICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXBsZW1lbnQgSW5TZWxlY3RN b2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MTYy NworCisgICAgICAgIE1hc3NpdmUgdGVzdCBwcm9ncmVzc2lvbi4KKworICAgICAgICAqIGh0bWw1 bGliL3J1bm5lci1leHBlY3RlZC1odG1sNS50eHQ6CisKKzIwMTAtMDctMDUgIEFkYW0gQmFydGgg IDxhYmFydGhAd2Via2l0Lm9yZz4KKwogICAgICAgICBVbnJldmlld2VkLgogCiAgICAgICAgIFdl IHdlcmUgZGlzY3Vzc2luZyB0aGlzIHRlc3QgY2FzZSwgc28gSSBmaWd1cmVkIEkgbWlnaHQgYXMg d2VsbCBhZGQgaXQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0bWw1bGliL3J1bm5lci1leHBl Y3RlZC1odG1sNS50eHQgYi9MYXlvdXRUZXN0cy9odG1sNWxpYi9ydW5uZXItZXhwZWN0ZWQtaHRt bDUudHh0CmluZGV4IGVhMWZkN2QxMTA2M2I5MDVlODhmYTJjNjM1MGFiMmY5ZTZlM2NjMzMuLmRk NjBiMzQzM2UwZDUxNTlhNzc0MzNkOGZiNWNiYzkwZjBiZGI2YTcgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL2h0bWw1bGliL3J1bm5lci1leHBlY3RlZC1odG1sNS50eHQKKysrIGIvTGF5b3V0VGVz dHMvaHRtbDVsaWIvcnVubmVyLWV4cGVjdGVkLWh0bWw1LnR4dApAQCAtMTAsNyArMTAsNiBAQCBy ZXNvdXJjZXMvdGVzdHMxLmRhdDoKIDI0CiAyNQogMjgKLTI5CiAzMAogMzEKIDMyCkBAIC00OSw3 ICs0OCw2IEBAIHJlc291cmNlcy90ZXN0czEuZGF0OgogOTcKIDk4CiAxMDAKLTEwMQogMTAzCiAx MDQKIDEwNwpAQCAtMjAzLDIyICsyMDEsNiBAQCBFeHBlY3RlZDoKIHwgICAgIDxocj4KIHwgICAg IDxwPgogCi1UZXN0IDI5IG9mIDExMyBpbiByZXNvdXJjZXMvdGVzdHMxLmRhdCBmYWlsZWQuIElu cHV0OgotPHNlbGVjdD48Yj48b3B0aW9uPjxzZWxlY3Q+PG9wdGlvbj48L2I+PC9zZWxlY3Q+WAot R290OgotfCA8aHRtbD4KLXwgICA8aGVhZD4KLXwgICA8Ym9keT4KLXwgICAgIDxzZWxlY3Q+Ci1F eHBlY3RlZDoKLXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18ICAgPGJvZHk+Ci18ICAgICA8c2VsZWN0 PgotfCAgICAgICA8b3B0aW9uPgotfCAgICAgPG9wdGlvbj4KLXwgICAgICAgIlgiCi0KIFRlc3Qg MzAgb2YgMTEzIGluIHJlc291cmNlcy90ZXN0czEuZGF0IGZhaWxlZC4gSW5wdXQ6CiA8YT48dGFi bGU+PHRkPjxhPjx0YWJsZT48L3RhYmxlPjxhPjwvdHI+PGE+PC90YWJsZT48Yj5YPC9iPkM8YT5Z CiBHb3Q6CkBAIC0zNTksNiArMzQxLDggQEAgR290OgogfCAgICAgPG9wdGdyb3VwPgogfCAgICAg ICAiQyIKIHwgICAgICAgPHNlbGVjdD4KK3wgICAgICAgICAiRCIKK3wgICAgICAgICAiRSIKIEV4 cGVjdGVkOgogfCA8IURPQ1RZUEUgaHRtbD4KIHwgPGh0bWw+CkBAIC0xMjUwLDIxICsxMjM0LDYg QEAgRXhwZWN0ZWQ6CiB8ICAgICA8aHI+CiB8ICAgICA8cD4KIAotVGVzdCAxMDEgb2YgMTEzIGlu IHJlc291cmNlcy90ZXN0czEuZGF0IGZhaWxlZC4gSW5wdXQ6Ci08c2VsZWN0PjxiPjxvcHRpb24+ PHNlbGVjdD48b3B0aW9uPjwvYj48L3NlbGVjdD4KLUdvdDoKLXwgPGh0bWw+Ci18ICAgPGhlYWQ+ Ci18ICAgPGJvZHk+Ci18ICAgICA8c2VsZWN0PgotRXhwZWN0ZWQ6Ci18IDxodG1sPgotfCAgIDxo ZWFkPgotfCAgIDxib2R5PgotfCAgICAgPHNlbGVjdD4KLXwgICAgICAgPG9wdGlvbj4KLXwgICAg IDxvcHRpb24+Ci0KIFRlc3QgMTAzIG9mIDExMyBpbiByZXNvdXJjZXMvdGVzdHMxLmRhdCBmYWls ZWQuIElucHV0OgogPGE+PHRhYmxlPjx0ZD48YT48dGFibGU+PC90YWJsZT48YT48L3RyPjxhPjwv dGFibGU+PGE+CiBHb3Q6CkBAIC0xNDgxLDEyICsxNDUwLDkgQEAgcmVzb3VyY2VzL3Rlc3RzMi5k YXQ6CiAxMwogMzIKIDM0Ci0zNQogMzYKLTM3CiAzOAogNDIKLTQ2CiA0NwogNDgKIDQ5CkBAIC0x NjMyLDIzICsxNTk4LDYgQEAgRXhwZWN0ZWQ6CiB8ICAgICAgICAgICA8dGQ+CiB8ICAgICAgICAg ICAgICJ0ZXN0IgogCi1UZXN0IDM1IG9mIDU5IGluIHJlc291cmNlcy90ZXN0czIuZGF0IGZhaWxl ZC4gSW5wdXQ6Ci08IURPQ1RZUEUgaHRtbD48c2VsZWN0PjxvcHRpb24+PG9wdGdyb3VwPgotR290 OgotfCA8IURPQ1RZUEUgaHRtbD4KLXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18ICAgPGJvZHk+Ci18 ICAgICA8c2VsZWN0PgotRXhwZWN0ZWQ6Ci18IDwhRE9DVFlQRSBodG1sPgotfCA8aHRtbD4KLXwg ICA8aGVhZD4KLXwgICA8Ym9keT4KLXwgICAgIDxzZWxlY3Q+Ci18ICAgICAgIDxvcHRpb24+Ci18 ICAgICAgIDxvcHRncm91cD4KLQogVGVzdCAzNiBvZiA1OSBpbiByZXNvdXJjZXMvdGVzdHMyLmRh dCBmYWlsZWQuIElucHV0OgogPCFET0NUWVBFIGh0bWw+PHNlbGVjdD48b3B0Z3JvdXA+PG9wdGlv bj48L29wdGdyb3VwPjxvcHRpb24+PHNlbGVjdD48b3B0aW9uPgogR290OgpAQCAtMTY1NywyNSAr MTYwNiwxMCBAQCBHb3Q6CiB8ICAgPGhlYWQ+CiB8ICAgPGJvZHk+CiB8ICAgICA8c2VsZWN0Pgot RXhwZWN0ZWQ6Ci18IDwhRE9DVFlQRSBodG1sPgotfCA8aHRtbD4KLXwgICA8aGVhZD4KLXwgICA8 Ym9keT4KLXwgICAgIDxzZWxlY3Q+CiB8ICAgICAgIDxvcHRncm91cD4KIHwgICAgICAgICA8b3B0 aW9uPgotfCAgICAgICA8b3B0aW9uPgorfCAgICAgICAgIDxvcHRpb24+CiB8ICAgICA8b3B0aW9u PgotCi1UZXN0IDM3IG9mIDU5IGluIHJlc291cmNlcy90ZXN0czIuZGF0IGZhaWxlZC4gSW5wdXQ6 Ci08IURPQ1RZUEUgaHRtbD48c2VsZWN0PjxvcHRncm91cD48b3B0aW9uPjxvcHRncm91cD4KLUdv dDoKLXwgPCFET0NUWVBFIGh0bWw+Ci18IDxodG1sPgotfCAgIDxoZWFkPgotfCAgIDxib2R5Pgot fCAgICAgPHNlbGVjdD4KIEV4cGVjdGVkOgogfCA8IURPQ1RZUEUgaHRtbD4KIHwgPGh0bWw+CkBA IC0xNjg0LDcgKzE2MTgsOCBAQCBFeHBlY3RlZDoKIHwgICAgIDxzZWxlY3Q+CiB8ICAgICAgIDxv cHRncm91cD4KIHwgICAgICAgICA8b3B0aW9uPgotfCAgICAgICA8b3B0Z3JvdXA+Cit8ICAgICAg IDxvcHRpb24+Cit8ICAgICA8b3B0aW9uPgogCiBUZXN0IDM4IG9mIDU5IGluIHJlc291cmNlcy90 ZXN0czIuZGF0IGZhaWxlZC4gSW5wdXQ6CiA8IURPQ1RZUEUgaHRtbD48Zm9udD48aW5wdXQ+PGlu cHV0PjwvZm9udD4KQEAgLTE3MjYsMjIgKzE2NjEsNiBAQCBFeHBlY3RlZDoKIHwgICAgICAgICAg IHRlc3Q9IngiCiB8ICAgICAgIDxocj4KIAotVGVzdCA0NiBvZiA1OSBpbiByZXNvdXJjZXMvdGVz dHMyLmRhdCBmYWlsZWQuIElucHV0OgotPCFET0NUWVBFIGh0bWw+PHNlbGVjdD48b3B0Z3JvdXA+ PC9vcHRncm91cD48L3NlbGVjdD4KLUdvdDoKLXwgPCFET0NUWVBFIGh0bWw+Ci18IDxodG1sPgot fCAgIDxoZWFkPgotfCAgIDxib2R5PgotfCAgICAgPHNlbGVjdD4KLUV4cGVjdGVkOgotfCA8IURP Q1RZUEUgaHRtbD4KLXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18ICAgPGJvZHk+Ci18ICAgICA8c2Vs ZWN0PgotfCAgICAgICA8b3B0Z3JvdXA+Ci0KIFRlc3QgNDcgb2YgNTkgaW4gcmVzb3VyY2VzL3Rl c3RzMi5kYXQgZmFpbGVkLiBJbnB1dDoKICAKICAKQEAgLTI0OTEsMTUgKzI0MTAsMTIgQEAgcmVz b3VyY2VzL3Rlc3RzNy5kYXQ6CiA4CiA5CiAxMAotMTMKLTE0CiAxNQogMTYKIDE3CiAxOAogMTkK IDIwCi0yMQogMjQKIDI1CiAyNgpAQCAtMjYzNSwzOSArMjU1MSw2IEBAIEV4cGVjdGVkOgogfCAg ICAgICAgICAgIiA8dHI+eCAiCiB8ICAgICAgICAgIiAiCiAKLVRlc3QgMTMgb2YgMzAgaW4gcmVz b3VyY2VzL3Rlc3RzNy5kYXQgZmFpbGVkLiBJbnB1dDoKLTwhZG9jdHlwZSBodG1sPjxzZWxlY3Q+ PGlucHV0PlgKLUdvdDoKLXwgPCFET0NUWVBFIGh0bWw+Ci18IDxodG1sPgotfCAgIDxoZWFkPgot fCAgIDxib2R5PgotfCAgICAgPHNlbGVjdD4KLUV4cGVjdGVkOgotfCA8IURPQ1RZUEUgaHRtbD4K LXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18ICAgPGJvZHk+Ci18ICAgICA8c2VsZWN0PgotfCAgICAg PGlucHV0PgotfCAgICAgIlgiCi0KLVRlc3QgMTQgb2YgMzAgaW4gcmVzb3VyY2VzL3Rlc3RzNy5k YXQgZmFpbGVkLiBJbnB1dDoKLTwhZG9jdHlwZSBodG1sPjxzZWxlY3Q+PHNlbGVjdD5YCi1Hb3Q6 Ci18IDwhRE9DVFlQRSBodG1sPgotfCA8aHRtbD4KLXwgICA8aGVhZD4KLXwgICA8Ym9keT4KLXwg ICAgIDxzZWxlY3Q+Ci1FeHBlY3RlZDoKLXwgPCFET0NUWVBFIGh0bWw+Ci18IDxodG1sPgotfCAg IDxoZWFkPgotfCAgIDxib2R5PgotfCAgICAgPHNlbGVjdD4KLXwgICAgICJYIgotCiBUZXN0IDE1 IG9mIDMwIGluIHJlc291cmNlcy90ZXN0czcuZGF0IGZhaWxlZC4gSW5wdXQ6CiA8IWRvY3R5cGUg aHRtbD48dGFibGU+PGlucHV0IHR5cGU9aGlkREVOPjwvdGFibGU+CiBHb3Q6CkBAIC0yNzc5LDIy ICsyNjYyLDYgQEAgRXhwZWN0ZWQ6CiB8ICAgICAgIDx0Ym9keT4KIHwgICAgICAgICA8dHI+CiAK LVRlc3QgMjEgb2YgMzAgaW4gcmVzb3VyY2VzL3Rlc3RzNy5kYXQgZmFpbGVkLiBJbnB1dDoKLTwh ZG9jdHlwZSBodG1sPjxzZWxlY3Q+WDwvc2VsZWN0PgotR290OgotfCA8IURPQ1RZUEUgaHRtbD4K LXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18ICAgPGJvZHk+Ci18ICAgICA8c2VsZWN0PgotRXhwZWN0 ZWQ6Ci18IDwhRE9DVFlQRSBodG1sPgotfCA8aHRtbD4KLXwgICA8aGVhZD4KLXwgICA8Ym9keT4K LXwgICAgIDxzZWxlY3Q+Ci18ICAgICAgICJYIgotCiBUZXN0IDI0IG9mIDMwIGluIHJlc291cmNl cy90ZXN0czcuZGF0IGZhaWxlZC4gSW5wdXQ6CiA8Ym9keT5YPC9ib2R5PjwvYm9keT4KIEdvdDoK QEAgLTI5MTQsNiArMjc4MSwxMyBAQCBHb3Q6CiB8ICAgPGhlYWQ+CiB8ICAgPGJvZHk+CiB8ICAg ICA8c2VsZWN0PgorfCAgICAgPGtleWdlbj4KK3wgICAgICAgPG9wdGlvbj4KK3wgICAgICAgICAi MjA0OCAoSGlnaCBHcmFkZSkiCit8ICAgICAgIDxvcHRpb24+Cit8ICAgICAgICAgIjEwMjQgKE1l ZGl1bSBHcmFkZSkiCit8ICAgICAgIDxvcHRpb24+Cit8ICAgICAgICAgIjUxMiAoTG93IEdyYWRl KSIKIEV4cGVjdGVkOgogfCA8aHRtbD4KIHwgICA8aGVhZD4KQEAgLTMxMTQsNyArMjk4OCw2IEBA IEV4cGVjdGVkOgogcmVzb3VyY2VzL3Rlc3RzOS5kYXQ6CiAxCiAyCi00CiA1CiA2CiA3CkBAIC0z MTY1LDIyICszMDM4LDYgQEAgRXhwZWN0ZWQ6CiB8ICAgPGJvZHk+CiB8ICAgICA8bWF0aCBtYXRo PgogCi1UZXN0IDQgb2YgMjUgaW4gcmVzb3VyY2VzL3Rlc3RzOS5kYXQgZmFpbGVkLiBJbnB1dDoK LTwhRE9DVFlQRSBodG1sPjxib2R5PjxzZWxlY3Q+PG9wdGlvbj48bWF0aD48L21hdGg+PC9vcHRp b24+PC9zZWxlY3Q+Ci1Hb3Q6Ci18IDwhRE9DVFlQRSBodG1sPgotfCA8aHRtbD4KLXwgICA8aGVh ZD4KLXwgICA8Ym9keT4KLXwgICAgIDxzZWxlY3Q+Ci1FeHBlY3RlZDoKLXwgPCFET0NUWVBFIGh0 bWw+Ci18IDxodG1sPgotfCAgIDxoZWFkPgotfCAgIDxib2R5PgotfCAgICAgPHNlbGVjdD4KLXwg ICAgICAgPG9wdGlvbj4KLQogVGVzdCA1IG9mIDI1IGluIHJlc291cmNlcy90ZXN0czkuZGF0IGZh aWxlZC4gSW5wdXQ6CiA8IURPQ1RZUEUgaHRtbD48Ym9keT48dGFibGU+PG1hdGg+PC9tYXRoPjwv dGFibGU+CiBHb3Q6CkBAIC0zNjM0LDcgKzM0OTEsNiBAQCBFeHBlY3RlZDoKIHJlc291cmNlcy90 ZXN0czEwLmRhdDoKIDEKIDIKLTQKIDUKIDYKIDcKQEAgLTM2ODUsMjIgKzM1NDEsNiBAQCBFeHBl Y3RlZDoKIHwgICA8Ym9keT4KIHwgICAgIDxzdmcgc3ZnPgogCi1UZXN0IDQgb2YgMjUgaW4gcmVz b3VyY2VzL3Rlc3RzMTAuZGF0IGZhaWxlZC4gSW5wdXQ6Ci08IURPQ1RZUEUgaHRtbD48Ym9keT48 c2VsZWN0PjxvcHRpb24+PHN2Zz48L3N2Zz48L29wdGlvbj48L3NlbGVjdD4KLUdvdDoKLXwgPCFE T0NUWVBFIGh0bWw+Ci18IDxodG1sPgotfCAgIDxoZWFkPgotfCAgIDxib2R5PgotfCAgICAgPHNl bGVjdD4KLUV4cGVjdGVkOgotfCA8IURPQ1RZUEUgaHRtbD4KLXwgPGh0bWw+Ci18ICAgPGhlYWQ+ Ci18ICAgPGJvZHk+Ci18ICAgICA8c2VsZWN0PgotfCAgICAgICA8b3B0aW9uPgotCiBUZXN0IDUg b2YgMjUgaW4gcmVzb3VyY2VzL3Rlc3RzMTAuZGF0IGZhaWxlZC4gSW5wdXQ6CiA8IURPQ1RZUEUg aHRtbD48Ym9keT48dGFibGU+PHN2Zz48L3N2Zz48L3RhYmxlPgogR290OgpAQCAtNTQ2OCw3ICs1 MzA4LDYgQEAgRXhwZWN0ZWQ6CiB8ICAgICAgICAgPGZvcm0+CiByZXNvdXJjZXMvd2Via2l0MDEu ZGF0OgogMTcKLTMxCiAKIFRlc3QgMTcgb2YgMzEgaW4gcmVzb3VyY2VzL3dlYmtpdDAxLmRhdCBm YWlsZWQuIElucHV0OgogPEE+dGVzdDwgL0E+CkBAIC01NDg1LDM2ICs1MzI0LDYgQEAgRXhwZWN0 ZWQ6CiB8ICAgPGJvZHk+CiB8ICAgICA8YT4KIHwgICAgICAgInRlc3Q8IC9BPiIKLQotVGVzdCAz MSBvZiAzMSBpbiByZXNvdXJjZXMvd2Via2l0MDEuZGF0IGZhaWxlZC4gSW5wdXQ6Ci08c2VsZWN0 PjxvcHRpb24+QTxzZWxlY3Q+PG9wdGlvbj5CPHNlbGVjdD48b3B0aW9uPkM8c2VsZWN0PjxvcHRp b24+RDxzZWxlY3Q+PG9wdGlvbj5FPHNlbGVjdD48b3B0aW9uPkY8c2VsZWN0PjxvcHRpb24+Rzxz ZWxlY3Q+Ci1Hb3Q6Ci18IDxodG1sPgotfCAgIDxoZWFkPgotfCAgIDxib2R5PgotfCAgICAgPHNl bGVjdD4KLUV4cGVjdGVkOgotfCA8aHRtbD4KLXwgICA8aGVhZD4KLXwgICA8Ym9keT4KLXwgICAg IDxzZWxlY3Q+Ci18ICAgICAgIDxvcHRpb24+Ci18ICAgICAgICAgIkEiCi18ICAgICA8b3B0aW9u PgotfCAgICAgICAiQiIKLXwgICAgICAgPHNlbGVjdD4KLXwgICAgICAgICA8b3B0aW9uPgotfCAg ICAgICAgICAgIkMiCi18ICAgICA8b3B0aW9uPgotfCAgICAgICAiRCIKLXwgICAgICAgPHNlbGVj dD4KLXwgICAgICAgICA8b3B0aW9uPgotfCAgICAgICAgICAgIkUiCi18ICAgICA8b3B0aW9uPgot fCAgICAgICAiRiIKLXwgICAgICAgPHNlbGVjdD4KLXwgICAgICAgICA8b3B0aW9uPgotfCAgICAg ICAgICAgIkciCiByZXNvdXJjZXMvZG9jdHlwZTAxLmRhdDogUEFTUwogCiByZXNvdXJjZXMvc2Ny aXB0ZGF0YTAxLmRhdDogUEFTUwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJD b3JlL0NoYW5nZUxvZwppbmRleCA4NTU2NDlmNDdjNTQ0ZWY4NDQwMTNmZjE0NWIzMjY5NTVmOTkx ZWYwLi5lYTM4NTcwYmY1YzU0NDg5Y2MwMjE5ZWNkZTNiZGYzYTQxYjllYWQ2IDEwMDY0NAotLS0g YS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDEwLTA3LTA1ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW1wbGVtZW50IEluU2Vs ZWN0TW9kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NDE2MjcKKworICAgICAgICAqIGh0bWwvSFRNTFRyZWVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc1N0YXJ0VGFnKToKKyAgICAgICAgKFdlYkNv cmU6OkhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc0VuZFRhZyk6CisgICAgICAgIChXZWJDb3JlOjpI VE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NDaGFyYWN0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6SFRN TFRyZWVCdWlsZGVyOjpwcm9jZXNzRW5kT2ZGaWxlKToKKwogMjAxMC0wNy0wNSAgRmFkeSBTYW11 ZWwgIDxmc2FtdWVsQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBB ZGxlci4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1MVHJlZUJ1aWxkZXIuY3BwIGIvV2Vi Q29yZS9odG1sL0hUTUxUcmVlQnVpbGRlci5jcHAKaW5kZXggM2QwOGE0NjVmZTQ0OThiODhmNDNi ZDg2YzZjOTVlNzhhOTRmNGEzYi4uNjNjNDQ0ZmEzMjE1ODU5OWZjYmE4YTc5OGY1MWRmYWJhMDAy OWEzZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9odG1sL0hUTUxUcmVlQnVpbGRlci5jcHAKKysrIGIv V2ViQ29yZS9odG1sL0hUTUxUcmVlQnVpbGRlci5jcHAKQEAgLTg5OSw2ICs4OTksNTAgQEAgdm9p ZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NTdGFydFRhZyhBdG9taWNIVE1MVG9rZW4mIHRva2Vu KQogICAgICAgICB9CiAgICAgICAgIHBhcnNlRXJyb3IodG9rZW4pOwogICAgICAgICBicmVhazsK KyAgICBjYXNlIEluU2VsZWN0TW9kZToKKyAgICAgICAgQVNTRVJUKGluc2VydGlvbk1vZGUoKSA9 PSBJblNlbGVjdE1vZGUpOworICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09IGh0bWxUYWcpIHsK KyAgICAgICAgICAgIGluc2VydEhUTUxTdGFydFRhZ0luQm9keSh0b2tlbik7CisgICAgICAgICAg ICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgaWYgKHRva2VuLm5hbWUoKSA9PSBvcHRpb25U YWcpIHsKKyAgICAgICAgICAgIGlmIChjdXJyZW50RWxlbWVudCgpLT5oYXNUYWdOYW1lKG9wdGlv blRhZykpIHsKKyAgICAgICAgICAgICAgICBBdG9taWNIVE1MVG9rZW4gZW5kT3B0aW9uKEhUTUxU b2tlbjo6RW5kVGFnLCBvcHRpb25UYWcubG9jYWxOYW1lKCkpOworICAgICAgICAgICAgICAgIHBy b2Nlc3NFbmRUYWcoZW5kT3B0aW9uKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGluc2Vy dEVsZW1lbnQodG9rZW4pOworICAgICAgICB9CisgICAgICAgIGlmICh0b2tlbi5uYW1lKCkgPT0g b3B0Z3JvdXBUYWcpIHsKKyAgICAgICAgICAgIGlmIChjdXJyZW50RWxlbWVudCgpLT5oYXNUYWdO YW1lKG9wdGlvblRhZykpIHsKKyAgICAgICAgICAgICAgICBBdG9taWNIVE1MVG9rZW4gZW5kT3B0 aW9uKEhUTUxUb2tlbjo6RW5kVGFnLCBvcHRpb25UYWcubG9jYWxOYW1lKCkpOworICAgICAgICAg ICAgICAgIHByb2Nlc3NFbmRUYWcoZW5kT3B0aW9uKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAg ICAgIGlmIChjdXJyZW50RWxlbWVudCgpLT5oYXNUYWdOYW1lKG9wdGdyb3VwVGFnKSkgeworICAg ICAgICAgICAgICAgIEF0b21pY0hUTUxUb2tlbiBlbmRPcHRncm91cChIVE1MVG9rZW46OkVuZFRh Zywgb3B0Z3JvdXBUYWcubG9jYWxOYW1lKCkpOworICAgICAgICAgICAgICAgIHByb2Nlc3NFbmRU YWcoZW5kT3B0Z3JvdXApOworICAgICAgICAgICAgfQorICAgICAgICAgICAgaW5zZXJ0RWxlbWVu dCh0b2tlbik7CisgICAgICAgIH0KKyAgICAgICAgaWYgKHRva2VuLm5hbWUoKSA9PSBzZWxlY3RU YWcpIHsKKyAgICAgICAgICAgIHBhcnNlRXJyb3IodG9rZW4pOworICAgICAgICAgICAgQXRvbWlj SFRNTFRva2VuIGVuZFNlbGVjdChIVE1MVG9rZW46OkVuZFRhZywgc2VsZWN0VGFnLmxvY2FsTmFt ZSgpKTsKKyAgICAgICAgICAgIHByb2Nlc3NFbmRUYWcoZW5kU2VsZWN0KTsKKyAgICAgICAgICAg IHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09IGlucHV0VGFn IHx8IHRva2VuLm5hbWUoKSA9PSBrZXlnZW5UYWcgfHwgdG9rZW4ubmFtZSgpID09IHRleHRhcmVh VGFnKSB7CisgICAgICAgICAgICBwYXJzZUVycm9yKHRva2VuKTsKKyAgICAgICAgICAgIG5vdElt cGxlbWVudGVkKCk7IC8vIGZyYWdtZW50IGNhc2UKKyAgICAgICAgICAgIEF0b21pY0hUTUxUb2tl biBlbmRTZWxlY3QoSFRNTFRva2VuOjpFbmRUYWcsIHNlbGVjdFRhZy5sb2NhbE5hbWUoKSk7Cisg ICAgICAgICAgICBwcm9jZXNzRW5kVGFnKGVuZFNlbGVjdCk7CisgICAgICAgICAgICBwcm9jZXNz U3RhcnRUYWcodG9rZW4pOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAg IGlmICh0b2tlbi5uYW1lKCkgPT0gc2NyaXB0VGFnKSB7CisgICAgICAgICAgICBib29sIGRpZFBy b2Nlc3MgPSBwcm9jZXNzU3RhcnRUYWdGb3JJbkhlYWQodG9rZW4pOworICAgICAgICAgICAgQVNT RVJUX1VOVVNFRChkaWRQcm9jZXNzLCBkaWRQcm9jZXNzKTsKKyAgICAgICAgICAgIHJldHVybjsK KyAgICAgICAgfQorICAgICAgICBicmVhazsKICAgICBkZWZhdWx0OgogICAgICAgICBub3RJbXBs ZW1lbnRlZCgpOwogICAgIH0KQEAgLTE0MTYsNiArMTQ2MCwzNCBAQCB2b2lkIEhUTUxUcmVlQnVp bGRlcjo6cHJvY2Vzc0VuZFRhZyhBdG9taWNIVE1MVG9rZW4mIHRva2VuKQogICAgICAgICBBU1NF UlQoaW5zZXJ0aW9uTW9kZSgpID09IEFmdGVyRnJhbWVzZXRNb2RlIHx8IGluc2VydGlvbk1vZGUo KSA9PSBBZnRlckFmdGVyRnJhbWVzZXRNb2RlKTsKICAgICAgICAgcGFyc2VFcnJvcih0b2tlbik7 CiAgICAgICAgIGJyZWFrOworICAgIGNhc2UgSW5TZWxlY3RNb2RlOgorICAgICAgICBBU1NFUlQo aW5zZXJ0aW9uTW9kZSgpID09IEluU2VsZWN0TW9kZSk7CisgICAgICAgIGlmICh0b2tlbi5uYW1l KCkgPT0gb3B0Z3JvdXBUYWcpIHsKKyAgICAgICAgICAgIGlmIChjdXJyZW50RWxlbWVudCgpLT5o YXNUYWdOYW1lKG9wdGlvblRhZykpCisgICAgICAgICAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsK KyAgICAgICAgICAgIGlmIChjdXJyZW50RWxlbWVudCgpLT5oYXNUYWdOYW1lKG9wdGdyb3VwVGFn KSkgeworICAgICAgICAgICAgICAgIG1fb3BlbkVsZW1lbnRzLnBvcCgpOworICAgICAgICAgICAg ICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIHBhcnNlRXJyb3IodG9rZW4p OworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAgIGlmICh0b2tlbi5uYW1l KCkgPT0gb3B0aW9uVGFnKSB7CisgICAgICAgICAgICBpZiAoY3VycmVudEVsZW1lbnQoKS0+aGFz VGFnTmFtZShvcHRpb25UYWcpKSB7CisgICAgICAgICAgICAgICAgbV9vcGVuRWxlbWVudHMucG9w KCk7CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgfQorICAgICAgICAgICAg cGFyc2VFcnJvcih0b2tlbik7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAg ICAgaWYgKHRva2VuLm5hbWUoKSA9PSBzZWxlY3RUYWcpIHsKKyAgICAgICAgICAgIG5vdEltcGxl bWVudGVkKCk7IC8vIGZyYWdtZW50IGNhc2UKKyAgICAgICAgICAgIG1fb3BlbkVsZW1lbnRzLnBv cFVudGlsKHNlbGVjdFRhZy5sb2NhbE5hbWUoKSk7CisgICAgICAgICAgICBtX29wZW5FbGVtZW50 cy5wb3AoKTsKKyAgICAgICAgICAgIHJlc2V0SW5zZXJ0aW9uTW9kZUFwcHJvcHJpYXRlbHkoKTsK KyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBicmVhazsKICAgICBkZWZh dWx0OgogICAgICAgICBub3RJbXBsZW1lbnRlZCgpOwogICAgIH0KQEAgLTE0OTAsNiArMTU2Miwx MCBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc0NoYXJhY3RlcihBdG9taWNIVE1MVG9r ZW4mIHRva2VuKQogICAgICAgICBBU1NFUlQoaW5zZXJ0aW9uTW9kZSgpID09IEluRnJhbWVzZXRN b2RlIHx8IGluc2VydGlvbk1vZGUoKSA9PSBBZnRlckZyYW1lc2V0TW9kZSB8fCBpbnNlcnRpb25N b2RlKCkgPT0gQWZ0ZXJBZnRlckZyYW1lc2V0TW9kZSk7CiAgICAgICAgIHBhcnNlRXJyb3IodG9r ZW4pOwogICAgICAgICBicmVhazsKKyAgICBjYXNlIEluU2VsZWN0TW9kZToKKyAgICAgICAgQVNT RVJUKGluc2VydGlvbk1vZGUoKSA9PSBJblNlbGVjdE1vZGUpOworICAgICAgICBpbnNlcnRUZXh0 Tm9kZSh0b2tlbik7CisgICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIG5vdElt cGxlbWVudGVkKCk7CiAgICAgfQpAQCAtMTU0MSw2ICsxNjE3LDExIEBAIHZvaWQgSFRNTFRyZWVC dWlsZGVyOjpwcm9jZXNzRW5kT2ZGaWxlKEF0b21pY0hUTUxUb2tlbiYgdG9rZW4pCiAgICAgY2Fz ZSBBZnRlckFmdGVyRnJhbWVzZXRNb2RlOgogICAgICAgICBBU1NFUlQoaW5zZXJ0aW9uTW9kZSgp ID09IEFmdGVyRnJhbWVzZXRNb2RlIHx8IGluc2VydGlvbk1vZGUoKSA9PSBBZnRlckFmdGVyRnJh bWVzZXRNb2RlKTsKICAgICAgICAgYnJlYWs7CisgICAgY2FzZSBJblNlbGVjdE1vZGU6CisgICAg ICAgIEFTU0VSVChpbnNlcnRpb25Nb2RlKCkgPT0gSW5TZWxlY3RNb2RlKTsKKyAgICAgICAgaWYg KGN1cnJlbnRFbGVtZW50KCkgIT0gbV9vcGVuRWxlbWVudHMuaHRtbEVsZW1lbnQoKSkKKyAgICAg ICAgICAgIHBhcnNlRXJyb3IodG9rZW4pOworICAgICAgICBicmVhazsKICAgICBkZWZhdWx0Ogog ICAgICAgICBub3RJbXBsZW1lbnRlZCgpOwogICAgIH0K 60578 2010-07-05 21:03:07 -0700 2010-07-05 21:58:29 -0700 Patch for landing bug-41627-20100705210306.patch text/plain 12438 abarth ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA4ZGRhZGE5MDZlMzFhN2Q4YjcyN2FhN2Y4YzdjMWY0NzU5NzJmNTEwLi42OGY0ODZk MzY5ZTM2ZjIxZTcxNmM0YjUxNDRiN2FlNmIzZDI5MjRhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTYgQEAK IDIwMTAtMDctMDUgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAorICAgICAgICBS ZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KKworICAgICAgICBJbXBsZW1lbnQgSW5TZWxlY3RNb2Rl CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MTYyNwor CisgICAgICAgIE1hc3NpdmUgdGVzdCBwcm9ncmVzc2lvbi4KKworICAgICAgICAqIGh0bWw1bGli L3J1bm5lci1leHBlY3RlZC1odG1sNS50eHQ6CisKKzIwMTAtMDctMDUgIEFkYW0gQmFydGggIDxh YmFydGhAd2Via2l0Lm9yZz4KKwogICAgICAgICBVbnJldmlld2VkLgogCiAgICAgICAgIFdlIHdl cmUgZGlzY3Vzc2luZyB0aGlzIHRlc3QgY2FzZSwgc28gSSBmaWd1cmVkIEkgbWlnaHQgYXMgd2Vs bCBhZGQgaXQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0bWw1bGliL3J1bm5lci1leHBlY3Rl ZC1odG1sNS50eHQgYi9MYXlvdXRUZXN0cy9odG1sNWxpYi9ydW5uZXItZXhwZWN0ZWQtaHRtbDUu dHh0CmluZGV4IGVhMWZkN2QxMTA2M2I5MDVlODhmYTJjNjM1MGFiMmY5ZTZlM2NjMzMuLmRkNjBi MzQzM2UwZDUxNTlhNzc0MzNkOGZiNWNiYzkwZjBiZGI2YTcgMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL2h0bWw1bGliL3J1bm5lci1leHBlY3RlZC1odG1sNS50eHQKKysrIGIvTGF5b3V0VGVzdHMv aHRtbDVsaWIvcnVubmVyLWV4cGVjdGVkLWh0bWw1LnR4dApAQCAtMTAsNyArMTAsNiBAQCByZXNv dXJjZXMvdGVzdHMxLmRhdDoKIDI0CiAyNQogMjgKLTI5CiAzMAogMzEKIDMyCkBAIC00OSw3ICs0 OCw2IEBAIHJlc291cmNlcy90ZXN0czEuZGF0OgogOTcKIDk4CiAxMDAKLTEwMQogMTAzCiAxMDQK IDEwNwpAQCAtMjAzLDIyICsyMDEsNiBAQCBFeHBlY3RlZDoKIHwgICAgIDxocj4KIHwgICAgIDxw PgogCi1UZXN0IDI5IG9mIDExMyBpbiByZXNvdXJjZXMvdGVzdHMxLmRhdCBmYWlsZWQuIElucHV0 OgotPHNlbGVjdD48Yj48b3B0aW9uPjxzZWxlY3Q+PG9wdGlvbj48L2I+PC9zZWxlY3Q+WAotR290 OgotfCA8aHRtbD4KLXwgICA8aGVhZD4KLXwgICA8Ym9keT4KLXwgICAgIDxzZWxlY3Q+Ci1FeHBl Y3RlZDoKLXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18ICAgPGJvZHk+Ci18ICAgICA8c2VsZWN0Pgot fCAgICAgICA8b3B0aW9uPgotfCAgICAgPG9wdGlvbj4KLXwgICAgICAgIlgiCi0KIFRlc3QgMzAg b2YgMTEzIGluIHJlc291cmNlcy90ZXN0czEuZGF0IGZhaWxlZC4gSW5wdXQ6CiA8YT48dGFibGU+ PHRkPjxhPjx0YWJsZT48L3RhYmxlPjxhPjwvdHI+PGE+PC90YWJsZT48Yj5YPC9iPkM8YT5ZCiBH b3Q6CkBAIC0zNTksNiArMzQxLDggQEAgR290OgogfCAgICAgPG9wdGdyb3VwPgogfCAgICAgICAi QyIKIHwgICAgICAgPHNlbGVjdD4KK3wgICAgICAgICAiRCIKK3wgICAgICAgICAiRSIKIEV4cGVj dGVkOgogfCA8IURPQ1RZUEUgaHRtbD4KIHwgPGh0bWw+CkBAIC0xMjUwLDIxICsxMjM0LDYgQEAg RXhwZWN0ZWQ6CiB8ICAgICA8aHI+CiB8ICAgICA8cD4KIAotVGVzdCAxMDEgb2YgMTEzIGluIHJl c291cmNlcy90ZXN0czEuZGF0IGZhaWxlZC4gSW5wdXQ6Ci08c2VsZWN0PjxiPjxvcHRpb24+PHNl bGVjdD48b3B0aW9uPjwvYj48L3NlbGVjdD4KLUdvdDoKLXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18 ICAgPGJvZHk+Ci18ICAgICA8c2VsZWN0PgotRXhwZWN0ZWQ6Ci18IDxodG1sPgotfCAgIDxoZWFk PgotfCAgIDxib2R5PgotfCAgICAgPHNlbGVjdD4KLXwgICAgICAgPG9wdGlvbj4KLXwgICAgIDxv cHRpb24+Ci0KIFRlc3QgMTAzIG9mIDExMyBpbiByZXNvdXJjZXMvdGVzdHMxLmRhdCBmYWlsZWQu IElucHV0OgogPGE+PHRhYmxlPjx0ZD48YT48dGFibGU+PC90YWJsZT48YT48L3RyPjxhPjwvdGFi bGU+PGE+CiBHb3Q6CkBAIC0xNDgxLDEyICsxNDUwLDkgQEAgcmVzb3VyY2VzL3Rlc3RzMi5kYXQ6 CiAxMwogMzIKIDM0Ci0zNQogMzYKLTM3CiAzOAogNDIKLTQ2CiA0NwogNDgKIDQ5CkBAIC0xNjMy LDIzICsxNTk4LDYgQEAgRXhwZWN0ZWQ6CiB8ICAgICAgICAgICA8dGQ+CiB8ICAgICAgICAgICAg ICJ0ZXN0IgogCi1UZXN0IDM1IG9mIDU5IGluIHJlc291cmNlcy90ZXN0czIuZGF0IGZhaWxlZC4g SW5wdXQ6Ci08IURPQ1RZUEUgaHRtbD48c2VsZWN0PjxvcHRpb24+PG9wdGdyb3VwPgotR290Ogot fCA8IURPQ1RZUEUgaHRtbD4KLXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18ICAgPGJvZHk+Ci18ICAg ICA8c2VsZWN0PgotRXhwZWN0ZWQ6Ci18IDwhRE9DVFlQRSBodG1sPgotfCA8aHRtbD4KLXwgICA8 aGVhZD4KLXwgICA8Ym9keT4KLXwgICAgIDxzZWxlY3Q+Ci18ICAgICAgIDxvcHRpb24+Ci18ICAg ICAgIDxvcHRncm91cD4KLQogVGVzdCAzNiBvZiA1OSBpbiByZXNvdXJjZXMvdGVzdHMyLmRhdCBm YWlsZWQuIElucHV0OgogPCFET0NUWVBFIGh0bWw+PHNlbGVjdD48b3B0Z3JvdXA+PG9wdGlvbj48 L29wdGdyb3VwPjxvcHRpb24+PHNlbGVjdD48b3B0aW9uPgogR290OgpAQCAtMTY1NywyNSArMTYw NiwxMCBAQCBHb3Q6CiB8ICAgPGhlYWQ+CiB8ICAgPGJvZHk+CiB8ICAgICA8c2VsZWN0PgotRXhw ZWN0ZWQ6Ci18IDwhRE9DVFlQRSBodG1sPgotfCA8aHRtbD4KLXwgICA8aGVhZD4KLXwgICA8Ym9k eT4KLXwgICAgIDxzZWxlY3Q+CiB8ICAgICAgIDxvcHRncm91cD4KIHwgICAgICAgICA8b3B0aW9u PgotfCAgICAgICA8b3B0aW9uPgorfCAgICAgICAgIDxvcHRpb24+CiB8ICAgICA8b3B0aW9uPgot Ci1UZXN0IDM3IG9mIDU5IGluIHJlc291cmNlcy90ZXN0czIuZGF0IGZhaWxlZC4gSW5wdXQ6Ci08 IURPQ1RZUEUgaHRtbD48c2VsZWN0PjxvcHRncm91cD48b3B0aW9uPjxvcHRncm91cD4KLUdvdDoK LXwgPCFET0NUWVBFIGh0bWw+Ci18IDxodG1sPgotfCAgIDxoZWFkPgotfCAgIDxib2R5PgotfCAg ICAgPHNlbGVjdD4KIEV4cGVjdGVkOgogfCA8IURPQ1RZUEUgaHRtbD4KIHwgPGh0bWw+CkBAIC0x Njg0LDcgKzE2MTgsOCBAQCBFeHBlY3RlZDoKIHwgICAgIDxzZWxlY3Q+CiB8ICAgICAgIDxvcHRn cm91cD4KIHwgICAgICAgICA8b3B0aW9uPgotfCAgICAgICA8b3B0Z3JvdXA+Cit8ICAgICAgIDxv cHRpb24+Cit8ICAgICA8b3B0aW9uPgogCiBUZXN0IDM4IG9mIDU5IGluIHJlc291cmNlcy90ZXN0 czIuZGF0IGZhaWxlZC4gSW5wdXQ6CiA8IURPQ1RZUEUgaHRtbD48Zm9udD48aW5wdXQ+PGlucHV0 PjwvZm9udD4KQEAgLTE3MjYsMjIgKzE2NjEsNiBAQCBFeHBlY3RlZDoKIHwgICAgICAgICAgIHRl c3Q9IngiCiB8ICAgICAgIDxocj4KIAotVGVzdCA0NiBvZiA1OSBpbiByZXNvdXJjZXMvdGVzdHMy LmRhdCBmYWlsZWQuIElucHV0OgotPCFET0NUWVBFIGh0bWw+PHNlbGVjdD48b3B0Z3JvdXA+PC9v cHRncm91cD48L3NlbGVjdD4KLUdvdDoKLXwgPCFET0NUWVBFIGh0bWw+Ci18IDxodG1sPgotfCAg IDxoZWFkPgotfCAgIDxib2R5PgotfCAgICAgPHNlbGVjdD4KLUV4cGVjdGVkOgotfCA8IURPQ1RZ UEUgaHRtbD4KLXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18ICAgPGJvZHk+Ci18ICAgICA8c2VsZWN0 PgotfCAgICAgICA8b3B0Z3JvdXA+Ci0KIFRlc3QgNDcgb2YgNTkgaW4gcmVzb3VyY2VzL3Rlc3Rz Mi5kYXQgZmFpbGVkLiBJbnB1dDoKICAKICAKQEAgLTI0OTEsMTUgKzI0MTAsMTIgQEAgcmVzb3Vy Y2VzL3Rlc3RzNy5kYXQ6CiA4CiA5CiAxMAotMTMKLTE0CiAxNQogMTYKIDE3CiAxOAogMTkKIDIw Ci0yMQogMjQKIDI1CiAyNgpAQCAtMjYzNSwzOSArMjU1MSw2IEBAIEV4cGVjdGVkOgogfCAgICAg ICAgICAgIiA8dHI+eCAiCiB8ICAgICAgICAgIiAiCiAKLVRlc3QgMTMgb2YgMzAgaW4gcmVzb3Vy Y2VzL3Rlc3RzNy5kYXQgZmFpbGVkLiBJbnB1dDoKLTwhZG9jdHlwZSBodG1sPjxzZWxlY3Q+PGlu cHV0PlgKLUdvdDoKLXwgPCFET0NUWVBFIGh0bWw+Ci18IDxodG1sPgotfCAgIDxoZWFkPgotfCAg IDxib2R5PgotfCAgICAgPHNlbGVjdD4KLUV4cGVjdGVkOgotfCA8IURPQ1RZUEUgaHRtbD4KLXwg PGh0bWw+Ci18ICAgPGhlYWQ+Ci18ICAgPGJvZHk+Ci18ICAgICA8c2VsZWN0PgotfCAgICAgPGlu cHV0PgotfCAgICAgIlgiCi0KLVRlc3QgMTQgb2YgMzAgaW4gcmVzb3VyY2VzL3Rlc3RzNy5kYXQg ZmFpbGVkLiBJbnB1dDoKLTwhZG9jdHlwZSBodG1sPjxzZWxlY3Q+PHNlbGVjdD5YCi1Hb3Q6Ci18 IDwhRE9DVFlQRSBodG1sPgotfCA8aHRtbD4KLXwgICA8aGVhZD4KLXwgICA8Ym9keT4KLXwgICAg IDxzZWxlY3Q+Ci1FeHBlY3RlZDoKLXwgPCFET0NUWVBFIGh0bWw+Ci18IDxodG1sPgotfCAgIDxo ZWFkPgotfCAgIDxib2R5PgotfCAgICAgPHNlbGVjdD4KLXwgICAgICJYIgotCiBUZXN0IDE1IG9m IDMwIGluIHJlc291cmNlcy90ZXN0czcuZGF0IGZhaWxlZC4gSW5wdXQ6CiA8IWRvY3R5cGUgaHRt bD48dGFibGU+PGlucHV0IHR5cGU9aGlkREVOPjwvdGFibGU+CiBHb3Q6CkBAIC0yNzc5LDIyICsy NjYyLDYgQEAgRXhwZWN0ZWQ6CiB8ICAgICAgIDx0Ym9keT4KIHwgICAgICAgICA8dHI+CiAKLVRl c3QgMjEgb2YgMzAgaW4gcmVzb3VyY2VzL3Rlc3RzNy5kYXQgZmFpbGVkLiBJbnB1dDoKLTwhZG9j dHlwZSBodG1sPjxzZWxlY3Q+WDwvc2VsZWN0PgotR290OgotfCA8IURPQ1RZUEUgaHRtbD4KLXwg PGh0bWw+Ci18ICAgPGhlYWQ+Ci18ICAgPGJvZHk+Ci18ICAgICA8c2VsZWN0PgotRXhwZWN0ZWQ6 Ci18IDwhRE9DVFlQRSBodG1sPgotfCA8aHRtbD4KLXwgICA8aGVhZD4KLXwgICA8Ym9keT4KLXwg ICAgIDxzZWxlY3Q+Ci18ICAgICAgICJYIgotCiBUZXN0IDI0IG9mIDMwIGluIHJlc291cmNlcy90 ZXN0czcuZGF0IGZhaWxlZC4gSW5wdXQ6CiA8Ym9keT5YPC9ib2R5PjwvYm9keT4KIEdvdDoKQEAg LTI5MTQsNiArMjc4MSwxMyBAQCBHb3Q6CiB8ICAgPGhlYWQ+CiB8ICAgPGJvZHk+CiB8ICAgICA8 c2VsZWN0PgorfCAgICAgPGtleWdlbj4KK3wgICAgICAgPG9wdGlvbj4KK3wgICAgICAgICAiMjA0 OCAoSGlnaCBHcmFkZSkiCit8ICAgICAgIDxvcHRpb24+Cit8ICAgICAgICAgIjEwMjQgKE1lZGl1 bSBHcmFkZSkiCit8ICAgICAgIDxvcHRpb24+Cit8ICAgICAgICAgIjUxMiAoTG93IEdyYWRlKSIK IEV4cGVjdGVkOgogfCA8aHRtbD4KIHwgICA8aGVhZD4KQEAgLTMxMTQsNyArMjk4OCw2IEBAIEV4 cGVjdGVkOgogcmVzb3VyY2VzL3Rlc3RzOS5kYXQ6CiAxCiAyCi00CiA1CiA2CiA3CkBAIC0zMTY1 LDIyICszMDM4LDYgQEAgRXhwZWN0ZWQ6CiB8ICAgPGJvZHk+CiB8ICAgICA8bWF0aCBtYXRoPgog Ci1UZXN0IDQgb2YgMjUgaW4gcmVzb3VyY2VzL3Rlc3RzOS5kYXQgZmFpbGVkLiBJbnB1dDoKLTwh RE9DVFlQRSBodG1sPjxib2R5PjxzZWxlY3Q+PG9wdGlvbj48bWF0aD48L21hdGg+PC9vcHRpb24+ PC9zZWxlY3Q+Ci1Hb3Q6Ci18IDwhRE9DVFlQRSBodG1sPgotfCA8aHRtbD4KLXwgICA8aGVhZD4K LXwgICA8Ym9keT4KLXwgICAgIDxzZWxlY3Q+Ci1FeHBlY3RlZDoKLXwgPCFET0NUWVBFIGh0bWw+ Ci18IDxodG1sPgotfCAgIDxoZWFkPgotfCAgIDxib2R5PgotfCAgICAgPHNlbGVjdD4KLXwgICAg ICAgPG9wdGlvbj4KLQogVGVzdCA1IG9mIDI1IGluIHJlc291cmNlcy90ZXN0czkuZGF0IGZhaWxl ZC4gSW5wdXQ6CiA8IURPQ1RZUEUgaHRtbD48Ym9keT48dGFibGU+PG1hdGg+PC9tYXRoPjwvdGFi bGU+CiBHb3Q6CkBAIC0zNjM0LDcgKzM0OTEsNiBAQCBFeHBlY3RlZDoKIHJlc291cmNlcy90ZXN0 czEwLmRhdDoKIDEKIDIKLTQKIDUKIDYKIDcKQEAgLTM2ODUsMjIgKzM1NDEsNiBAQCBFeHBlY3Rl ZDoKIHwgICA8Ym9keT4KIHwgICAgIDxzdmcgc3ZnPgogCi1UZXN0IDQgb2YgMjUgaW4gcmVzb3Vy Y2VzL3Rlc3RzMTAuZGF0IGZhaWxlZC4gSW5wdXQ6Ci08IURPQ1RZUEUgaHRtbD48Ym9keT48c2Vs ZWN0PjxvcHRpb24+PHN2Zz48L3N2Zz48L29wdGlvbj48L3NlbGVjdD4KLUdvdDoKLXwgPCFET0NU WVBFIGh0bWw+Ci18IDxodG1sPgotfCAgIDxoZWFkPgotfCAgIDxib2R5PgotfCAgICAgPHNlbGVj dD4KLUV4cGVjdGVkOgotfCA8IURPQ1RZUEUgaHRtbD4KLXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18 ICAgPGJvZHk+Ci18ICAgICA8c2VsZWN0PgotfCAgICAgICA8b3B0aW9uPgotCiBUZXN0IDUgb2Yg MjUgaW4gcmVzb3VyY2VzL3Rlc3RzMTAuZGF0IGZhaWxlZC4gSW5wdXQ6CiA8IURPQ1RZUEUgaHRt bD48Ym9keT48dGFibGU+PHN2Zz48L3N2Zz48L3RhYmxlPgogR290OgpAQCAtNTQ2OCw3ICs1MzA4 LDYgQEAgRXhwZWN0ZWQ6CiB8ICAgICAgICAgPGZvcm0+CiByZXNvdXJjZXMvd2Via2l0MDEuZGF0 OgogMTcKLTMxCiAKIFRlc3QgMTcgb2YgMzEgaW4gcmVzb3VyY2VzL3dlYmtpdDAxLmRhdCBmYWls ZWQuIElucHV0OgogPEE+dGVzdDwgL0E+CkBAIC01NDg1LDM2ICs1MzI0LDYgQEAgRXhwZWN0ZWQ6 CiB8ICAgPGJvZHk+CiB8ICAgICA8YT4KIHwgICAgICAgInRlc3Q8IC9BPiIKLQotVGVzdCAzMSBv ZiAzMSBpbiByZXNvdXJjZXMvd2Via2l0MDEuZGF0IGZhaWxlZC4gSW5wdXQ6Ci08c2VsZWN0Pjxv cHRpb24+QTxzZWxlY3Q+PG9wdGlvbj5CPHNlbGVjdD48b3B0aW9uPkM8c2VsZWN0PjxvcHRpb24+ RDxzZWxlY3Q+PG9wdGlvbj5FPHNlbGVjdD48b3B0aW9uPkY8c2VsZWN0PjxvcHRpb24+RzxzZWxl Y3Q+Ci1Hb3Q6Ci18IDxodG1sPgotfCAgIDxoZWFkPgotfCAgIDxib2R5PgotfCAgICAgPHNlbGVj dD4KLUV4cGVjdGVkOgotfCA8aHRtbD4KLXwgICA8aGVhZD4KLXwgICA8Ym9keT4KLXwgICAgIDxz ZWxlY3Q+Ci18ICAgICAgIDxvcHRpb24+Ci18ICAgICAgICAgIkEiCi18ICAgICA8b3B0aW9uPgot fCAgICAgICAiQiIKLXwgICAgICAgPHNlbGVjdD4KLXwgICAgICAgICA8b3B0aW9uPgotfCAgICAg ICAgICAgIkMiCi18ICAgICA8b3B0aW9uPgotfCAgICAgICAiRCIKLXwgICAgICAgPHNlbGVjdD4K LXwgICAgICAgICA8b3B0aW9uPgotfCAgICAgICAgICAgIkUiCi18ICAgICA8b3B0aW9uPgotfCAg ICAgICAiRiIKLXwgICAgICAgPHNlbGVjdD4KLXwgICAgICAgICA8b3B0aW9uPgotfCAgICAgICAg ICAgIkciCiByZXNvdXJjZXMvZG9jdHlwZTAxLmRhdDogUEFTUwogCiByZXNvdXJjZXMvc2NyaXB0 ZGF0YTAxLmRhdDogUEFTUwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3Jl L0NoYW5nZUxvZwppbmRleCA4NTU2NDlmNDdjNTQ0ZWY4NDQwMTNmZjE0NWIzMjY5NTVmOTkxZWYw Li4xMjBiMTUwNmRhYzQ1ZGJlODVhNmRiYTM3NjUyNzU4MzZmYzEwYmJlIDEwMDY0NAotLS0gYS9X ZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBA CisyMDEwLTA3LTA1ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCisKKyAgICAgICAgSW1wbGVtZW50IEluU2VsZWN0TW9k ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDE2MjcK KworICAgICAgICAqIGh0bWwvSFRNTFRyZWVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc1N0YXJ0VGFnKToKKyAgICAgICAgKFdlYkNvcmU6OkhU TUxUcmVlQnVpbGRlcjo6cHJvY2Vzc0VuZFRhZyk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVHJl ZUJ1aWxkZXI6OnByb2Nlc3NDaGFyYWN0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRyZWVC dWlsZGVyOjpwcm9jZXNzRW5kT2ZGaWxlKToKKwogMjAxMC0wNy0wNSAgRmFkeSBTYW11ZWwgIDxm c2FtdWVsQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4K ZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1MVHJlZUJ1aWxkZXIuY3BwIGIvV2ViQ29yZS9o dG1sL0hUTUxUcmVlQnVpbGRlci5jcHAKaW5kZXggM2QwOGE0NjVmZTQ0OThiODhmNDNiZDg2YzZj OTVlNzhhOTRmNGEzYi4uMDkwNDJjOWUyMWE4MmU3N2VlOTU2NGZhNGU1MDY3ZDczOGUyN2I5MCAx MDA2NDQKLS0tIGEvV2ViQ29yZS9odG1sL0hUTUxUcmVlQnVpbGRlci5jcHAKKysrIGIvV2ViQ29y ZS9odG1sL0hUTUxUcmVlQnVpbGRlci5jcHAKQEAgLTg5OSw2ICs4OTksNTIgQEAgdm9pZCBIVE1M VHJlZUJ1aWxkZXI6OnByb2Nlc3NTdGFydFRhZyhBdG9taWNIVE1MVG9rZW4mIHRva2VuKQogICAg ICAgICB9CiAgICAgICAgIHBhcnNlRXJyb3IodG9rZW4pOwogICAgICAgICBicmVhazsKKyAgICBj YXNlIEluU2VsZWN0TW9kZToKKyAgICAgICAgQVNTRVJUKGluc2VydGlvbk1vZGUoKSA9PSBJblNl bGVjdE1vZGUpOworICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09IGh0bWxUYWcpIHsKKyAgICAg ICAgICAgIGluc2VydEhUTUxTdGFydFRhZ0luQm9keSh0b2tlbik7CisgICAgICAgICAgICByZXR1 cm47CisgICAgICAgIH0KKyAgICAgICAgaWYgKHRva2VuLm5hbWUoKSA9PSBvcHRpb25UYWcpIHsK KyAgICAgICAgICAgIGlmIChjdXJyZW50RWxlbWVudCgpLT5oYXNUYWdOYW1lKG9wdGlvblRhZykp IHsKKyAgICAgICAgICAgICAgICBBdG9taWNIVE1MVG9rZW4gZW5kT3B0aW9uKEhUTUxUb2tlbjo6 RW5kVGFnLCBvcHRpb25UYWcubG9jYWxOYW1lKCkpOworICAgICAgICAgICAgICAgIHByb2Nlc3NF bmRUYWcoZW5kT3B0aW9uKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGluc2VydEVsZW1l bnQodG9rZW4pOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAgIGlmICh0 b2tlbi5uYW1lKCkgPT0gb3B0Z3JvdXBUYWcpIHsKKyAgICAgICAgICAgIGlmIChjdXJyZW50RWxl bWVudCgpLT5oYXNUYWdOYW1lKG9wdGlvblRhZykpIHsKKyAgICAgICAgICAgICAgICBBdG9taWNI VE1MVG9rZW4gZW5kT3B0aW9uKEhUTUxUb2tlbjo6RW5kVGFnLCBvcHRpb25UYWcubG9jYWxOYW1l KCkpOworICAgICAgICAgICAgICAgIHByb2Nlc3NFbmRUYWcoZW5kT3B0aW9uKTsKKyAgICAgICAg ICAgIH0KKyAgICAgICAgICAgIGlmIChjdXJyZW50RWxlbWVudCgpLT5oYXNUYWdOYW1lKG9wdGdy b3VwVGFnKSkgeworICAgICAgICAgICAgICAgIEF0b21pY0hUTUxUb2tlbiBlbmRPcHRncm91cChI VE1MVG9rZW46OkVuZFRhZywgb3B0Z3JvdXBUYWcubG9jYWxOYW1lKCkpOworICAgICAgICAgICAg ICAgIHByb2Nlc3NFbmRUYWcoZW5kT3B0Z3JvdXApOworICAgICAgICAgICAgfQorICAgICAgICAg ICAgaW5zZXJ0RWxlbWVudCh0b2tlbik7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0K KyAgICAgICAgaWYgKHRva2VuLm5hbWUoKSA9PSBzZWxlY3RUYWcpIHsKKyAgICAgICAgICAgIHBh cnNlRXJyb3IodG9rZW4pOworICAgICAgICAgICAgQXRvbWljSFRNTFRva2VuIGVuZFNlbGVjdChI VE1MVG9rZW46OkVuZFRhZywgc2VsZWN0VGFnLmxvY2FsTmFtZSgpKTsKKyAgICAgICAgICAgIHBy b2Nlc3NFbmRUYWcoZW5kU2VsZWN0KTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQor ICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09IGlucHV0VGFnIHx8IHRva2VuLm5hbWUoKSA9PSBr ZXlnZW5UYWcgfHwgdG9rZW4ubmFtZSgpID09IHRleHRhcmVhVGFnKSB7CisgICAgICAgICAgICBw YXJzZUVycm9yKHRva2VuKTsKKyAgICAgICAgICAgIG5vdEltcGxlbWVudGVkKCk7IC8vIGZyYWdt ZW50IGNhc2UKKyAgICAgICAgICAgIEF0b21pY0hUTUxUb2tlbiBlbmRTZWxlY3QoSFRNTFRva2Vu OjpFbmRUYWcsIHNlbGVjdFRhZy5sb2NhbE5hbWUoKSk7CisgICAgICAgICAgICBwcm9jZXNzRW5k VGFnKGVuZFNlbGVjdCk7CisgICAgICAgICAgICBwcm9jZXNzU3RhcnRUYWcodG9rZW4pOworICAg ICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAgIGlmICh0b2tlbi5uYW1lKCkgPT0g c2NyaXB0VGFnKSB7CisgICAgICAgICAgICBib29sIGRpZFByb2Nlc3MgPSBwcm9jZXNzU3RhcnRU YWdGb3JJbkhlYWQodG9rZW4pOworICAgICAgICAgICAgQVNTRVJUX1VOVVNFRChkaWRQcm9jZXNz LCBkaWRQcm9jZXNzKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBi cmVhazsKICAgICBkZWZhdWx0OgogICAgICAgICBub3RJbXBsZW1lbnRlZCgpOwogICAgIH0KQEAg LTE0MTYsNiArMTQ2MiwzNCBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc0VuZFRhZyhB dG9taWNIVE1MVG9rZW4mIHRva2VuKQogICAgICAgICBBU1NFUlQoaW5zZXJ0aW9uTW9kZSgpID09 IEFmdGVyRnJhbWVzZXRNb2RlIHx8IGluc2VydGlvbk1vZGUoKSA9PSBBZnRlckFmdGVyRnJhbWVz ZXRNb2RlKTsKICAgICAgICAgcGFyc2VFcnJvcih0b2tlbik7CiAgICAgICAgIGJyZWFrOworICAg IGNhc2UgSW5TZWxlY3RNb2RlOgorICAgICAgICBBU1NFUlQoaW5zZXJ0aW9uTW9kZSgpID09IElu U2VsZWN0TW9kZSk7CisgICAgICAgIGlmICh0b2tlbi5uYW1lKCkgPT0gb3B0Z3JvdXBUYWcpIHsK KyAgICAgICAgICAgIGlmIChjdXJyZW50RWxlbWVudCgpLT5oYXNUYWdOYW1lKG9wdGlvblRhZykp CisgICAgICAgICAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICAgICAgICAgIGlmIChjdXJy ZW50RWxlbWVudCgpLT5oYXNUYWdOYW1lKG9wdGdyb3VwVGFnKSkgeworICAgICAgICAgICAgICAg IG1fb3BlbkVsZW1lbnRzLnBvcCgpOworICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAg ICAgIH0KKyAgICAgICAgICAgIHBhcnNlRXJyb3IodG9rZW4pOworICAgICAgICAgICAgcmV0dXJu OworICAgICAgICB9CisgICAgICAgIGlmICh0b2tlbi5uYW1lKCkgPT0gb3B0aW9uVGFnKSB7Cisg ICAgICAgICAgICBpZiAoY3VycmVudEVsZW1lbnQoKS0+aGFzVGFnTmFtZShvcHRpb25UYWcpKSB7 CisgICAgICAgICAgICAgICAgbV9vcGVuRWxlbWVudHMucG9wKCk7CisgICAgICAgICAgICAgICAg cmV0dXJuOworICAgICAgICAgICAgfQorICAgICAgICAgICAgcGFyc2VFcnJvcih0b2tlbik7Cisg ICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgaWYgKHRva2VuLm5hbWUoKSA9 PSBzZWxlY3RUYWcpIHsKKyAgICAgICAgICAgIG5vdEltcGxlbWVudGVkKCk7IC8vIGZyYWdtZW50 IGNhc2UKKyAgICAgICAgICAgIG1fb3BlbkVsZW1lbnRzLnBvcFVudGlsKHNlbGVjdFRhZy5sb2Nh bE5hbWUoKSk7CisgICAgICAgICAgICBtX29wZW5FbGVtZW50cy5wb3AoKTsKKyAgICAgICAgICAg IHJlc2V0SW5zZXJ0aW9uTW9kZUFwcHJvcHJpYXRlbHkoKTsKKyAgICAgICAgICAgIHJldHVybjsK KyAgICAgICAgfQorICAgICAgICBicmVhazsKICAgICBkZWZhdWx0OgogICAgICAgICBub3RJbXBs ZW1lbnRlZCgpOwogICAgIH0KQEAgLTE0OTAsNiArMTU2NCwxMCBAQCB2b2lkIEhUTUxUcmVlQnVp bGRlcjo6cHJvY2Vzc0NoYXJhY3RlcihBdG9taWNIVE1MVG9rZW4mIHRva2VuKQogICAgICAgICBB U1NFUlQoaW5zZXJ0aW9uTW9kZSgpID09IEluRnJhbWVzZXRNb2RlIHx8IGluc2VydGlvbk1vZGUo KSA9PSBBZnRlckZyYW1lc2V0TW9kZSB8fCBpbnNlcnRpb25Nb2RlKCkgPT0gQWZ0ZXJBZnRlckZy YW1lc2V0TW9kZSk7CiAgICAgICAgIHBhcnNlRXJyb3IodG9rZW4pOwogICAgICAgICBicmVhazsK KyAgICBjYXNlIEluU2VsZWN0TW9kZToKKyAgICAgICAgQVNTRVJUKGluc2VydGlvbk1vZGUoKSA9 PSBJblNlbGVjdE1vZGUpOworICAgICAgICBpbnNlcnRUZXh0Tm9kZSh0b2tlbik7CisgICAgICAg IGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIG5vdEltcGxlbWVudGVkKCk7CiAgICAgfQpA QCAtMTU0MSw2ICsxNjE5LDExIEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzRW5kT2ZG aWxlKEF0b21pY0hUTUxUb2tlbiYgdG9rZW4pCiAgICAgY2FzZSBBZnRlckFmdGVyRnJhbWVzZXRN b2RlOgogICAgICAgICBBU1NFUlQoaW5zZXJ0aW9uTW9kZSgpID09IEFmdGVyRnJhbWVzZXRNb2Rl IHx8IGluc2VydGlvbk1vZGUoKSA9PSBBZnRlckFmdGVyRnJhbWVzZXRNb2RlKTsKICAgICAgICAg YnJlYWs7CisgICAgY2FzZSBJblNlbGVjdE1vZGU6CisgICAgICAgIEFTU0VSVChpbnNlcnRpb25N b2RlKCkgPT0gSW5TZWxlY3RNb2RlKTsKKyAgICAgICAgaWYgKGN1cnJlbnRFbGVtZW50KCkgIT0g bV9vcGVuRWxlbWVudHMuaHRtbEVsZW1lbnQoKSkKKyAgICAgICAgICAgIHBhcnNlRXJyb3IodG9r ZW4pOworICAgICAgICBicmVhazsKICAgICBkZWZhdWx0OgogICAgICAgICBub3RJbXBsZW1lbnRl ZCgpOwogICAgIH0K