30110 2009-10-05 22:38:46 -0700 Move setLocalLoadPolicy and friends to SecurityOrigin 2009-10-06 18:05:16 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 29947 1 abarth webkit-unassigned commit-queue sam oldest_to_newest 152589 0 abarth 2009-10-05 22:38:46 -0700 These bits have to do with the privileges of various security origins, like the origin whitelists. 152593 1 40692 abarth 2009-10-05 23:00:23 -0700 Created attachment 40692 Patch v1 152765 2 40692 eric 2009-10-06 09:52:17 -0700 Comment on attachment 40692 Patch v1 I'm not sure these make any more sense on SecurityOrigin... but OK. LGTM. 152910 3 40692 commit-queue 2009-10-06 18:05:13 -0700 Comment on attachment 40692 Patch v1 Clearing flags on attachment: 40692 Committed r49211: <http://trac.webkit.org/changeset/49211> 152911 4 commit-queue 2009-10-06 18:05:16 -0700 All reviewed patches have been landed. Closing bug. 40692 2009-10-05 23:00:23 -0700 2009-10-06 18:05:12 -0700 Patch v1 bug-30110-20091005230022.patch text/plain 13827 abarth ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NTQ1NDc5OS4uN2JlMmM2YSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOCBAQAorMjAwOS0xMC0wNSAgQWRhbSBCYXJ0aCAg PGFiYXJ0aEB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE1vdmUgc2V0TG9jYWxMb2FkUG9saWN5IGFuZCBmcmllbmRzIHRvIFNlY3Vy aXR5T3JpZ2luCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0zMDExMAorCisgICAgICAgIFRoZXNlIGhhdmUgbW9yZSB0byBkbyB3aXRoIHNlY3VyaXR5IHBv bGljaWVzIHRoYW4gd2l0aCBsb2FkaW5nIGZyYW1lcy4KKworICAgICAgICAqIFdlYkNvcmUuYmFz ZS5leHA6CisgICAgICAgICogZG9tL0RvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRv Y3VtZW50Ojppbml0U2VjdXJpdHlDb250ZXh0KToKKyAgICAgICAgKiBsb2FkZXIvQ2FjaGUuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGU6OnJlcXVlc3RSZXNvdXJjZSk6CisgICAgICAgICog bG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuaDoK KyAgICAgICAgKiBsb2FkZXIvU3VicmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6U3VicmVzb3VyY2VMb2FkZXI6OmNyZWF0ZSk6CisgICAgICAgICogcGFnZS9TZWN1cml0eU9y aWdpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZWN1cml0eU9yaWdpbjo6c2V0TG9jYWxMb2Fk UG9saWN5KToKKyAgICAgICAgKFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luOjpyZXN0cmljdEFjY2Vz c1RvTG9jYWwpOgorICAgICAgICAoV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW46OmFsbG93U3Vic3Rp dHV0ZURhdGFBY2Nlc3NUb0xvY2FsKToKKyAgICAgICAgKiBwYWdlL1NlY3VyaXR5T3JpZ2luLmg6 CisgICAgICAgIChXZWJDb3JlOjpTZWN1cml0eU9yaWdpbjo6KToKKwogMjAwOS0xMC0wNCAgQWRh bSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9XZWJDb3JlLmJhc2UuZXhwIGIvV2ViQ29y ZS9XZWJDb3JlLmJhc2UuZXhwCmluZGV4IGFiZDEzMDkuLmFiNmVmMDUgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvV2ViQ29yZS5iYXNlLmV4cAorKysgYi9XZWJDb3JlL1dlYkNvcmUuYmFzZS5leHAKQEAg LTE2NCw3ICsxNjQsNiBAQCBfX1pON1dlYkNvcmUxMUZyYW1lTG9hZGVyMTZkZXRhY2hGcm9tUGFy ZW50RXYKIF9fWk43V2ViQ29yZTExRnJhbWVMb2FkZXIxNmxvYWRGcmFtZVJlcXVlc3RFUktOU18x NkZyYW1lTG9hZFJlcXVlc3RFYmJOM1dURjEwUGFzc1JlZlB0cklOU181RXZlbnRFRUVOUzVfSU5T XzlGb3JtU3RhdGVFRUUKIF9fWk43V2ViQ29yZTExRnJhbWVMb2FkZXIxN3N0b3BGb3JVc2VyQ2Fu Y2VsRWIKIF9fWk43V2ViQ29yZTExRnJhbWVMb2FkZXIxOGN1cnJlbnRIaXN0b3J5SXRlbUV2Ci1f X1pON1dlYkNvcmUxMUZyYW1lTG9hZGVyMThzZXRMb2NhbExvYWRQb2xpY3lFTlMwXzE1TG9jYWxM b2FkUG9saWN5RQogX19aTjdXZWJDb3JlMTFGcmFtZUxvYWRlcjE4c2hvdWxkSGlkZVJlZmVycmVy RVJLTlNfNEtVUkxFUktOU182U3RyaW5nRQogX19aTjdXZWJDb3JlMTFGcmFtZUxvYWRlcjIxbG9h ZFVSTEludG9DaGlsZEZyYW1lRVJLTlNfNEtVUkxFUktOU182U3RyaW5nRVBOU181RnJhbWVFCiBf X1pON1dlYkNvcmUxMUZyYW1lTG9hZGVyMjFzZXRDdXJyZW50SGlzdG9yeUl0ZW1FTjNXVEYxMFBh c3NSZWZQdHJJTlNfMTFIaXN0b3J5SXRlbUVFRQpAQCAtMzAyLDYgKzMwMSw3IEBAIF9fWk43V2Vi Q29yZTE0UmVzb3VyY2VIYW5kbGUyMGZvcmNlQ29udGVudFNuaWZmaW5nRXYKIF9fWk43V2ViQ29y ZTE0UmVzb3VyY2VMb2FkZXIxNGNhbmNlbGxlZEVycm9yRXYKIF9fWk43V2ViQ29yZTE0UmVzb3Vy Y2VMb2FkZXIxOXNldFNob3VsZEJ1ZmZlckRhdGFFYgogX19aTjdXZWJDb3JlMTRTZWN1cml0eU9y aWdpbjE2Y3JlYXRlRnJvbVN0cmluZ0VSS05TXzZTdHJpbmdFCitfX1pON1dlYkNvcmUxNFNlY3Vy aXR5T3JpZ2luMThzZXRMb2NhbExvYWRQb2xpY3lFTlMwXzE1TG9jYWxMb2FkUG9saWN5RQogX19a TjdXZWJDb3JlMTRTZWN1cml0eU9yaWdpbjI0cmVnaXN0ZXJVUkxTY2hlbWVBc0xvY2FsRVJLTlNf NlN0cmluZ0UKIF9fWk43V2ViQ29yZTE0U2VjdXJpdHlPcmlnaW4yNXdoaXRlTGlzdEFjY2Vzc0Zy b21PcmlnaW5FUktTMF9SS05TXzZTdHJpbmdFUzVfYgogX19aTjdXZWJDb3JlMTRTZWN1cml0eU9y aWdpbjI3cmVzZXRPcmlnaW5BY2Nlc3NXaGl0ZUxpc3RzRXYKZGlmZiAtLWdpdCBhL1dlYkNvcmUv ZG9tL0RvY3VtZW50LmNwcCBiL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCA5ZjhhODkz Li4zZTU4NzE1IDEwMDY0NAotLS0gYS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKKysrIGIvV2Vi Q29yZS9kb20vRG9jdW1lbnQuY3BwCkBAIC00MjM5LDcgKzQyMzksNyBAQCB2b2lkIERvY3VtZW50 Ojppbml0U2VjdXJpdHlDb250ZXh0KCkKICAgICBtX2Nvb2tpZVVSTCA9IHVybDsKICAgICBTY3Jp cHRFeGVjdXRpb25Db250ZXh0OjpzZXRTZWN1cml0eU9yaWdpbihTZWN1cml0eU9yaWdpbjo6Y3Jl YXRlKHVybCkpOwogCi0gICAgaWYgKEZyYW1lTG9hZGVyOjphbGxvd1N1YnN0aXR1dGVEYXRhQWNj ZXNzVG9Mb2NhbCgpKSB7CisgICAgaWYgKFNlY3VyaXR5T3JpZ2luOjphbGxvd1N1YnN0aXR1dGVE YXRhQWNjZXNzVG9Mb2NhbCgpKSB7CiAgICAgICAgIC8vIElmIHRoaXMgZG9jdW1lbnQgd2FzIGxv YWRlZCB3aXRoIHN1YnN0aXR1dGVEYXRhLCB0aGVuIHRoZSBkb2N1bWVudCBjYW4KICAgICAgICAg Ly8gbG9hZCBsb2NhbCByZXNvdXJjZXMuICBTZWUgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE2NzU2CiAgICAgICAgIC8vIGFuZCBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTk3NjAgZm9yIGZ1cnRoZXIKZGlmZiAtLWdpdCBhL1dlYkNvcmUv bG9hZGVyL0NhY2hlLmNwcCBiL1dlYkNvcmUvbG9hZGVyL0NhY2hlLmNwcAppbmRleCAxNGVkYWU5 Li42ZjkxMTkzIDEwMDY0NAotLS0gYS9XZWJDb3JlL2xvYWRlci9DYWNoZS5jcHAKKysrIGIvV2Vi Q29yZS9sb2FkZXIvQ2FjaGUuY3BwCkBAIC0zNCw2ICszNCw3IEBACiAjaW5jbHVkZSAiRnJhbWVW aWV3LmgiCiAjaW5jbHVkZSAiSW1hZ2UuaCIKICNpbmNsdWRlICJSZXNvdXJjZUhhbmRsZS5oIgor I2luY2x1ZGUgIlNlY3VyaXR5T3JpZ2luLmgiCiAjaW5jbHVkZSA8c3RkaW8uaD4KICNpbmNsdWRl IDx3dGYvQ3VycmVudFRpbWUuaD4KIApAQCAtMTA0LDcgKzEwNSw3IEBAIENhY2hlZFJlc291cmNl KiBDYWNoZTo6cmVxdWVzdFJlc291cmNlKERvY0xvYWRlciogZG9jTG9hZGVyLCBDYWNoZWRSZXNv dXJjZTo6VHlwCiAgICAgaWYgKHJlc291cmNlICYmIHJlcXVlc3RJc1ByZWxvYWQgJiYgIXJlc291 cmNlLT5pc1ByZWxvYWRlZCgpKQogICAgICAgICByZXR1cm4gMDsKICAgICAKLSAgICBpZiAoRnJh bWVMb2FkZXI6OnJlc3RyaWN0QWNjZXNzVG9Mb2NhbCgpICYmICFGcmFtZUxvYWRlcjo6Y2FuTG9h ZCh1cmwsIFN0cmluZygpLCBkb2NMb2FkZXItPmRvYygpKSkgeworICAgIGlmIChTZWN1cml0eU9y aWdpbjo6cmVzdHJpY3RBY2Nlc3NUb0xvY2FsKCkgJiYgIUZyYW1lTG9hZGVyOjpjYW5Mb2FkKHVy bCwgU3RyaW5nKCksIGRvY0xvYWRlci0+ZG9jKCkpKSB7CiAgICAgICAgIERvY3VtZW50KiBkb2Mg PSBkb2NMb2FkZXItPmRvYygpOwogICAgICAgICBpZiAoZG9jICYmICFyZXF1ZXN0SXNQcmVsb2Fk KQogICAgICAgICAgICAgRnJhbWVMb2FkZXI6OnJlcG9ydExvY2FsTG9hZEZhaWxlZChkb2MtPmZy YW1lKCksIHVybC5zdHJpbmcoKSk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2xvYWRlci9GcmFtZUxv YWRlci5jcHAgYi9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKaW5kZXggYzgwMmYyYS4u MjFjNzYzNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCisrKyBi L1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcApAQCAtMTI5LDcgKzEyOSw2IEBAIHN0YXRp YyBjb25zdCBjaGFyIGRlZmF1bHRBY2NlcHRIZWFkZXJbXSA9ICJhcHBsaWNhdGlvbi94bWwsYXBw bGljYXRpb24vdm5kLndhcC54CiBzdGF0aWMgY29uc3QgY2hhciBkZWZhdWx0QWNjZXB0SGVhZGVy W10gPSAiYXBwbGljYXRpb24veG1sLGFwcGxpY2F0aW9uL3hodG1sK3htbCx0ZXh0L2h0bWw7cT0w LjksdGV4dC9wbGFpbjtxPTAuOCxpbWFnZS9wbmcsKi8qO3E9MC41IjsKICNlbmRpZgogc3RhdGlj IGRvdWJsZSBzdG9yZWRUaW1lT2ZMYXN0Q29tcGxldGVkTG9hZDsKLXN0YXRpYyBGcmFtZUxvYWRl cjo6TG9jYWxMb2FkUG9saWN5IGxvY2FsTG9hZFBvbGljeSA9IEZyYW1lTG9hZGVyOjpBbGxvd0xv Y2FsTG9hZHNGb3JMb2NhbE9ubHk7CiAKIGJvb2wgaXNCYWNrRm9yd2FyZExvYWRUeXBlKEZyYW1l TG9hZFR5cGUgdHlwZSkKIHsKQEAgLTEwNTgsMjEgKzEwNTcsNiBAQCB2b2lkIEZyYW1lTG9hZGVy OjpzdGFydEljb25Mb2FkZXIoKQogICAgIG1faWNvbkxvYWRlci0+c3RhcnRMb2FkaW5nKCk7CiB9 CiAKLXZvaWQgRnJhbWVMb2FkZXI6OnNldExvY2FsTG9hZFBvbGljeShMb2NhbExvYWRQb2xpY3kg cG9saWN5KQotewotICAgIGxvY2FsTG9hZFBvbGljeSA9IHBvbGljeTsKLX0KLQotYm9vbCBGcmFt ZUxvYWRlcjo6cmVzdHJpY3RBY2Nlc3NUb0xvY2FsKCkKLXsKLSAgICByZXR1cm4gbG9jYWxMb2Fk UG9saWN5ICE9IEZyYW1lTG9hZGVyOjpBbGxvd0xvY2FsTG9hZHNGb3JBbGw7Ci19Ci0KLWJvb2wg RnJhbWVMb2FkZXI6OmFsbG93U3Vic3RpdHV0ZURhdGFBY2Nlc3NUb0xvY2FsKCkKLXsKLSAgICBy ZXR1cm4gbG9jYWxMb2FkUG9saWN5ICE9IEZyYW1lTG9hZGVyOjpBbGxvd0xvY2FsTG9hZHNGb3JM b2NhbE9ubHk7Ci19Ci0KIHZvaWQgRnJhbWVMb2FkZXI6OmNvbW1pdEljb25VUkxUb0ljb25EYXRh YmFzZShjb25zdCBLVVJMJiBpY29uKQogewogICAgIEFTU0VSVChpY29uRGF0YWJhc2UoKSk7CmRp ZmYgLS1naXQgYS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oIGIvV2ViQ29yZS9sb2FkZXIv RnJhbWVMb2FkZXIuaAppbmRleCA1NzkzYjRjLi45MTA1NmNhIDEwMDY0NAotLS0gYS9XZWJDb3Jl L2xvYWRlci9GcmFtZUxvYWRlci5oCisrKyBiL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgK QEAgLTMxNCwxNSArMzE0LDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBIaXN0b3J5 SXRlbSogY3VycmVudEhpc3RvcnlJdGVtKCk7CiAgICAgICAgIHZvaWQgc2V0Q3VycmVudEhpc3Rv cnlJdGVtKFBhc3NSZWZQdHI8SGlzdG9yeUl0ZW0+KTsKIAotICAgICAgICBlbnVtIExvY2FsTG9h ZFBvbGljeSB7Ci0gICAgICAgICAgICBBbGxvd0xvY2FsTG9hZHNGb3JBbGwsICAvLyBObyByZXN0 cmljdGlvbiBvbiBsb2NhbCBsb2Fkcy4KLSAgICAgICAgICAgIEFsbG93TG9jYWxMb2Fkc0Zvckxv Y2FsQW5kU3Vic3RpdHV0ZURhdGEsCi0gICAgICAgICAgICBBbGxvd0xvY2FsTG9hZHNGb3JMb2Nh bE9ubHksCi0gICAgICAgIH07Ci0gICAgICAgIHN0YXRpYyB2b2lkIHNldExvY2FsTG9hZFBvbGlj eShMb2NhbExvYWRQb2xpY3kpOwotICAgICAgICBzdGF0aWMgYm9vbCByZXN0cmljdEFjY2Vzc1Rv TG9jYWwoKTsKLSAgICAgICAgc3RhdGljIGJvb2wgYWxsb3dTdWJzdGl0dXRlRGF0YUFjY2Vzc1Rv TG9jYWwoKTsKLQogICAgICAgICBib29sIGNvbW1pdHRpbmdGaXJzdFJlYWxMb2FkKCkgY29uc3Qg eyByZXR1cm4gIW1fY3JlYXRpbmdJbml0aWFsRW1wdHlEb2N1bWVudCAmJiAhbV9jb21taXR0ZWRG aXJzdFJlYWxEb2N1bWVudExvYWQ7IH0KICAgICAgICAgYm9vbCBjb21taXR0ZWRGaXJzdFJlYWxE b2N1bWVudExvYWQoKSBjb25zdCB7IHJldHVybiBtX2NvbW1pdHRlZEZpcnN0UmVhbERvY3VtZW50 TG9hZDsgfQogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5j cHAgYi9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHAKaW5kZXggMDQ3Y2M2ZC4u MzNlOTQzMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9sb2FkZXIvU3VicmVzb3VyY2VMb2FkZXIuY3Bw CisrKyBiL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmNwcApAQCAtMzMsNiArMzMs NyBAQAogI2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5jbHVkZSAiRnJhbWVMb2FkZXIuaCIKICNpbmNs dWRlICJSZXNvdXJjZUhhbmRsZS5oIgorI2luY2x1ZGUgIlNlY3VyaXR5T3JpZ2luLmgiCiAjaW5j bHVkZSAiU3VicmVzb3VyY2VMb2FkZXJDbGllbnQuaCIKICNpbmNsdWRlIDx3dGYvUmVmQ291bnRl ZExlYWtDb3VudGVyLmg+CiAKQEAgLTcyLDcgKzczLDcgQEAgUGFzc1JlZlB0cjxTdWJyZXNvdXJj ZUxvYWRlcj4gU3VicmVzb3VyY2VMb2FkZXI6OmNyZWF0ZShGcmFtZSogZnJhbWUsIFN1YnJlc291 cmMKICAgICBSZXNvdXJjZVJlcXVlc3QgbmV3UmVxdWVzdCA9IHJlcXVlc3Q7CiAKICAgICBpZiAo IXNraXBDYW5Mb2FkQ2hlY2sKLSAgICAgICAgICAgICYmIEZyYW1lTG9hZGVyOjpyZXN0cmljdEFj Y2Vzc1RvTG9jYWwoKQorICAgICAgICAgICAgJiYgU2VjdXJpdHlPcmlnaW46OnJlc3RyaWN0QWNj ZXNzVG9Mb2NhbCgpCiAgICAgICAgICAgICAmJiAhRnJhbWVMb2FkZXI6OmNhbkxvYWQocmVxdWVz dC51cmwoKSwgU3RyaW5nKCksIGZyYW1lLT5kb2N1bWVudCgpKSkgewogICAgICAgICBGcmFtZUxv YWRlcjo6cmVwb3J0TG9jYWxMb2FkRmFpbGVkKGZyYW1lLCByZXF1ZXN0LnVybCgpLnN0cmluZygp KTsKICAgICAgICAgcmV0dXJuIDA7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlP cmlnaW4uY3BwIGIvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmNwcAppbmRleCBiOTFjMWYx Li5hYzBmN2ZmIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwCisr KyBiL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5jcHAKQEAgLTMwLDEzICszMCwxNCBAQAog I2luY2x1ZGUgIlNlY3VyaXR5T3JpZ2luLmgiCiAKICNpbmNsdWRlICJDU3RyaW5nLmgiCi0jaW5j bHVkZSAiRnJhbWVMb2FkZXIuaCIKICNpbmNsdWRlICJLVVJMLmgiCiAjaW5jbHVkZSAiT3JpZ2lu QWNjZXNzRW50cnkuaCIKICNpbmNsdWRlIDx3dGYvU3RkTGliRXh0cmFzLmg+CiAKIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIAorc3RhdGljIFNlY3VyaXR5T3JpZ2luOjpMb2NhbExvYWRQb2xpY3kgbG9j YWxMb2FkUG9saWN5ID0gU2VjdXJpdHlPcmlnaW46OkFsbG93TG9jYWxMb2Fkc0ZvckxvY2FsT25s eTsKKwogdHlwZWRlZiBWZWN0b3I8T3JpZ2luQWNjZXNzRW50cnk+IE9yaWdpbkFjY2Vzc1doaXRl TGlzdDsKIHR5cGVkZWYgSGFzaE1hcDxTdHJpbmcsIE9yaWdpbkFjY2Vzc1doaXRlTGlzdCo+IE9y aWdpbkFjY2Vzc01hcDsKIApAQCAtMjQ0LDcgKzI0NSw3IEBAIHZvaWQgU2VjdXJpdHlPcmlnaW46 OmdyYW50TG9hZExvY2FsUmVzb3VyY2VzKCkKICAgICAvLyBpbiBhIFNlY3VyaXR5T3JpZ2luIGlz IGEgc2VjdXJpdHkgaGF6YXJkIGJlY2F1c2UgdGhlIGRvY3VtZW50cyB3aXRob3V0CiAgICAgLy8g dGhlIHByaXZpbGVnZSBjYW4gb2J0YWluIHRoZSBwcml2aWxlZ2UgYnkgaW5qZWN0aW5nIHNjcmlw dCBpbnRvIHRoZQogICAgIC8vIGRvY3VtZW50cyB0aGF0IGhhdmUgYmVlbiBncmFudGVkIHRoZSBw cml2aWxlZ2UuCi0gICAgQVNTRVJUKEZyYW1lTG9hZGVyOjphbGxvd1N1YnN0aXR1dGVEYXRhQWNj ZXNzVG9Mb2NhbCgpKTsKKyAgICBBU1NFUlQoYWxsb3dTdWJzdGl0dXRlRGF0YUFjY2Vzc1RvTG9j YWwoKSk7CiAgICAgbV9jYW5Mb2FkTG9jYWxSZXNvdXJjZXMgPSB0cnVlOwogfQogCkBAIC0zNzAs MTMgKzM3MSwxMSBAQCBib29sIFNlY3VyaXR5T3JpZ2luOjppc1NhbWVTY2hlbWVIb3N0UG9ydChj b25zdCBTZWN1cml0eU9yaWdpbiogb3RoZXIpIGNvbnN0CiAgICAgcmV0dXJuIHRydWU7CiB9CiAK LS8vIHN0YXRpYwogdm9pZCBTZWN1cml0eU9yaWdpbjo6cmVnaXN0ZXJVUkxTY2hlbWVBc0xvY2Fs KGNvbnN0IFN0cmluZyYgc2NoZW1lKQogewogICAgIGxvY2FsU2NoZW1lcygpLmFkZChzY2hlbWUp OwogfQogCi0vLyBzdGF0aWMKIHZvaWQgU2VjdXJpdHlPcmlnaW46OnJlbW92ZVVSTFNjaGVtZVJl Z2lzdGVyZWRBc0xvY2FsKGNvbnN0IFN0cmluZyYgc2NoZW1lKQogewogICAgIGlmIChzY2hlbWUg PT0gImZpbGUiKQpAQCAtMzkyLDEzICszOTEsMTEgQEAgdm9pZCBTZWN1cml0eU9yaWdpbjo6cmVt b3ZlVVJMU2NoZW1lUmVnaXN0ZXJlZEFzTG9jYWwoY29uc3QgU3RyaW5nJiBzY2hlbWUpCiAgICAg bG9jYWxTY2hlbWVzKCkucmVtb3ZlKHNjaGVtZSk7CiB9CiAKLS8vIHN0YXRpYwogY29uc3QgVVJM U2NoZW1lc01hcCYgIFNlY3VyaXR5T3JpZ2luOjpsb2NhbFVSTFNjaGVtZXMoKQogewogICAgIHJl dHVybiBsb2NhbFNjaGVtZXMoKTsKIH0KIAotLy8gc3RhdGljCiBib29sIFNlY3VyaXR5T3JpZ2lu OjpzaG91bGRUcmVhdFVSTEFzTG9jYWwoY29uc3QgU3RyaW5nJiB1cmwpCiB7CiAgICAgLy8gVGhp cyBhdm9pZHMgYW4gYWxsb2NhdGlvbiBvZiBhbm90aGVyIFN0cmluZyBhbmQgdGhlIEhhc2hTZXQg Y29udGFpbnMoKQpAQCAtNDE5LDcgKzQxNiw2IEBAIGJvb2wgU2VjdXJpdHlPcmlnaW46OnNob3Vs ZFRyZWF0VVJMQXNMb2NhbChjb25zdCBTdHJpbmcmIHVybCkKICAgICByZXR1cm4gbG9jYWxTY2hl bWVzKCkuY29udGFpbnMoc2NoZW1lKTsKIH0KIAotLy8gc3RhdGljCiBib29sIFNlY3VyaXR5T3Jp Z2luOjpzaG91bGRUcmVhdFVSTFNjaGVtZUFzTG9jYWwoY29uc3QgU3RyaW5nJiBzY2hlbWUpCiB7 CiAgICAgLy8gVGhpcyBhdm9pZHMgYW4gYWxsb2NhdGlvbiBvZiBhbm90aGVyIFN0cmluZyBhbmQg dGhlIEhhc2hTZXQgY29udGFpbnMoKQpAQCAtNDM4LDE4ICs0MzQsMzEgQEAgYm9vbCBTZWN1cml0 eU9yaWdpbjo6c2hvdWxkVHJlYXRVUkxTY2hlbWVBc0xvY2FsKGNvbnN0IFN0cmluZyYgc2NoZW1l KQogICAgIHJldHVybiBsb2NhbFNjaGVtZXMoKS5jb250YWlucyhzY2hlbWUpOwogfQogCi0vLyBz dGF0aWMKIHZvaWQgU2VjdXJpdHlPcmlnaW46OnJlZ2lzdGVyVVJMU2NoZW1lQXNOb0FjY2Vzcyhj b25zdCBTdHJpbmcmIHNjaGVtZSkKIHsKICAgICBub0FjY2Vzc1NjaGVtZXMoKS5hZGQoc2NoZW1l KTsKIH0KIAotLy8gc3RhdGljCiBib29sIFNlY3VyaXR5T3JpZ2luOjpzaG91bGRUcmVhdFVSTFNj aGVtZUFzTm9BY2Nlc3MoY29uc3QgU3RyaW5nJiBzY2hlbWUpCiB7CiAgICAgcmV0dXJuIG5vQWNj ZXNzU2NoZW1lcygpLmNvbnRhaW5zKHNjaGVtZSk7CiB9CiAKK3ZvaWQgU2VjdXJpdHlPcmlnaW46 OnNldExvY2FsTG9hZFBvbGljeShMb2NhbExvYWRQb2xpY3kgcG9saWN5KQoreworICAgIGxvY2Fs TG9hZFBvbGljeSA9IHBvbGljeTsKK30KKworYm9vbCBTZWN1cml0eU9yaWdpbjo6cmVzdHJpY3RB Y2Nlc3NUb0xvY2FsKCkKK3sKKyAgICByZXR1cm4gbG9jYWxMb2FkUG9saWN5ICE9IFNlY3VyaXR5 T3JpZ2luOjpBbGxvd0xvY2FsTG9hZHNGb3JBbGw7Cit9CisKK2Jvb2wgU2VjdXJpdHlPcmlnaW46 OmFsbG93U3Vic3RpdHV0ZURhdGFBY2Nlc3NUb0xvY2FsKCkKK3sKKyAgICByZXR1cm4gbG9jYWxM b2FkUG9saWN5ICE9IFNlY3VyaXR5T3JpZ2luOjpBbGxvd0xvY2FsTG9hZHNGb3JMb2NhbE9ubHk7 Cit9CisKIHZvaWQgU2VjdXJpdHlPcmlnaW46OndoaXRlTGlzdEFjY2Vzc0Zyb21PcmlnaW4oY29u c3QgU2VjdXJpdHlPcmlnaW4mIHNvdXJjZU9yaWdpbiwgY29uc3QgU3RyaW5nJiBkZXN0aW5hdGlv blByb3RvY29sLCBjb25zdCBTdHJpbmcmIGRlc3RpbmF0aW9uRG9tYWlucywgYm9vbCBhbGxvd0Rl c3RpbmF0aW9uU3ViZG9tYWlucykKIHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmggYi9XZWJDb3JlL3BhZ2UvU2Vj dXJpdHlPcmlnaW4uaAppbmRleCA3MzJhZmE4Li44YjJlODE5IDEwMDY0NAotLS0gYS9XZWJDb3Jl L3BhZ2UvU2VjdXJpdHlPcmlnaW4uaAorKysgYi9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4u aApAQCAtMTQzLDYgKzE0MywxNSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHN0YXRp YyBib29sIHNob3VsZFRyZWF0VVJMQXNMb2NhbChjb25zdCBTdHJpbmcmKTsKICAgICAgICAgc3Rh dGljIGJvb2wgc2hvdWxkVHJlYXRVUkxTY2hlbWVBc0xvY2FsKGNvbnN0IFN0cmluZyYpOwogCisg ICAgICAgIGVudW0gTG9jYWxMb2FkUG9saWN5IHsKKyAgICAgICAgICAgIEFsbG93TG9jYWxMb2Fk c0ZvckFsbCwgIC8vIE5vIHJlc3RyaWN0aW9uIG9uIGxvY2FsIGxvYWRzLgorICAgICAgICAgICAg QWxsb3dMb2NhbExvYWRzRm9yTG9jYWxBbmRTdWJzdGl0dXRlRGF0YSwKKyAgICAgICAgICAgIEFs bG93TG9jYWxMb2Fkc0ZvckxvY2FsT25seSwKKyAgICAgICAgfTsKKyAgICAgICAgc3RhdGljIHZv aWQgc2V0TG9jYWxMb2FkUG9saWN5KExvY2FsTG9hZFBvbGljeSk7CisgICAgICAgIHN0YXRpYyBi b29sIHJlc3RyaWN0QWNjZXNzVG9Mb2NhbCgpOworICAgICAgICBzdGF0aWMgYm9vbCBhbGxvd1N1 YnN0aXR1dGVEYXRhQWNjZXNzVG9Mb2NhbCgpOworCiAgICAgICAgIHN0YXRpYyB2b2lkIHJlZ2lz dGVyVVJMU2NoZW1lQXNOb0FjY2Vzcyhjb25zdCBTdHJpbmcmKTsKICAgICAgICAgc3RhdGljIGJv b2wgc2hvdWxkVHJlYXRVUkxTY2hlbWVBc05vQWNjZXNzKGNvbnN0IFN0cmluZyYpOwogCmRpZmYg LS1naXQgYS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1dlYktpdC9tYWMvQ2hhbmdlTG9nCmluZGV4 IGRjNTMxY2MuLjM5MmJmMDUgMTAwNjQ0Ci0tLSBhL1dlYktpdC9tYWMvQ2hhbmdlTG9nCisrKyBi L1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMTAtMDUgIEFkYW0g QmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBNb3ZlIHNldExvY2FsTG9hZFBvbGljeSBhbmQgZnJpZW5kcyB0 byBTZWN1cml0eU9yaWdpbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MzAxMTAKKworICAgICAgICBDYWxsIHRoZSBuZXcgQVBJLgorCisgICAgICAgICog V2ViVmlldy9XZWJWaWV3Lm1tOgorICAgICAgICAoLVtXZWJWaWV3IF9jb21tb25Jbml0aWFsaXph dGlvbldpdGhGcmFtZU5hbWU6Z3JvdXBOYW1lOnVzZXNEb2N1bWVudFZpZXdzOl0pOgorCiAyMDA5 LTEwLTA1ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAg IE1vcmUgYnVpbGQgZml4ZXMgZm9yIFRpZ2VyLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L21hYy9XZWJW aWV3L1dlYlZpZXcubW0gYi9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQppbmRleCBhMWVh YWM5Li5jNWRmMDA5IDEwMDY0NAotLS0gYS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQor KysgYi9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQpAQCAtNjYyLDExICs2NjIsMTEgQEAg c3RhdGljIGJvb2wgcnVubmluZ1RpZ2VyTWFpbCgpCiAKICAgICBpZiAoIVdlYktpdExpbmtlZE9u T3JBZnRlcihXRUJLSVRfRklSU1RfVkVSU0lPTl9XSVRIX0xPQ0FMX1JFU09VUkNFX1NFQ1VSSVRZ X1JFU1RSSUNUSU9OKSkgewogICAgICAgICAvLyBPcmlnaW5hbGx5LCB3ZSBhbGxvd2VkIGFsbCBs b2NhbCBsb2Fkcy4KLSAgICAgICAgRnJhbWVMb2FkZXI6OnNldExvY2FsTG9hZFBvbGljeShGcmFt ZUxvYWRlcjo6QWxsb3dMb2NhbExvYWRzRm9yQWxsKTsKKyAgICAgICAgU2VjdXJpdHlPcmlnaW46 OnNldExvY2FsTG9hZFBvbGljeShTZWN1cml0eU9yaWdpbjo6QWxsb3dMb2NhbExvYWRzRm9yQWxs KTsKICAgICB9IGVsc2UgaWYgKCFXZWJLaXRMaW5rZWRPbk9yQWZ0ZXIoV0VCS0lUX0ZJUlNUX1ZF UlNJT05fV0lUSF9NT1JFX1NUUklDVF9MT0NBTF9SRVNPVVJDRV9TRUNVUklUWV9SRVNUUklDVElP TikpIHsKICAgICAgICAgLy8gTGF0ZXIsIHdlIGFsbG93ZWQgbG9jYWwgbG9hZHMgZm9yIGxvY2Fs IFVSTHMgYW5kIGRvY3VtZW50cyBsb2FkZWQKICAgICAgICAgLy8gd2l0aCBzdWJzdGl0dXRlIGRh dGEuCi0gICAgICAgIEZyYW1lTG9hZGVyOjpzZXRMb2NhbExvYWRQb2xpY3koRnJhbWVMb2FkZXI6 OkFsbG93TG9jYWxMb2Fkc0ZvckxvY2FsQW5kU3Vic3RpdHV0ZURhdGEpOworICAgICAgICBTZWN1 cml0eU9yaWdpbjo6c2V0TG9jYWxMb2FkUG9saWN5KFNlY3VyaXR5T3JpZ2luOjpBbGxvd0xvY2Fs TG9hZHNGb3JMb2NhbEFuZFN1YnN0aXR1dGVEYXRhKTsKICAgICB9CiAKICAgICBpZiAoIVdlYktp dExpbmtlZE9uT3JBZnRlcihXRUJLSVRfRklSU1RfVkVSU0lPTl9XSVRIT1VUX0NPTlRFTlRfU05J RkZJTkdfRk9SX0ZJTEVfVVJMUykpCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdl LmNwcCBiL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwCmluZGV4IDM5ODk1OTIuLjBhY2VjNDgg MTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwCisrKyBiL1dlYktpdC9xdC9B cGkvcXdlYnBhZ2UuY3BwCkBAIC0yNzEsNyArMjcxLDcgQEAgUVdlYlBhZ2VQcml2YXRlOjpRV2Vi UGFnZVByaXZhdGUoUVdlYlBhZ2UgKnFxKQogewogICAgIFdlYkNvcmU6OkluaXRpYWxpemVMb2dn aW5nQ2hhbm5lbHNJZk5lY2Vzc2FyeSgpOwogICAgIEpTQzo6aW5pdGlhbGl6ZVRocmVhZGluZygp OwotICAgIFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpzZXRMb2NhbExvYWRQb2xpY3koV2ViQ29yZTo6 RnJhbWVMb2FkZXI6OkFsbG93TG9jYWxMb2Fkc0ZvckxvY2FsQW5kU3Vic3RpdHV0ZURhdGEpOwor ICAgIFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luOjpzZXRMb2NhbExvYWRQb2xpY3koV2ViQ29yZTo6 U2VjdXJpdHlPcmlnaW46OkFsbG93TG9jYWxMb2Fkc0ZvckxvY2FsQW5kU3Vic3RpdHV0ZURhdGEp OwogCiAgICAgY2hyb21lQ2xpZW50ID0gbmV3IENocm9tZUNsaWVudFF0KHEpOwogICAgIGNvbnRl eHRNZW51Q2xpZW50ID0gbmV3IENvbnRleHRNZW51Q2xpZW50UXQoKTsKZGlmZiAtLWdpdCBhL1dl YktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IGRiYWE1YTIuLmFj N2IxNmEgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L3F0L0No YW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDA5LTEwLTA1ICBBZGFtIEJhcnRoICA8YWJhcnRo QHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgTW92ZSBzZXRMb2NhbExvYWRQb2xpY3kgYW5kIGZyaWVuZHMgdG8gU2VjdXJpdHlPcmln aW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMwMTEw CisKKyAgICAgICAgQ2FsbCB0aGUgbmV3IEFQSS4KKworICAgICAgICAqIEFwaS9xd2VicGFnZS5j cHA6CisgICAgICAgIChRV2ViUGFnZVByaXZhdGU6OlFXZWJQYWdlUHJpdmF0ZSk6CisKIDIwMDkt MTAtMDUgIEdpcmlzaCBSYW1ha3Jpc2huYW4gIDxnaXJpc2hAZm9yd2FyZGJpYXMuaW4+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gSGF1c21hbm4u