176394 2017-09-05 12:40:00 -0700 Cache Storage Engine should not mix different origin caches 2017-09-27 12:37:54 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf achristensen beidson buildbot cdumez cgarcia commit-queue webkit-bug-importer oldest_to_newest 1345573 0 youennf 2017-09-05 12:40:00 -0700 Cache Storage Engine should not mix different origin caches. 1345575 1 319925 youennf 2017-09-05 12:42:02 -0700 Created attachment 319925 Patch 1345578 2 319926 youennf 2017-09-05 12:45:07 -0700 Created attachment 319926 Patch 1345636 3 319926 commit-queue 2017-09-05 14:00:26 -0700 Comment on attachment 319926 Patch Clearing flags on attachment: 319926 Committed r221633: <http://trac.webkit.org/changeset/221633> 1345637 4 commit-queue 2017-09-05 14:00:28 -0700 All reviewed patches have been landed. Closing bug. 1353546 5 webkit-bug-importer 2017-09-27 12:37:54 -0700 <rdar://problem/34693640> 319925 2017-09-05 12:42:02 -0700 2017-09-05 12:45:06 -0700 Patch bug-176394-20170905124201.patch text/plain 7799 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjIxNTEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDFkMzgyNzIwNzFhMzEwNTky NTQyOWIzODVkYThjN2E0ZGM5NTNlNDkuLjUzNDRkMTM5NmMwN2E2ODEzNTQyNGZiYWM1NjA5ZTI0 NjEyZWI0NzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTctMDktMDUgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIENhY2hlIFN0b3JhZ2UgRW5naW5l IHNob3VsZCBub3QgbWl4IGRpZmZlcmVudCBvcmlnaW4gY2FjaGVzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzYzOTQKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hlL0Nh Y2hlU3RvcmFnZUVuZ2luZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OkNhY2hlU3RvcmFnZTo6RW5n aW5lOjpyZWFkQ2FjaGVzRnJvbURpc2spOiBJbml0aWFsaXppbmcgdGhlIHNhbHQgYmVmb3JlIGNy ZWF0aW5nIHRoZSBDYWNoZXMgb2JqZWN0CisgICAgICAgIHNvIHRoYXQgaXRzIHBlcnNpc3RlbmN5 IHBhdGggaXMgY29ycmVjdGx5IGNvbXB1dGVkLgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2Nh Y2hlL0NhY2hlU3RvcmFnZUVuZ2luZUNhY2hlcy5jcHA6CisgICAgICAgIChXZWJLaXQ6OkNhY2hl U3RvcmFnZTo6Y2FjaGVzUm9vdFBhdGgpOiBTZXR0aW5nIG9yaWdpbiBhcyBwYXJ0aXRpb24gc3Ry aW5nLgorCiAyMDE3LTA5LTAxICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAog ICAgICAgICBOZXR3b3JrUHJvY2VzcyBDYWNoZSBhbmQgQ2FjaGVzIHNob3VsZCBiZSBjbGVhcmVk IHdoZW4gdGhlIGxhc3QgcmVsYXRlZCBXZWJQcm9jZXNzIENhY2hlIG9yIENhY2hlU3RvcmFnZSBp cyBkZXN0cm95ZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2Fj aGUvQ2FjaGVTdG9yYWdlRW5naW5lLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv Y2FjaGUvQ2FjaGVTdG9yYWdlRW5naW5lLmNwcAppbmRleCA4YjAyYWE4NzQ4ZTNhNzkzMjVjZDRh NzMyY2E0NTdiOWYxZmEzY2JhLi45ZTcxMzYwNDY0M2U0NDA0NGUzOTViMDI2YTUzOGNhNTA1ZWYz ZDJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL0NhY2hl U3RvcmFnZUVuZ2luZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNo ZS9DYWNoZVN0b3JhZ2VFbmdpbmUuY3BwCkBAIC0xODksMzEgKzE4OSwyOCBAQCB2b2lkIEVuZ2lu ZTo6aW5pdGlhbGl6ZShGdW5jdGlvbjx2b2lkKHN0ZDo6b3B0aW9uYWw8RXJyb3I+JiYpPiYmIGNh bGxiYWNrKQogCiB2b2lkIEVuZ2luZTo6cmVhZENhY2hlc0Zyb21EaXNrKGNvbnN0IFN0cmluZyYg b3JpZ2luLCBDYWNoZXNDYWxsYmFjayYmIGNhbGxiYWNrKQogewotICAgIGF1dG8mIGNhY2hlcyA9 IG1fY2FjaGVzLmVuc3VyZShvcmlnaW4sIFsmb3JpZ2luLCB0aGlzXSB7Ci0gICAgICAgIHJldHVy biBDYWNoZXM6OmNyZWF0ZSgqdGhpcywgU3RyaW5nIHsgb3JpZ2luIH0pOwotICAgIH0pLml0ZXJh dG9yLT52YWx1ZTsKKyAgICBpbml0aWFsaXplKFt0aGlzLCBvcmlnaW4sIGNhbGxiYWNrID0gV1RG TW92ZShjYWxsYmFjayldKHN0ZDo6b3B0aW9uYWw8RXJyb3I+JiYgZXJyb3IpIG11dGFibGUgewor ICAgICAgICBhdXRvJiBjYWNoZXMgPSBtX2NhY2hlcy5lbnN1cmUob3JpZ2luLCBbJm9yaWdpbiwg dGhpc10geworICAgICAgICAgICAgcmV0dXJuIENhY2hlczo6Y3JlYXRlKCp0aGlzLCBTdHJpbmcg eyBvcmlnaW4gfSk7CisgICAgICAgIH0pLml0ZXJhdG9yLT52YWx1ZTsKIAotICAgIGlmIChjYWNo ZXMtPmlzSW5pdGlhbGl6ZWQoKSkgewotICAgICAgICBjYWxsYmFjayhzdGQ6OnJlZmVyZW5jZV93 cmFwcGVyPENhY2hlcz4geyBjYWNoZXMuZ2V0KCkgfSk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9 CisgICAgICAgIGlmIChjYWNoZXMtPmlzSW5pdGlhbGl6ZWQoKSkgeworICAgICAgICAgICAgY2Fs bGJhY2soc3RkOjpyZWZlcmVuY2Vfd3JhcHBlcjxDYWNoZXM+IHsgY2FjaGVzLmdldCgpIH0pOwor ICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CiAKLSAgICBpbml0aWFsaXplKFt0aGlzLCBv cmlnaW4sIGNhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayldKHN0ZDo6b3B0aW9uYWw8RXJyb3I+ JiYgZXJyb3IpIG11dGFibGUgewogICAgICAgICBpZiAoZXJyb3IpIHsKICAgICAgICAgICAgIGNh bGxiYWNrKG1ha2VVbmV4cGVjdGVkKGVycm9yLnZhbHVlKCkpKTsKICAgICAgICAgICAgIHJldHVy bjsKICAgICAgICAgfQogCi0gICAgICAgIGF1dG8gY2FjaGVzID0gbV9jYWNoZXMuZ2V0KG9yaWdp bik7Ci0gICAgICAgIEFTU0VSVChjYWNoZXMpOwotCi0gICAgICAgIGNhY2hlcy0+aW5pdGlhbGl6 ZShbY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKSwgY2FjaGVzXShzdGQ6Om9wdGlvbmFsPEVy cm9yPiYmIGVycm9yKSBtdXRhYmxlIHsKKyAgICAgICAgY2FjaGVzLT5pbml0aWFsaXplKFtjYWxs YmFjayA9IFdURk1vdmUoY2FsbGJhY2spLCBjYWNoZXMgPSBjYWNoZXMuY29weVJlZigpXShzdGQ6 Om9wdGlvbmFsPEVycm9yPiYmIGVycm9yKSBtdXRhYmxlIHsKICAgICAgICAgICAgIGlmIChlcnJv cikgewogICAgICAgICAgICAgICAgIGNhbGxiYWNrKG1ha2VVbmV4cGVjdGVkKGVycm9yLnZhbHVl KCkpKTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CiAKLSAgICAgICAg ICAgIGNhbGxiYWNrKHN0ZDo6cmVmZXJlbmNlX3dyYXBwZXI8Q2FjaGVzPiB7ICpjYWNoZXMgfSk7 CisgICAgICAgICAgICBjYWxsYmFjayhzdGQ6OnJlZmVyZW5jZV93cmFwcGVyPENhY2hlcz4geyBj YWNoZXMuZ2V0KCkgfSk7CiAgICAgICAgIH0pOwogICAgIH0pOwogfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmVDYWNoZXMu Y3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdp bmVDYWNoZXMuY3BwCmluZGV4IDVjYjIwYzBlYTQwZjY1YWQ0ZmFjMjhiMDI4NWNhNjZjZWFjYTM4 ZWQuLmU2OTJlNDQxMmZiZWNhMTcyMmFjMDBiMzU4ZTk5NDZlMGRhMDJlZDMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvQ2FjaGVTdG9yYWdlRW5naW5lQ2Fj aGVzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL0NhY2hlU3Rv cmFnZUVuZ2luZUNhY2hlcy5jcHAKQEAgLTQxLDcgKzQxLDcgQEAgc3RhdGljIGlubGluZSBTdHJp bmcgY2FjaGVzUm9vdFBhdGgoRW5naW5lJiBlbmdpbmUsIGNvbnN0IFN0cmluZyYgb3JpZ2luKQog ICAgIGlmICghZW5naW5lLnNob3VsZFBlcnNpc3QoKSkKICAgICAgICAgcmV0dXJuIHsgfTsKIAot ICAgIEtleSBrZXkoZW5naW5lLnJvb3RQYXRoKCksIHsgfSwgeyB9LCBvcmlnaW4sIGVuZ2luZS5z YWx0KCkpOworICAgIEtleSBrZXkob3JpZ2luLCB7IH0sIHsgfSwgeyB9LCBlbmdpbmUuc2FsdCgp KTsKICAgICByZXR1cm4gV2ViQ29yZTo6cGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50KGVuZ2luZS5y b290UGF0aCgpLCBrZXkucGFydGl0aW9uSGFzaEFzU3RyaW5nKCkpOwogfQogCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYTQx NmExZDYzOGMzN2I5MTlkYTgwODU0NzE2NmUwNjM2Y2ZkZjNjMi4uN2YyMzYyZWViY2QxOWZiNjNm YTEwNjlmNDk1MmRmYzdjYTE3YmZhNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE3LTA5LTA1 ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBDYWNoZSBTdG9y YWdlIEVuZ2luZSBzaG91bGQgbm90IG1peCBkaWZmZXJlbnQgb3JpZ2luIGNhY2hlcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc2Mzk0CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBodHRwL3Rlc3RzL2Nh Y2hlLXN0b3JhZ2UvY2FjaGUtb3JpZ2lucy5odHRwcy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAg ICAgICAqIGh0dHAvdGVzdHMvY2FjaGUtc3RvcmFnZS9jYWNoZS1vcmlnaW5zLmh0dHBzLmh0bWw6 IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVzdHMvY2FjaGUtc3RvcmFnZS9yZXNvdXJjZXMvY2Fj aGUtcGVyc2lzdGVuY3ktaWZyYW1lLmh0bWw6CisKIDIwMTctMDktMDEgIFlvdWVubiBGYWJsZXQg IDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIE5ldHdvcmtQcm9jZXNzIENhY2hlIGFuZCBD YWNoZXMgc2hvdWxkIGJlIGNsZWFyZWQgd2hlbiB0aGUgbGFzdCByZWxhdGVkIFdlYlByb2Nlc3Mg Q2FjaGUgb3IgQ2FjaGVTdG9yYWdlIGlzIGRlc3Ryb3llZApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvaHR0cC90ZXN0cy9jYWNoZS1zdG9yYWdlL2NhY2hlLW9yaWdpbnMuaHR0cHMtZXhwZWN0ZWQu dHh0IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jYWNoZS1zdG9yYWdlL2NhY2hlLW9yaWdpbnMu aHR0cHMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjM2NzA3ZGQxYWI5NGE2NzZiNThiNGVkMDhh ZTVkNTNkOGZmNjA3ZmYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3Rz L2NhY2hlLXN0b3JhZ2UvY2FjaGUtb3JpZ2lucy5odHRwcy1leHBlY3RlZC50eHQKQEAgLTAsMCAr MSw1IEBACisgIAorCitQQVNTIENyZWF0ZSBhIGNhY2hlIHN0b3JhZ2UgYW5kIGxvb2sgYXQgdGhl IHJlcHJlc2VudGF0aW9uIAorUEFTUyBDYWNoZXMgZnJvbSBkaWZmZXJlbnQgb3JpZ2lucyBzaG91 bGQgbm90IG1peCAKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jYWNoZS1z dG9yYWdlL2NhY2hlLW9yaWdpbnMuaHR0cHMuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMv Y2FjaGUtc3RvcmFnZS9jYWNoZS1vcmlnaW5zLmh0dHBzLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMDEyYzU0 YWRhZmU3NWM5YTg5Mzc1NjRhNTQ2MDY5Y2M4MTMxNzI1NwotLS0gL2Rldi9udWxsCisrKyBiL0xh eW91dFRlc3RzL2h0dHAvdGVzdHMvY2FjaGUtc3RvcmFnZS9jYWNoZS1vcmlnaW5zLmh0dHBzLmh0 bWwKQEAgLTAsMCArMSw0MyBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPHRp dGxlPkNhY2hlIFN0b3JhZ2U6IHRlc3RpbmcgcGVyc2lzdGVuY3kgb2YgZGlmZmVyZW50IG9yaWdp bnM8L3RpdGxlPgorPHNjcmlwdCBzcmM9Ii9yZXNvdXJjZXMvdGVzdGhhcm5lc3MuanMiPjwvc2Ny aXB0PgorPHNjcmlwdCBzcmM9Ii9yZXNvdXJjZXMvdGVzdGhhcm5lc3NyZXBvcnQuanMiPjwvc2Ny aXB0PgorPHNjcmlwdCBzcmM9Ii9yZXNvdXJjZXMvZ2MuanMiPjwvc2NyaXB0PgorPC9oZWFkPgor PGJvZHk+CisgICAgPHNjcmlwdD4KKworICAgIGZ1bmN0aW9uIGNoZWNrQ2FjaGVzKG5hbWUpIHsK KyAgICAgICAgcHJvbWlzZV90ZXN0KCgpID0+IHsKKyAgICAgICAgICAgIHJldHVybiBzZWxmLmNh Y2hlcy5rZXlzKCkudGhlbihrZXlzID0+IHsKKyAgICAgICAgICAgICAgICBhc3NlcnRfdHJ1ZShr ZXlzLmluZGV4T2YoImNhY2hlMSIpICE9PSAtMSwgIlNob3VsZCBoYXZlIGNhY2hlMSIpOworICAg ICAgICAgICAgICAgIGFzc2VydF90cnVlKGtleXMuaW5kZXhPZigiY2FjaGUyIikgPT09IC0xLCAi U2hvdWxkIG5vdCBoYXZlIGNhY2hlMSIpOworICAgICAgICAgICAgfSk7CisgICAgICAgIH0sIG5h bWUpOworICAgIH0KKworICAgIHByb21pc2VfdGVzdCh0ZXN0ID0+IHsKKyAgICAgICAgaWYgKCF3 aW5kb3cuaW50ZXJuYWxzKQorICAgICAgICAgICAgcmV0dXJuIFByb21pc2UucmVqZWN0KCJUZXN0 IHJlcXVpcmVzIGludGVybmFscyIpOworCisgICAgICAgIHJldHVybiBuZXcgUHJvbWlzZSgocmVz b2x2ZSwgcmVqZWN0KSA9PiB7CisgICAgICAgICAgICB2YXIgY291bnRlciA9IDA7CisgICAgICAg ICAgICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcigibWVzc2FnZSIsIHRlc3Quc3RlcF9mdW5jKChl dmVudCkgPT4geworICAgICAgICAgICAgICAgIGlmICgrK2NvdW50ZXIgPD0gMSkKKyAgICAgICAg ICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgIGludGVybmFscy5jbGVhckNhY2hl U3RvcmFnZU1lbW9yeVJlcHJlc2VudGF0aW9uKCk7CisgICAgICAgICAgICAgICAgY2hlY2tDYWNo ZXMoIkNhY2hlcyBmcm9tIGRpZmZlcmVudCBvcmlnaW5zIHNob3VsZCBub3QgbWl4Iik7CisgICAg ICAgICAgICAgICAgcmVzb2x2ZSgpOworICAgICAgICAgICAgfSkpOworICAgICAgICB9KQorICAg IH0sICJDcmVhdGUgYSBjYWNoZSBzdG9yYWdlIGFuZCBsb29rIGF0IHRoZSByZXByZXNlbnRhdGlv biIpOworICAgIDwvc2NyaXB0PgorICAgIDxkaXY+CisgICAgICAgIDxpZnJhbWUgc3JjPSJyZXNv dXJjZXMvY2FjaGUtcGVyc2lzdGVuY3ktaWZyYW1lLmh0bWwjbmFtZT1jYWNoZTEiPjwvaWZyYW1l PgorICAgICAgICA8aWZyYW1lIHNyYz0iaHR0cHM6Ly9sb2NhbGhvc3Q6ODQ0My9jYWNoZS1zdG9y YWdlL3Jlc291cmNlcy9jYWNoZS1wZXJzaXN0ZW5jeS1pZnJhbWUuaHRtbCNuYW1lPWNhY2hlMiI+ PC9pZnJhbWU+CisgICAgPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+CisKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2h0dHAvdGVzdHMvY2FjaGUtc3RvcmFnZS9yZXNvdXJjZXMvY2FjaGUtcGVyc2lz dGVuY3ktaWZyYW1lLmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2NhY2hlLXN0b3JhZ2Uv cmVzb3VyY2VzL2NhY2hlLXBlcnNpc3RlbmN5LWlmcmFtZS5odG1sCmluZGV4IGQ5ZjU5OTQ5NmQ3 MWZlZWY4ZDIwYTI0MTI0NDk0ZDNiYjJkNjdjYjAuLjM2Nzc0MjQxZjUwODIzZWYxMTgzNTZmMjdk NTJmYTQzMzQxYzY3ZTEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvY2FjaGUt c3RvcmFnZS9yZXNvdXJjZXMvY2FjaGUtcGVyc2lzdGVuY3ktaWZyYW1lLmh0bWwKKysrIGIvTGF5 b3V0VGVzdHMvaHR0cC90ZXN0cy9jYWNoZS1zdG9yYWdlL3Jlc291cmNlcy9jYWNoZS1wZXJzaXN0 ZW5jeS1pZnJhbWUuaHRtbApAQCAtMjIsNyArMjIsMTAgQEAgZnVuY3Rpb24gZG9UZXN0KCkKICAg ICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIHNlbGYuY2FjaGVzLm9wZW4oInRlc3RDYWNoZU5h bWUiKS50aGVuKCgpID0+IHsKKyAgICB2YXIgY2FjaGVOYW1lID0gInRlc3RDYWNoZU5hbWUiOwor ICAgIGlmICh3aW5kb3cubG9jYXRpb24uaGFzaC5pbmRleE9mKCIjbmFtZT0iKSA9PT0gMCkKKyAg ICAgICAgY2FjaGVOYW1lID0gd2luZG93LmxvY2F0aW9uLmhhc2guc3Vic3RyaW5nKDYpOworICAg IHNlbGYuY2FjaGVzLm9wZW4oY2FjaGVOYW1lKS50aGVuKCgpID0+IHsKICAgICAgICAgd2luZG93 LnBhcmVudC5wb3N0TWVzc2FnZSgicmVhZHkiLCAiKiIpOwogICAgIH0pOwogfQo= 319926 2017-09-05 12:45:07 -0700 2017-09-05 14:00:26 -0700 Patch bug-176394-20170905124507.patch text/plain 7637 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjIxNjI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDM2ZDUxOTdjNjI3ZDY2ZGZl MjNmMzBkOWVhMGU2ZWViMjJmOGZiOWQuLjJiMmRlOTBhODAzYmRiY2MxMjQyNDQ2YjljNjI4Yjk4 NGJkZmFjMTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTctMDktMDUgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIENhY2hlIFN0b3JhZ2UgRW5naW5l IHNob3VsZCBub3QgbWl4IGRpZmZlcmVudCBvcmlnaW4gY2FjaGVzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzYzOTQKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hlL0Nh Y2hlU3RvcmFnZUVuZ2luZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OkNhY2hlU3RvcmFnZTo6RW5n aW5lOjpyZWFkQ2FjaGVzRnJvbURpc2spOiBJbml0aWFsaXppbmcgdGhlIHNhbHQgYmVmb3JlIGNy ZWF0aW5nIHRoZSBDYWNoZXMgb2JqZWN0CisgICAgICAgIHNvIHRoYXQgaXRzIHBlcnNpc3RlbmN5 IHBhdGggaXMgY29ycmVjdGx5IGNvbXB1dGVkLgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2Nh Y2hlL0NhY2hlU3RvcmFnZUVuZ2luZUNhY2hlcy5jcHA6CisgICAgICAgIChXZWJLaXQ6OkNhY2hl U3RvcmFnZTo6Y2FjaGVzUm9vdFBhdGgpOiBTZXR0aW5nIG9yaWdpbiBhcyBwYXJ0aXRpb24gc3Ry aW5nLgorCiAyMDE3LTA5LTA1ICBZb3VzdWtlIEtpbW90byAgPHlvdXN1a2Uua2ltb3RvQHNvbnku Y29tPgogCiAgICAgICAgIFtXaW5DYWlyb10gQWRkIE5ldHdvcmsgUHJvY2VzcyBmaWxlcyBmb3Ig d2luY2Fpcm8gd2Via2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L2NhY2hlL0NhY2hlU3RvcmFnZUVuZ2luZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL2NhY2hlL0NhY2hlU3RvcmFnZUVuZ2luZS5jcHAKaW5kZXggY2JhN2Q1MTk4ZjRmNDkwYWYy MWQ4MzQ5ODNmYjY2YjJiOWE2OWJhMy4uNzAxMTA3YWMxMGNlOWJhYjlhZmQ3ZjA4YjEyYjdlYjQ1 MDk0NDExNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9D YWNoZVN0b3JhZ2VFbmdpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv Y2FjaGUvQ2FjaGVTdG9yYWdlRW5naW5lLmNwcApAQCAtMTg4LDMxICsxODgsMjggQEAgdm9pZCBF bmdpbmU6OmluaXRpYWxpemUoRnVuY3Rpb248dm9pZChzdGQ6Om9wdGlvbmFsPEVycm9yPiYmKT4m JiBjYWxsYmFjaykKIAogdm9pZCBFbmdpbmU6OnJlYWRDYWNoZXNGcm9tRGlzayhjb25zdCBTdHJp bmcmIG9yaWdpbiwgQ2FjaGVzQ2FsbGJhY2smJiBjYWxsYmFjaykKIHsKLSAgICBhdXRvJiBjYWNo ZXMgPSBtX2NhY2hlcy5lbnN1cmUob3JpZ2luLCBbJm9yaWdpbiwgdGhpc10gewotICAgICAgICBy ZXR1cm4gQ2FjaGVzOjpjcmVhdGUoKnRoaXMsIG9yaWdpbik7Ci0gICAgfSkuaXRlcmF0b3ItPnZh bHVlOworICAgIGluaXRpYWxpemUoW3RoaXMsIG9yaWdpbiwgY2FsbGJhY2sgPSBXVEZNb3ZlKGNh bGxiYWNrKV0oc3RkOjpvcHRpb25hbDxFcnJvcj4mJiBlcnJvcikgbXV0YWJsZSB7CisgICAgICAg IGF1dG8mIGNhY2hlcyA9IG1fY2FjaGVzLmVuc3VyZShvcmlnaW4sIFsmb3JpZ2luLCB0aGlzXSB7 CisgICAgICAgICAgICByZXR1cm4gQ2FjaGVzOjpjcmVhdGUoKnRoaXMsIG9yaWdpbik7CisgICAg ICAgIH0pLml0ZXJhdG9yLT52YWx1ZTsKIAotICAgIGlmIChjYWNoZXMtPmlzSW5pdGlhbGl6ZWQo KSkgewotICAgICAgICBjYWxsYmFjayhzdGQ6OnJlZmVyZW5jZV93cmFwcGVyPENhY2hlcz4geyBj YWNoZXMuZ2V0KCkgfSk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9CisgICAgICAgIGlmIChjYWNo ZXMtPmlzSW5pdGlhbGl6ZWQoKSkgeworICAgICAgICAgICAgY2FsbGJhY2soc3RkOjpyZWZlcmVu Y2Vfd3JhcHBlcjxDYWNoZXM+IHsgY2FjaGVzLmdldCgpIH0pOworICAgICAgICAgICAgcmV0dXJu OworICAgICAgICB9CiAKLSAgICBpbml0aWFsaXplKFt0aGlzLCBvcmlnaW4sIGNhbGxiYWNrID0g V1RGTW92ZShjYWxsYmFjayldKHN0ZDo6b3B0aW9uYWw8RXJyb3I+JiYgZXJyb3IpIG11dGFibGUg ewogICAgICAgICBpZiAoZXJyb3IpIHsKICAgICAgICAgICAgIGNhbGxiYWNrKG1ha2VVbmV4cGVj dGVkKGVycm9yLnZhbHVlKCkpKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0g ICAgICAgIGF1dG8gY2FjaGVzID0gbV9jYWNoZXMuZ2V0KG9yaWdpbik7Ci0gICAgICAgIEFTU0VS VChjYWNoZXMpOwotCi0gICAgICAgIGNhY2hlcy0+aW5pdGlhbGl6ZShbY2FsbGJhY2sgPSBXVEZN b3ZlKGNhbGxiYWNrKSwgY2FjaGVzXShzdGQ6Om9wdGlvbmFsPEVycm9yPiYmIGVycm9yKSBtdXRh YmxlIHsKKyAgICAgICAgY2FjaGVzLT5pbml0aWFsaXplKFtjYWxsYmFjayA9IFdURk1vdmUoY2Fs bGJhY2spLCBjYWNoZXMgPSBjYWNoZXMuY29weVJlZigpXShzdGQ6Om9wdGlvbmFsPEVycm9yPiYm IGVycm9yKSBtdXRhYmxlIHsKICAgICAgICAgICAgIGlmIChlcnJvcikgewogICAgICAgICAgICAg ICAgIGNhbGxiYWNrKG1ha2VVbmV4cGVjdGVkKGVycm9yLnZhbHVlKCkpKTsKICAgICAgICAgICAg ICAgICByZXR1cm47CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIGNhbGxiYWNrKHN0ZDo6 cmVmZXJlbmNlX3dyYXBwZXI8Q2FjaGVzPiB7ICpjYWNoZXMgfSk7CisgICAgICAgICAgICBjYWxs YmFjayhzdGQ6OnJlZmVyZW5jZV93cmFwcGVyPENhY2hlcz4geyBjYWNoZXMuZ2V0KCkgfSk7CiAg ICAgICAgIH0pOwogICAgIH0pOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmVDYWNoZXMuY3BwIGIvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmVDYWNoZXMuY3BwCmluZGV4 IGZlMWNmZmRkMjZmNTdjNDMxMzEzOTM1NGFlMzljODdlZTIxYzIxZTQuLmNiZmNjODE5YjZhYjhl NmNkZjAyNjhhOWU2NzBkOTUzY2FkZGNiN2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3MvY2FjaGUvQ2FjaGVTdG9yYWdlRW5naW5lQ2FjaGVzLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL0NhY2hlU3RvcmFnZUVuZ2luZUNhY2hlcy5j cHAKQEAgLTQxLDcgKzQxLDcgQEAgc3RhdGljIGlubGluZSBTdHJpbmcgY2FjaGVzUm9vdFBhdGgo RW5naW5lJiBlbmdpbmUsIGNvbnN0IFN0cmluZyYgb3JpZ2luKQogICAgIGlmICghZW5naW5lLnNo b3VsZFBlcnNpc3QoKSkKICAgICAgICAgcmV0dXJuIHsgfTsKIAotICAgIEtleSBrZXkoZW5naW5l LnJvb3RQYXRoKCksIHsgfSwgeyB9LCBvcmlnaW4sIGVuZ2luZS5zYWx0KCkpOworICAgIEtleSBr ZXkob3JpZ2luLCB7IH0sIHsgfSwgeyB9LCBlbmdpbmUuc2FsdCgpKTsKICAgICByZXR1cm4gV2Vi Q29yZTo6cGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50KGVuZ2luZS5yb290UGF0aCgpLCBrZXkucGFy dGl0aW9uSGFzaEFzU3RyaW5nKCkpOwogfQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYzZhN2UyNGMyOTM5ZTM5NzY2YTI3 MDc5ZmM3MzYzYjFlMWQyNTZmNC4uYWRkY2VjZGEzMjBmNGQ2MjNlYmM2OWQ0MjJmZDY2NWQ0Mzky OTFhMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE3LTA5LTA1ICBZb3Vlbm4gRmFibGV0ICA8 eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBDYWNoZSBTdG9yYWdlIEVuZ2luZSBzaG91bGQg bm90IG1peCBkaWZmZXJlbnQgb3JpZ2luIGNhY2hlcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc2Mzk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBodHRwL3Rlc3RzL2NhY2hlLXN0b3JhZ2UvY2FjaGUt b3JpZ2lucy5odHRwcy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVzdHMv Y2FjaGUtc3RvcmFnZS9jYWNoZS1vcmlnaW5zLmh0dHBzLmh0bWw6IEFkZGVkLgorICAgICAgICAq IGh0dHAvdGVzdHMvY2FjaGUtc3RvcmFnZS9yZXNvdXJjZXMvY2FjaGUtcGVyc2lzdGVuY3ktaWZy YW1lLmh0bWw6CisKIDIwMTctMDktMDUgIE1hdHQgTGV3aXMgIDxqbGV3aXMzQGFwcGxlLmNvbT4K IAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMjIxNjAzLgpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jYWNoZS1zdG9yYWdlL2NhY2hlLW9yaWdpbnMuaHR0cHMt ZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jYWNoZS1zdG9yYWdlL2NhY2hl LW9yaWdpbnMuaHR0cHMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjM2NzA3ZGQxYWI5NGE2NzZi NThiNGVkMDhhZTVkNTNkOGZmNjA3ZmYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9o dHRwL3Rlc3RzL2NhY2hlLXN0b3JhZ2UvY2FjaGUtb3JpZ2lucy5odHRwcy1leHBlY3RlZC50eHQK QEAgLTAsMCArMSw1IEBACisgIAorCitQQVNTIENyZWF0ZSBhIGNhY2hlIHN0b3JhZ2UgYW5kIGxv b2sgYXQgdGhlIHJlcHJlc2VudGF0aW9uIAorUEFTUyBDYWNoZXMgZnJvbSBkaWZmZXJlbnQgb3Jp Z2lucyBzaG91bGQgbm90IG1peCAKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0 cy9jYWNoZS1zdG9yYWdlL2NhY2hlLW9yaWdpbnMuaHR0cHMuaHRtbCBiL0xheW91dFRlc3RzL2h0 dHAvdGVzdHMvY2FjaGUtc3RvcmFnZS9jYWNoZS1vcmlnaW5zLmh0dHBzLmh0bWwKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MC4uMDEyYzU0YWRhZmU3NWM5YTg5Mzc1NjRhNTQ2MDY5Y2M4MTMxNzI1NwotLS0gL2Rldi9udWxs CisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvY2FjaGUtc3RvcmFnZS9jYWNoZS1vcmlnaW5z Lmh0dHBzLmh0bWwKQEAgLTAsMCArMSw0MyBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxo ZWFkPgorPHRpdGxlPkNhY2hlIFN0b3JhZ2U6IHRlc3RpbmcgcGVyc2lzdGVuY3kgb2YgZGlmZmVy ZW50IG9yaWdpbnM8L3RpdGxlPgorPHNjcmlwdCBzcmM9Ii9yZXNvdXJjZXMvdGVzdGhhcm5lc3Mu anMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii9yZXNvdXJjZXMvdGVzdGhhcm5lc3NyZXBvcnQu anMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii9yZXNvdXJjZXMvZ2MuanMiPjwvc2NyaXB0Pgor PC9oZWFkPgorPGJvZHk+CisgICAgPHNjcmlwdD4KKworICAgIGZ1bmN0aW9uIGNoZWNrQ2FjaGVz KG5hbWUpIHsKKyAgICAgICAgcHJvbWlzZV90ZXN0KCgpID0+IHsKKyAgICAgICAgICAgIHJldHVy biBzZWxmLmNhY2hlcy5rZXlzKCkudGhlbihrZXlzID0+IHsKKyAgICAgICAgICAgICAgICBhc3Nl cnRfdHJ1ZShrZXlzLmluZGV4T2YoImNhY2hlMSIpICE9PSAtMSwgIlNob3VsZCBoYXZlIGNhY2hl MSIpOworICAgICAgICAgICAgICAgIGFzc2VydF90cnVlKGtleXMuaW5kZXhPZigiY2FjaGUyIikg PT09IC0xLCAiU2hvdWxkIG5vdCBoYXZlIGNhY2hlMSIpOworICAgICAgICAgICAgfSk7CisgICAg ICAgIH0sIG5hbWUpOworICAgIH0KKworICAgIHByb21pc2VfdGVzdCh0ZXN0ID0+IHsKKyAgICAg ICAgaWYgKCF3aW5kb3cuaW50ZXJuYWxzKQorICAgICAgICAgICAgcmV0dXJuIFByb21pc2UucmVq ZWN0KCJUZXN0IHJlcXVpcmVzIGludGVybmFscyIpOworCisgICAgICAgIHJldHVybiBuZXcgUHJv bWlzZSgocmVzb2x2ZSwgcmVqZWN0KSA9PiB7CisgICAgICAgICAgICB2YXIgY291bnRlciA9IDA7 CisgICAgICAgICAgICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcigibWVzc2FnZSIsIHRlc3Quc3Rl cF9mdW5jKChldmVudCkgPT4geworICAgICAgICAgICAgICAgIGlmICgrK2NvdW50ZXIgPD0gMSkK KyAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgIGludGVybmFscy5j bGVhckNhY2hlU3RvcmFnZU1lbW9yeVJlcHJlc2VudGF0aW9uKCk7CisgICAgICAgICAgICAgICAg Y2hlY2tDYWNoZXMoIkNhY2hlcyBmcm9tIGRpZmZlcmVudCBvcmlnaW5zIHNob3VsZCBub3QgbWl4 Iik7CisgICAgICAgICAgICAgICAgcmVzb2x2ZSgpOworICAgICAgICAgICAgfSkpOworICAgICAg ICB9KQorICAgIH0sICJDcmVhdGUgYSBjYWNoZSBzdG9yYWdlIGFuZCBsb29rIGF0IHRoZSByZXBy ZXNlbnRhdGlvbiIpOworICAgIDwvc2NyaXB0PgorICAgIDxkaXY+CisgICAgICAgIDxpZnJhbWUg c3JjPSJyZXNvdXJjZXMvY2FjaGUtcGVyc2lzdGVuY3ktaWZyYW1lLmh0bWwjbmFtZT1jYWNoZTEi PjwvaWZyYW1lPgorICAgICAgICA8aWZyYW1lIHNyYz0iaHR0cHM6Ly9sb2NhbGhvc3Q6ODQ0My9j YWNoZS1zdG9yYWdlL3Jlc291cmNlcy9jYWNoZS1wZXJzaXN0ZW5jeS1pZnJhbWUuaHRtbCNuYW1l PWNhY2hlMiI+PC9pZnJhbWU+CisgICAgPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+CisKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvY2FjaGUtc3RvcmFnZS9yZXNvdXJjZXMvY2Fj aGUtcGVyc2lzdGVuY3ktaWZyYW1lLmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2NhY2hl LXN0b3JhZ2UvcmVzb3VyY2VzL2NhY2hlLXBlcnNpc3RlbmN5LWlmcmFtZS5odG1sCmluZGV4IDk3 OWM5OGZlZjhlNDRiMTU3YTEzZmMwZDk2YTQyZmY2NGQ0ODUxNmQuLmFlMmYxM2M4ZDY4NTk3YzA1 MmZiNjhjNjhlOTAxNTcxNTM3ZWJhMTggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvdGVz dHMvY2FjaGUtc3RvcmFnZS9yZXNvdXJjZXMvY2FjaGUtcGVyc2lzdGVuY3ktaWZyYW1lLmh0bWwK KysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jYWNoZS1zdG9yYWdlL3Jlc291cmNlcy9jYWNo ZS1wZXJzaXN0ZW5jeS1pZnJhbWUuaHRtbApAQCAtMTEsNyArMTEsMTAgQEAgZnVuY3Rpb24gZG9U ZXN0KCkKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIHNlbGYuY2FjaGVzLm9wZW4oInRl c3RDYWNoZU5hbWUiKS50aGVuKCgpID0+IHsKKyAgICB2YXIgY2FjaGVOYW1lID0gInRlc3RDYWNo ZU5hbWUiOworICAgIGlmICh3aW5kb3cubG9jYXRpb24uaGFzaC5pbmRleE9mKCIjbmFtZT0iKSA9 PT0gMCkKKyAgICAgICAgY2FjaGVOYW1lID0gd2luZG93LmxvY2F0aW9uLmhhc2guc3Vic3RyaW5n KDYpOworICAgIHNlbGYuY2FjaGVzLm9wZW4oY2FjaGVOYW1lKS50aGVuKCgpID0+IHsKICAgICAg ICAgd2luZG93LnBhcmVudC5wb3N0TWVzc2FnZSgicmVhZHkiLCAiKiIpOwogICAgIH0pOwogfQo=