130785 2014-03-26 11:27:59 -0700 REGRESSION(r166264): Broke some window.opener tests for WK2 Mavericks (Requested by brrian__ on #webkit). 2014-03-26 11:32:27 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 130632 1 commit-queue commit-queue bburg timothy oldest_to_newest 994647 0 commit-queue 2014-03-26 11:27:59 -0700 http://trac.webkit.org/changeset/166264 broke the build: Broke some window.opener tests for WK2 Mavericks (Requested by brrian__ on #webkit). This is an automatic bug report generated by webkitbot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests fail. 994649 1 227867 commit-queue 2014-03-26 11:28:27 -0700 Created attachment 227867 ROLLOUT of r166264 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the rollout will be successful. This process takes approximately 15 minutes. If you would like to land the rollout faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID where ATTACHMENT_ID is the ID of this attachment. 994651 2 bburg 2014-03-26 11:32:23 -0700 Sigh... looks like NetworkProcess needs the same modification as WKTR. Working hypothesis: NetworkProcess currently deals with identifiers and no frames, so it is probably mistakenly cancelling main resource loads (which always have the same identifier) early, thus the onload events don't fire somehow, and the tests time out. 994652 3 227867 commit-queue 2014-03-26 11:32:25 -0700 Comment on attachment 227867 ROLLOUT of r166264 Clearing flags on attachment: 227867 Committed r166302: <http://trac.webkit.org/changeset/166302> 994653 4 commit-queue 2014-03-26 11:32:27 -0700 All reviewed patches have been landed. Closing bug. 227867 2014-03-26 11:28:27 -0700 2014-03-26 11:32:25 -0700 ROLLOUT of r166264 bug-130785-20140326112806.patch text/plain 9726 commit-queue U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2MzAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTkyNGYyN2FjZGRhMDE1 NmE5MTFjNTNmYjFmOTNhMDYwZTMyNmMwZi4uYWViMzVkYzIzNTA3NDVjNGYxMDhmM2U1ODY5ZGQ0 YTI3MzE4Y2VkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE0LTAzLTI2ICBDb21t aXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KKworICAgICAgICBVbnJldmlld2Vk LCByb2xsaW5nIG91dCByMTY2MjY0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTMwNzg1CisKKyAgICAgICAgQnJva2Ugc29tZSB3aW5kb3cub3BlbmVy IHRlc3RzIGZvciBXSzIgTWF2ZXJpY2tzIChSZXF1ZXN0ZWQgYnkKKyAgICAgICAgYnJyaWFuX18g b24gI3dlYmtpdCkuCisKKyAgICAgICAgUmV2ZXJ0ZWQgY2hhbmdlc2V0OgorCisgICAgICAgICJX ZWIgUmVwbGF5OiByZXNvdXJjZSB1bmlxdWUgaWRlbnRpZmllcnMgc2hvdWxkIGJlIHVuaXF1ZS1w ZXItCisgICAgICAgIGZyYW1lLCBub3QgZ2xvYmFsbHkiCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzA2MzIKKyAgICAgICAgaHR0cDovL3RyYWMud2Vi a2l0Lm9yZy9jaGFuZ2VzZXQvMTY2MjY0CisKIDIwMTQtMDMtMjYgIFpvbHRhbiBIb3J2YXRoICA8 em9sdGFuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW0NTUyBTaGFwZXNdIFJlbW92ZSBzaGFwZS1p bnNpZGUgc3VwcG9ydApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Byb2dyZXNz VHJhY2tlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUHJvZ3Jlc3NUcmFja2VyLmNwcApp bmRleCBiYTEyOGE3YTZlYjVmNzMwZTg0MzhmMDNmZWE1OWMwMDg2MWQ2YzRmLi4zMzM4NTA2NmJl NmMzNDMzZDU2ZTRjOTA1MjExZjg2YWFjYTQzZjVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvUHJvZ3Jlc3NUcmFja2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv UHJvZ3Jlc3NUcmFja2VyLmNwcApAQCAtNzMsNiArNzMsOCBAQCBwdWJsaWM6CiAgICAgbG9uZyBs b25nIGVzdGltYXRlZExlbmd0aDsKIH07CiAKK3Vuc2lnbmVkIGxvbmcgUHJvZ3Jlc3NUcmFja2Vy OjpzX3VuaXF1ZUlkZW50aWZpZXIgPSAwOworCiBQcm9ncmVzc1RyYWNrZXI6OlByb2dyZXNzVHJh Y2tlcihQcm9ncmVzc1RyYWNrZXJDbGllbnQmIGNsaWVudCkKICAgICA6IG1fY2xpZW50KGNsaWVu dCkKICAgICAsIG1fdG90YWxQYWdlQW5kUmVzb3VyY2VCeXRlc1RvTG9hZCgwKQpAQCAtODIsNyAr ODQsNiBAQCBQcm9ncmVzc1RyYWNrZXI6OlByb2dyZXNzVHJhY2tlcihQcm9ncmVzc1RyYWNrZXJD bGllbnQmIGNsaWVudCkKICAgICAsIG1fcHJvZ3Jlc3NOb3RpZmljYXRpb25UaW1lSW50ZXJ2YWwo c3RkOjpjaHJvbm86Om1pbGxpc2Vjb25kcygxMDApKQogICAgICwgbV9maW5hbFByb2dyZXNzQ2hh bmdlZFNlbnQoZmFsc2UpCiAgICAgLCBtX3Byb2dyZXNzVmFsdWUoMCkKLSAgICAsIG1fbmV4dFVu aXF1ZUlkZW50aWZpZXIoMSkKICAgICAsIG1fbnVtUHJvZ3Jlc3NUcmFja2VkRnJhbWVzKDApCiAg ICAgLCBtX3Byb2dyZXNzSGVhcnRiZWF0VGltZXIodGhpcywgJlByb2dyZXNzVHJhY2tlcjo6cHJv Z3Jlc3NIZWFydGJlYXRUaW1lckZpcmVkKQogICAgICwgbV9oZWFydGJlYXRzV2l0aE5vUHJvZ3Jl c3MoMCkKQEAgLTExMyw3ICsxMTQsNiBAQCB2b2lkIFByb2dyZXNzVHJhY2tlcjo6cmVzZXQoKQog ICAgIG1fZmluYWxQcm9ncmVzc0NoYW5nZWRTZW50ID0gZmFsc2U7CiAgICAgbV9udW1Qcm9ncmVz c1RyYWNrZWRGcmFtZXMgPSAwOwogICAgIG1fb3JpZ2luYXRpbmdQcm9ncmVzc0ZyYW1lID0gMDsK LSAgICAvLyBEb24ndCByZXNldCBtX25leHRVbmlxdWVJZGVudGlmaWVyLiBNb3JlIGxvYWRzIGNv dWxkIHN0YXJ0IGFmdGVyIHJlc2V0KCkgaXMgY2FsbGVkLgogCiAgICAgbV9oZWFydGJlYXRzV2l0 aE5vUHJvZ3Jlc3MgPSAwOwogICAgIG1fdG90YWxCeXRlc1JlY2VpdmVkQmVmb3JlUHJldmlvdXNI ZWFydGJlYXQgPSAwOwpAQCAtMjk0LDcgKzI5NCw3IEBAIHZvaWQgUHJvZ3Jlc3NUcmFja2VyOjpj b21wbGV0ZVByb2dyZXNzKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllcikKIAogdW5zaWduZWQgbG9u ZyBQcm9ncmVzc1RyYWNrZXI6OmNyZWF0ZVVuaXF1ZUlkZW50aWZpZXIoKQogewotICAgIHJldHVy biBtX25leHRVbmlxdWVJZGVudGlmaWVyKys7CisgICAgcmV0dXJuICsrc191bmlxdWVJZGVudGlm aWVyOwogfQogCiBib29sIFByb2dyZXNzVHJhY2tlcjo6aXNNYWluTG9hZFByb2dyZXNzaW5nKCkg Y29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Qcm9ncmVzc1RyYWNrZXIu aCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Qcm9ncmVzc1RyYWNrZXIuaAppbmRleCBkYWQ4NTQ2 MzcxYzJlMmMzMWJjZDJjMThmYTQ3Y2U2MGRiYzQyNzBhLi40ZDgyZjMwOWFjYjUyZjRjY2E4MDY2 ZjdiOTYwMzI1M2EzYjE0ODBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUHJv Z3Jlc3NUcmFja2VyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Byb2dyZXNzVHJhY2tl ci5oCkBAIC00Niw3ICs0Niw3IEBAIHB1YmxpYzoKICAgICBleHBsaWNpdCBQcm9ncmVzc1RyYWNr ZXIoUHJvZ3Jlc3NUcmFja2VyQ2xpZW50Jik7CiAgICAgflByb2dyZXNzVHJhY2tlcigpOwogCi0g ICAgdW5zaWduZWQgbG9uZyBjcmVhdGVVbmlxdWVJZGVudGlmaWVyKCk7CisgICAgc3RhdGljIHVu c2lnbmVkIGxvbmcgY3JlYXRlVW5pcXVlSWRlbnRpZmllcigpOwogCiAgICAgZG91YmxlIGVzdGlt YXRlZFByb2dyZXNzKCkgY29uc3Q7CiAKQEAgLTY4LDYgKzY4LDggQEAgcHJpdmF0ZToKIAogICAg IHZvaWQgcHJvZ3Jlc3NIZWFydGJlYXRUaW1lckZpcmVkKFRpbWVyPFByb2dyZXNzVHJhY2tlcj4m KTsKICAgICAKKyAgICBzdGF0aWMgdW5zaWduZWQgbG9uZyBzX3VuaXF1ZUlkZW50aWZpZXI7Cisg ICAgCiAgICAgUHJvZ3Jlc3NUcmFja2VyQ2xpZW50JiBtX2NsaWVudDsKICAgICBsb25nIGxvbmcg bV90b3RhbFBhZ2VBbmRSZXNvdXJjZUJ5dGVzVG9Mb2FkOwogICAgIGxvbmcgbG9uZyBtX3RvdGFs Qnl0ZXNSZWNlaXZlZDsKQEAgLTc4LDcgKzgwLDYgQEAgcHJpdmF0ZToKICAgICBib29sIG1fZmlu YWxQcm9ncmVzc0NoYW5nZWRTZW50OyAgICAKICAgICBkb3VibGUgbV9wcm9ncmVzc1ZhbHVlOwog ICAgIFJlZlB0cjxGcmFtZT4gbV9vcmlnaW5hdGluZ1Byb2dyZXNzRnJhbWU7Ci0gICAgdW5zaWdu ZWQgbG9uZyBtX25leHRVbmlxdWVJZGVudGlmaWVyOwogICAgIAogICAgIGludCBtX251bVByb2dy ZXNzVHJhY2tlZEZyYW1lczsKICAgICBIYXNoTWFwPHVuc2lnbmVkIGxvbmcsIHN0ZDo6dW5pcXVl X3B0cjxQcm9ncmVzc0l0ZW0+PiBtX3Byb2dyZXNzSXRlbXM7CmRpZmYgLS1naXQgYS9Ub29scy9D aGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNjkwMTVjNDZlM2E3NGI3ZTFhYjFjMzgy NmU3YzgxOWZlMzViMjA0ZC4uYjQ1ZTMzZGM2N2YwMjFkYmE0M2QyNjVkYzJmYjc0NmRmYTg3Yzk2 NSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE4IEBACisyMDE0LTAzLTI2ICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Vi a2l0Lm9yZz4KKworICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMTY2MjY0LgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMwNzg1CisKKyAg ICAgICAgQnJva2Ugc29tZSB3aW5kb3cub3BlbmVyIHRlc3RzIGZvciBXSzIgTWF2ZXJpY2tzIChS ZXF1ZXN0ZWQgYnkKKyAgICAgICAgYnJyaWFuX18gb24gI3dlYmtpdCkuCisKKyAgICAgICAgUmV2 ZXJ0ZWQgY2hhbmdlc2V0OgorCisgICAgICAgICJXZWIgUmVwbGF5OiByZXNvdXJjZSB1bmlxdWUg aWRlbnRpZmllcnMgc2hvdWxkIGJlIHVuaXF1ZS1wZXItCisgICAgICAgIGZyYW1lLCBub3QgZ2xv YmFsbHkiCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MzA2MzIKKyAgICAgICAgaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMTY2MjY0CisK IDIwMTQtMDMtMjYgIFpvbHRhbiBIb3J2YXRoICA8em9sdGFuQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgW0NTUyBTaGFwZXNdIFJlbW92ZSBzaGFwZS1pbnNpZGUgc3VwcG9ydApkaWZmIC0tZ2l0IGEv VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2Uu Y3BwIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRs ZVBhZ2UuY3BwCmluZGV4IGM0NWM4YmQyMDAxNDI0NTJhMjJiZDJlMjMwZTE5OTUzNzU1ODc4MDcu LjIxZDM0NzczMDJjNDhhZWI4MjcxYzFhNWVlODEyMThhMTQzYzAyMGUgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlLmNw cAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVu ZGxlUGFnZS5jcHAKQEAgLTI1NCwxMyArMjU0LDEyIEBAIHN0YXRpYyBpbmxpbmUgV1RGOjpTdHJp bmcgcGF0aFN1aXRhYmxlRm9yVGVzdFJlc3VsdChXS1VSTFJlZiBmaWxlVXJsKQogICAgIHJldHVy biB0b1dURlN0cmluZyhhZG9wdFdLKFdLVVJMQ29weUxhc3RQYXRoQ29tcG9uZW50KGZpbGVVcmwp KSk7IC8vIFdlIGxvc2Ugc29tZSBpbmZvcm1hdGlvbiBoZXJlLCBidXQgaXQncyBiZXR0ZXIgdGhh biBleHBvc2luZyBhIGZ1bGwgcGF0aCwgd2hpY2ggaXMgYWx3YXlzIG1hY2hpbmUgc3BlY2lmaWMu CiB9CiAKLXN0YXRpYyBIYXNoTWFwPHN0ZDo6cGFpcjxXS0J1bmRsZUZyYW1lUmVmLCB1aW50NjRf dD4sIFN0cmluZz4gYXNzaWduZWRVcmxzQ2FjaGU7CitzdGF0aWMgSGFzaE1hcDx1aW50NjRfdCwg U3RyaW5nPiBhc3NpZ25lZFVybHNDYWNoZTsKIAotc3RhdGljIGlubGluZSB2b2lkIGR1bXBSZXNv dXJjZVVSTChXS0J1bmRsZUZyYW1lUmVmIGZyYW1lLCB1aW50NjRfdCBpZGVudGlmaWVyLCBTdHJp bmdCdWlsZGVyJiBzdHJpbmdCdWlsZGVyKQorc3RhdGljIGlubGluZSB2b2lkIGR1bXBSZXNvdXJj ZVVSTCh1aW50NjRfdCBpZGVudGlmaWVyLCBTdHJpbmdCdWlsZGVyJiBzdHJpbmdCdWlsZGVyKQog ewotICAgIHN0ZDo6cGFpcjxXS0J1bmRsZUZyYW1lUmVmLCB1aW50NjRfdD4ga2V5ID0gc3RkOjpt YWtlX3BhaXIoZnJhbWUsIGlkZW50aWZpZXIpOwotICAgIGlmIChhc3NpZ25lZFVybHNDYWNoZS5j b250YWlucyhrZXkpKQotICAgICAgICBzdHJpbmdCdWlsZGVyLmFwcGVuZChhc3NpZ25lZFVybHND YWNoZS5nZXQoa2V5KSk7CisgICAgaWYgKGFzc2lnbmVkVXJsc0NhY2hlLmNvbnRhaW5zKGlkZW50 aWZpZXIpKQorICAgICAgICBzdHJpbmdCdWlsZGVyLmFwcGVuZChhc3NpZ25lZFVybHNDYWNoZS5n ZXQoaWRlbnRpZmllcikpOwogICAgIGVsc2UKICAgICAgICAgc3RyaW5nQnVpbGRlci5hcHBlbmRM aXRlcmFsKCI8dW5rbm93bj4iKTsKIH0KQEAgLTEwMjgsMTUgKzEwMjcsMTMgQEAgdm9pZCBJbmpl Y3RlZEJ1bmRsZVBhZ2U6OmRpZERldGVjdFhTU0ZvckZyYW1lKFdLQnVuZGxlRnJhbWVSZWYgZnJh bWUpCiAgICAgICAgIEluamVjdGVkQnVuZGxlOjpzaGFyZWQoKS5vdXRwdXRUZXh0KCJkaWREZXRl Y3RYU1NcbiIpOwogfQogCi12b2lkIEluamVjdGVkQnVuZGxlUGFnZTo6ZGlkSW5pdGlhdGVMb2Fk Rm9yUmVzb3VyY2UoV0tCdW5kbGVQYWdlUmVmIHBhZ2UsIFdLQnVuZGxlRnJhbWVSZWYgZnJhbWUs IHVpbnQ2NF90IGlkZW50aWZpZXIsIFdLVVJMUmVxdWVzdFJlZiByZXF1ZXN0LCBib29sKQordm9p ZCBJbmplY3RlZEJ1bmRsZVBhZ2U6OmRpZEluaXRpYXRlTG9hZEZvclJlc291cmNlKFdLQnVuZGxl UGFnZVJlZiBwYWdlLCBXS0J1bmRsZUZyYW1lUmVmLCB1aW50NjRfdCBpZGVudGlmaWVyLCBXS1VS TFJlcXVlc3RSZWYgcmVxdWVzdCwgYm9vbCkKIHsKICAgICBpZiAoIUluamVjdGVkQnVuZGxlOjpz aGFyZWQoKS5pc1Rlc3RSdW5uaW5nKCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIFdLUmV0YWlu UHRyPFdLVVJMUmVmPiB1cmwgPSBhZG9wdFdLKFdLVVJMUmVxdWVzdENvcHlVUkwocmVxdWVzdCkp OwotICAgIGF1dG8gcmVzdWx0ID0gYXNzaWduZWRVcmxzQ2FjaGUuYWRkKHN0ZDo6bWFrZV9wYWly KGZyYW1lLCBpZGVudGlmaWVyKSwgcGF0aFN1aXRhYmxlRm9yVGVzdFJlc3VsdCh1cmwuZ2V0KCkp KTsKLSAgICAvLyBJdCBpcyBhIGJ1ZyBpbiBXZWJDb3JlIGlmIG11bHRpcGxlIHJlc291cmNlcyBo YWQgdGhlIHNhbWUgZnJhbWUvaWRlbnRpZmllciBwYWlyLgotICAgIEFTU0VSVF9VTlVTRUQocmVz dWx0LCByZXN1bHQuaXNOZXdFbnRyeSk7CisgICAgYXNzaWduZWRVcmxzQ2FjaGUuYWRkKGlkZW50 aWZpZXIsIHBhdGhTdWl0YWJsZUZvclRlc3RSZXN1bHQodXJsLmdldCgpKSk7CiB9CiAKIC8vIFJl c291cmNlIExvYWQgQ2xpZW50IENhbGxiYWNrcwpAQCAtMTA1Niw3ICsxMDUzLDcgQEAgV0tVUkxS ZXF1ZXN0UmVmIEluamVjdGVkQnVuZGxlUGFnZTo6d2lsbFNlbmRSZXF1ZXN0Rm9yRnJhbWUoV0tC dW5kbGVQYWdlUmVmIHBhZ2UKICAgICBpZiAoSW5qZWN0ZWRCdW5kbGU6OnNoYXJlZCgpLmlzVGVz dFJ1bm5pbmcoKQogICAgICAgICAmJiBJbmplY3RlZEJ1bmRsZTo6c2hhcmVkKCkudGVzdFJ1bm5l cigpLT5zaG91bGREdW1wUmVzb3VyY2VMb2FkQ2FsbGJhY2tzKCkpIHsKICAgICAgICAgU3RyaW5n QnVpbGRlciBzdHJpbmdCdWlsZGVyOwotICAgICAgICBkdW1wUmVzb3VyY2VVUkwoZnJhbWUsIGlk ZW50aWZpZXIsIHN0cmluZ0J1aWxkZXIpOworICAgICAgICBkdW1wUmVzb3VyY2VVUkwoaWRlbnRp Zmllciwgc3RyaW5nQnVpbGRlcik7CiAgICAgICAgIHN0cmluZ0J1aWxkZXIuYXBwZW5kTGl0ZXJh bCgiIC0gd2lsbFNlbmRSZXF1ZXN0ICIpOwogICAgICAgICBkdW1wUmVxdWVzdERlc2NyaXB0aW9u U3VpdGFibGVGb3JUZXN0UmVzdWx0KHJlcXVlc3QsIHN0cmluZ0J1aWxkZXIpOwogICAgICAgICBz dHJpbmdCdWlsZGVyLmFwcGVuZExpdGVyYWwoIiByZWRpcmVjdFJlc3BvbnNlICIpOwpAQCAtMTEw NywxNCArMTEwNCwxNCBAQCBXS1VSTFJlcXVlc3RSZWYgSW5qZWN0ZWRCdW5kbGVQYWdlOjp3aWxs U2VuZFJlcXVlc3RGb3JGcmFtZShXS0J1bmRsZVBhZ2VSZWYgcGFnZQogICAgIHJldHVybiByZXF1 ZXN0OwogfQogCi12b2lkIEluamVjdGVkQnVuZGxlUGFnZTo6ZGlkUmVjZWl2ZVJlc3BvbnNlRm9y UmVzb3VyY2UoV0tCdW5kbGVQYWdlUmVmIHBhZ2UsIFdLQnVuZGxlRnJhbWVSZWYgZnJhbWUsIHVp bnQ2NF90IGlkZW50aWZpZXIsIFdLVVJMUmVzcG9uc2VSZWYgcmVzcG9uc2UpCit2b2lkIEluamVj dGVkQnVuZGxlUGFnZTo6ZGlkUmVjZWl2ZVJlc3BvbnNlRm9yUmVzb3VyY2UoV0tCdW5kbGVQYWdl UmVmIHBhZ2UsIFdLQnVuZGxlRnJhbWVSZWYsIHVpbnQ2NF90IGlkZW50aWZpZXIsIFdLVVJMUmVz cG9uc2VSZWYgcmVzcG9uc2UpCiB7CiAgICAgaWYgKCFJbmplY3RlZEJ1bmRsZTo6c2hhcmVkKCku aXNUZXN0UnVubmluZygpKQogICAgICAgICByZXR1cm47CiAKICAgICBpZiAoSW5qZWN0ZWRCdW5k bGU6OnNoYXJlZCgpLnRlc3RSdW5uZXIoKS0+c2hvdWxkRHVtcFJlc291cmNlTG9hZENhbGxiYWNr cygpKSB7CiAgICAgICAgIFN0cmluZ0J1aWxkZXIgc3RyaW5nQnVpbGRlcjsKLSAgICAgICAgZHVt cFJlc291cmNlVVJMKGZyYW1lLCBpZGVudGlmaWVyLCBzdHJpbmdCdWlsZGVyKTsKKyAgICAgICAg ZHVtcFJlc291cmNlVVJMKGlkZW50aWZpZXIsIHN0cmluZ0J1aWxkZXIpOwogICAgICAgICBzdHJp bmdCdWlsZGVyLmFwcGVuZExpdGVyYWwoIiAtIGRpZFJlY2VpdmVSZXNwb25zZSAiKTsKICAgICAg ICAgZHVtcFJlc3BvbnNlRGVzY3JpcHRpb25TdWl0YWJsZUZvclRlc3RSZXN1bHQocmVzcG9uc2Us IHN0cmluZ0J1aWxkZXIpOwogICAgICAgICBzdHJpbmdCdWlsZGVyLmFwcGVuZCgnXG4nKTsKQEAg LTExNDEsNyArMTEzOCw3IEBAIHZvaWQgSW5qZWN0ZWRCdW5kbGVQYWdlOjpkaWRSZWNlaXZlQ29u dGVudExlbmd0aEZvclJlc291cmNlKFdLQnVuZGxlUGFnZVJlZiwgV0tCCiB7CiB9CiAKLXZvaWQg SW5qZWN0ZWRCdW5kbGVQYWdlOjpkaWRGaW5pc2hMb2FkRm9yUmVzb3VyY2UoV0tCdW5kbGVQYWdl UmVmLCBXS0J1bmRsZUZyYW1lUmVmIGZyYW1lLCB1aW50NjRfdCBpZGVudGlmaWVyKQordm9pZCBJ bmplY3RlZEJ1bmRsZVBhZ2U6OmRpZEZpbmlzaExvYWRGb3JSZXNvdXJjZShXS0J1bmRsZVBhZ2VS ZWYsIFdLQnVuZGxlRnJhbWVSZWYsIHVpbnQ2NF90IGlkZW50aWZpZXIpCiB7CiAgICAgaWYgKCFJ bmplY3RlZEJ1bmRsZTo6c2hhcmVkKCkuaXNUZXN0UnVubmluZygpKQogICAgICAgICByZXR1cm47 CkBAIC0xMTUwLDEyICsxMTQ3LDEyIEBAIHZvaWQgSW5qZWN0ZWRCdW5kbGVQYWdlOjpkaWRGaW5p c2hMb2FkRm9yUmVzb3VyY2UoV0tCdW5kbGVQYWdlUmVmLCBXS0J1bmRsZUZyYW1lCiAgICAgICAg IHJldHVybjsKIAogICAgIFN0cmluZ0J1aWxkZXIgc3RyaW5nQnVpbGRlcjsKLSAgICBkdW1wUmVz b3VyY2VVUkwoZnJhbWUsIGlkZW50aWZpZXIsIHN0cmluZ0J1aWxkZXIpOworICAgIGR1bXBSZXNv dXJjZVVSTChpZGVudGlmaWVyLCBzdHJpbmdCdWlsZGVyKTsKICAgICBzdHJpbmdCdWlsZGVyLmFw cGVuZExpdGVyYWwoIiAtIGRpZEZpbmlzaExvYWRpbmdcbiIpOwogICAgIEluamVjdGVkQnVuZGxl OjpzaGFyZWQoKS5vdXRwdXRUZXh0KHN0cmluZ0J1aWxkZXIudG9TdHJpbmcoKSk7CiB9CiAKLXZv aWQgSW5qZWN0ZWRCdW5kbGVQYWdlOjpkaWRGYWlsTG9hZEZvclJlc291cmNlKFdLQnVuZGxlUGFn ZVJlZiwgV0tCdW5kbGVGcmFtZVJlZiBmcmFtZSwgdWludDY0X3QgaWRlbnRpZmllciwgV0tFcnJv clJlZiBlcnJvcikKK3ZvaWQgSW5qZWN0ZWRCdW5kbGVQYWdlOjpkaWRGYWlsTG9hZEZvclJlc291 cmNlKFdLQnVuZGxlUGFnZVJlZiwgV0tCdW5kbGVGcmFtZVJlZiwgdWludDY0X3QgaWRlbnRpZmll ciwgV0tFcnJvclJlZiBlcnJvcikKIHsKICAgICBpZiAoIUluamVjdGVkQnVuZGxlOjpzaGFyZWQo KS5pc1Rlc3RSdW5uaW5nKCkpCiAgICAgICAgIHJldHVybjsKQEAgLTExNjQsNyArMTE2MSw3IEBA IHZvaWQgSW5qZWN0ZWRCdW5kbGVQYWdlOjpkaWRGYWlsTG9hZEZvclJlc291cmNlKFdLQnVuZGxl UGFnZVJlZiwgV0tCdW5kbGVGcmFtZVJlCiAgICAgICAgIHJldHVybjsKIAogICAgIFN0cmluZ0J1 aWxkZXIgc3RyaW5nQnVpbGRlcjsKLSAgICBkdW1wUmVzb3VyY2VVUkwoZnJhbWUsIGlkZW50aWZp ZXIsIHN0cmluZ0J1aWxkZXIpOworICAgIGR1bXBSZXNvdXJjZVVSTChpZGVudGlmaWVyLCBzdHJp bmdCdWlsZGVyKTsKICAgICBzdHJpbmdCdWlsZGVyLmFwcGVuZExpdGVyYWwoIiAtIGRpZEZhaWxM b2FkaW5nV2l0aEVycm9yOiAiKTsKIAogICAgIGR1bXBFcnJvckRlc2NyaXB0aW9uU3VpdGFibGVG b3JUZXN0UmVzdWx0KGVycm9yLCBzdHJpbmdCdWlsZGVyKTsK