158328 2016-06-02 16:47:10 -0700 Drop BlobRegistryContext class as it is no longer needed 2016-06-02 22:37:28 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez beidson commit-queue darin oldest_to_newest 1198740 0 cdumez 2016-06-02 16:47:10 -0700 Drop BlobRegistryContext class as it is no longer needed. We can now call isolatedCopy() as we capture in the lambda. 1198741 1 280383 cdumez 2016-06-02 16:50:06 -0700 Created attachment 280383 WIP patch 1198745 2 280385 cdumez 2016-06-02 16:57:24 -0700 Created attachment 280385 WIP Patch 1198746 3 280386 cdumez 2016-06-02 17:00:18 -0700 Created attachment 280386 Patch 1198874 4 280386 commit-queue 2016-06-02 22:37:24 -0700 Comment on attachment 280386 Patch Clearing flags on attachment: 280386 Committed r201636: <http://trac.webkit.org/changeset/201636> 1198875 5 commit-queue 2016-06-02 22:37:28 -0700 All reviewed patches have been landed. Closing bug. 280383 2016-06-02 16:50:06 -0700 2016-06-02 16:57:21 -0700 WIP patch drop_BlobRegistryContext.patch text/plain 5546 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvVGhyZWFkYWJsZUJsb2JSZWdpc3Ry eS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9maWxlYXBpL1RocmVhZGFibGVCbG9iUmVnaXN0cnkuY3Bw CmluZGV4IDFlYzc3M2IuLjAzOTZkMzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2ZpbGVh cGkvVGhyZWFkYWJsZUJsb2JSZWdpc3RyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZmlsZWFw aS9UaHJlYWRhYmxlQmxvYlJlZ2lzdHJ5LmNwcApAQCAtNTEsNDMgKzUxLDYgQEAgdXNpbmcgV1RG OjpUaHJlYWRTcGVjaWZpYzsKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1zdHJ1Y3QgQmxvYlJl Z2lzdHJ5Q29udGV4dCB7Ci0gICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7Ci1wdWJsaWM6Ci0g ICAgQmxvYlJlZ2lzdHJ5Q29udGV4dChjb25zdCBVUkwmIHVybCwgVmVjdG9yPEJsb2JQYXJ0PiBi bG9iUGFydHMsIGNvbnN0IFN0cmluZyYgY29udGVudFR5cGUpCi0gICAgICAgIDogdXJsKHVybC5p c29sYXRlZENvcHkoKSkKLSAgICAgICAgLCBjb250ZW50VHlwZShjb250ZW50VHlwZS5pc29sYXRl ZENvcHkoKSkKLSAgICAgICAgLCBibG9iUGFydHMoV1RGTW92ZShibG9iUGFydHMpKQotICAgIHsK LSAgICAgICAgZm9yIChCbG9iUGFydCYgcGFydCA6IGJsb2JQYXJ0cykKLSAgICAgICAgICAgIHBh cnQuZGV0YWNoRnJvbUN1cnJlbnRUaHJlYWQoKTsKLSAgICB9Ci0KLSAgICBCbG9iUmVnaXN0cnlD b250ZXh0KGNvbnN0IFVSTCYgdXJsLCBjb25zdCBVUkwmIHNyY1VSTCkKLSAgICAgICAgOiB1cmwo dXJsLmlzb2xhdGVkQ29weSgpKQotICAgICAgICAsIHNyY1VSTChzcmNVUkwuaXNvbGF0ZWRDb3B5 KCkpCi0gICAgewotICAgIH0KLQotICAgIEJsb2JSZWdpc3RyeUNvbnRleHQoY29uc3QgVVJMJiB1 cmwpCi0gICAgICAgIDogdXJsKHVybC5pc29sYXRlZENvcHkoKSkKLSAgICB7Ci0gICAgfQotCi0g ICAgQmxvYlJlZ2lzdHJ5Q29udGV4dChjb25zdCBVUkwmIHVybCwgY29uc3QgU3RyaW5nJiBwYXRo LCBjb25zdCBTdHJpbmcmIGNvbnRlbnRUeXBlKQotICAgICAgICA6IHVybCh1cmwuaXNvbGF0ZWRD b3B5KCkpCi0gICAgICAgICwgcGF0aChwYXRoLmlzb2xhdGVkQ29weSgpKQotICAgICAgICAsIGNv bnRlbnRUeXBlKGNvbnRlbnRUeXBlLmlzb2xhdGVkQ29weSgpKQotICAgIHsKLSAgICB9Ci0KLSAg ICBVUkwgdXJsOwotICAgIFVSTCBzcmNVUkw7Ci0gICAgU3RyaW5nIHBhdGg7Ci0gICAgU3RyaW5n IGNvbnRlbnRUeXBlOwotICAgIFZlY3RvcjxCbG9iUGFydD4gYmxvYlBhcnRzOwotfTsKLQogdHlw ZWRlZiBIYXNoTWFwPFN0cmluZywgUmVmUHRyPFNlY3VyaXR5T3JpZ2luPj4gQmxvYlVybE9yaWdp bk1hcDsKIAogc3RhdGljIFRocmVhZFNwZWNpZmljPEJsb2JVcmxPcmlnaW5NYXA+JiBvcmlnaW5N YXAoKQpAQCAtMTE3LDkgKzgwLDggQEAgdm9pZCBUaHJlYWRhYmxlQmxvYlJlZ2lzdHJ5OjpyZWdp c3RlckZpbGVCbG9iVVJMKGNvbnN0IFVSTCYgdXJsLCBjb25zdCBTdHJpbmcmIHAKICAgICBpZiAo aXNNYWluVGhyZWFkKCkpCiAgICAgICAgIGJsb2JSZWdpc3RyeSgpLnJlZ2lzdGVyRmlsZUJsb2JV UkwodXJsLCBCbG9iRGF0YUZpbGVSZWZlcmVuY2U6OmNyZWF0ZShwYXRoKSwgY29udGVudFR5cGUp OwogICAgIGVsc2UgewotICAgICAgICAvLyBCbG9iUmVnaXN0cnlDb250ZXh0IHBlcmZvcm1zIGFu IGlzb2xhdGVkIGNvcHkgb2YgZGF0YS4KLSAgICAgICAgY2FsbE9uTWFpblRocmVhZChbY29udGV4 dCA9IHN0ZDo6bWFrZV91bmlxdWU8QmxvYlJlZ2lzdHJ5Q29udGV4dD4odXJsLCBwYXRoLCBjb250 ZW50VHlwZSldIHsKLSAgICAgICAgICAgIGJsb2JSZWdpc3RyeSgpLnJlZ2lzdGVyRmlsZUJsb2JV UkwoY29udGV4dC0+dXJsLCBCbG9iRGF0YUZpbGVSZWZlcmVuY2U6OmNyZWF0ZShjb250ZXh0LT5w YXRoKSwgY29udGV4dC0+Y29udGVudFR5cGUpOworICAgICAgICBjYWxsT25NYWluVGhyZWFkKFt1 cmwgPSBVUkwuaXNvbGF0ZWRDb3B5KCksIHBhdGggPSBwYXRoLmlzb2xhdGVkQ29weSgpLCBjb250 ZW50VHlwZSA9IGNvbnRlbnRUeXBlLmlzb2xhdGVkQ29weSgpXSB7CisgICAgICAgICAgICBibG9i UmVnaXN0cnkoKS5yZWdpc3RlckZpbGVCbG9iVVJMKHVybCwgQmxvYkRhdGFGaWxlUmVmZXJlbmNl OjpjcmVhdGUocGF0aCksIGNvbnRlbnRUeXBlKTsKICAgICAgICAgfSk7CiAgICAgfQogfQpAQCAt MTI5LDkgKzkxLDEwIEBAIHZvaWQgVGhyZWFkYWJsZUJsb2JSZWdpc3RyeTo6cmVnaXN0ZXJCbG9i VVJMKGNvbnN0IFVSTCYgdXJsLCBWZWN0b3I8QmxvYlBhcnQ+IGJsCiAgICAgaWYgKGlzTWFpblRo cmVhZCgpKQogICAgICAgICBibG9iUmVnaXN0cnkoKS5yZWdpc3RlckJsb2JVUkwodXJsLCBXVEZN b3ZlKGJsb2JQYXJ0cyksIGNvbnRlbnRUeXBlKTsKICAgICBlbHNlIHsKLSAgICAgICAgLy8gQmxv YlJlZ2lzdHJ5Q29udGV4dCBwZXJmb3JtcyBhbiBpc29sYXRlZCBjb3B5IG9mIGRhdGEuCi0gICAg ICAgIGNhbGxPbk1haW5UaHJlYWQoW2NvbnRleHQgPSBzdGQ6Om1ha2VfdW5pcXVlPEJsb2JSZWdp c3RyeUNvbnRleHQ+KHVybCwgV1RGTW92ZShibG9iUGFydHMpLCBjb250ZW50VHlwZSldIHsKLSAg ICAgICAgICAgIGJsb2JSZWdpc3RyeSgpLnJlZ2lzdGVyQmxvYlVSTChjb250ZXh0LT51cmwsIFdU Rk1vdmUoY29udGV4dC0+YmxvYlBhcnRzKSwgY29udGV4dC0+Y29udGVudFR5cGUpOworICAgICAg ICBmb3IgKGF1dG8mIHBhcnQgOiBibG9iUGFydHMpCisgICAgICAgICAgICBwYXJ0LmRldGFjaEZy b21DdXJyZW50VGhyZWFkKCk7CisgICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW3VybCA9IHVybC5p c29sYXRlZENvcHkoKSwgYmxvYlBhcnQgPSBXVEZNb3ZlKGJsb2JQYXJ0cyksIGNvbnRlbnRUeXBl ID0gY29udGVudFR5cGUuaXNvbGF0ZWRDb3B5KCldIG11dGFibGUgeworICAgICAgICAgICAgYmxv YlJlZ2lzdHJ5KCkucmVnaXN0ZXJCbG9iVVJMKHVybCwgV1RGTW92ZShibG9iUGFydHMpLCBjb250 ZW50VHlwZSk7CiAgICAgICAgIH0pOwogICAgIH0KIH0KQEAgLTE0NSw5ICsxMDgsOCBAQCB2b2lk IFRocmVhZGFibGVCbG9iUmVnaXN0cnk6OnJlZ2lzdGVyQmxvYlVSTChTZWN1cml0eU9yaWdpbiog b3JpZ2luLCBjb25zdCBVUkwmCiAgICAgaWYgKGlzTWFpblRocmVhZCgpKQogICAgICAgICBibG9i UmVnaXN0cnkoKS5yZWdpc3RlckJsb2JVUkwodXJsLCBzcmNVUkwpOwogICAgIGVsc2UgewotICAg ICAgICAvLyBCbG9iUmVnaXN0cnlDb250ZXh0IHBlcmZvcm1zIGFuIGlzb2xhdGVkIGNvcHkgb2Yg ZGF0YS4KLSAgICAgICAgY2FsbE9uTWFpblRocmVhZChbY29udGV4dCA9IHN0ZDo6bWFrZV91bmlx dWU8QmxvYlJlZ2lzdHJ5Q29udGV4dD4odXJsLCBzcmNVUkwpXSB7Ci0gICAgICAgICAgICBibG9i UmVnaXN0cnkoKS5yZWdpc3RlckJsb2JVUkwoY29udGV4dC0+dXJsLCBjb250ZXh0LT5zcmNVUkwp OworICAgICAgICBjYWxsT25NYWluVGhyZWFkKFt1cmwgPSB1cmwuaXNvbGF0ZWRDb3B5KCksIHNy Y1VSTCA9IHNyY1VSTC5pc29sYXRlZENvcHkoKV0geworICAgICAgICAgICAgYmxvYlJlZ2lzdHJ5 KCkucmVnaXN0ZXJCbG9iVVJMKHVybCwgc3JjVVJMKTsKICAgICAgICAgfSk7CiAgICAgfQogfQpA QCAtMTcyLDkgKzEzNCw4IEBAIHZvaWQgVGhyZWFkYWJsZUJsb2JSZWdpc3RyeTo6cmVnaXN0ZXJC bG9iVVJMRm9yU2xpY2UoY29uc3QgVVJMJiBuZXdVUkwsIGNvbnN0IFVSCiAgICAgaWYgKGlzTWFp blRocmVhZCgpKQogICAgICAgICBibG9iUmVnaXN0cnkoKS5yZWdpc3RlckJsb2JVUkxGb3JTbGlj ZShuZXdVUkwsIHNyY1VSTCwgc3RhcnQsIGVuZCk7CiAgICAgZWxzZSB7Ci0gICAgICAgIC8vIEJs b2JSZWdpc3RyeUNvbnRleHQgcGVyZm9ybXMgYW4gaXNvbGF0ZWQgY29weSBvZiBkYXRhLgotICAg ICAgICBjYWxsT25NYWluVGhyZWFkKFtjb250ZXh0ID0gc3RkOjptYWtlX3VuaXF1ZTxCbG9iUmVn aXN0cnlDb250ZXh0PihuZXdVUkwsIHNyY1VSTCksIHN0YXJ0LCBlbmRdIHsKLSAgICAgICAgICAg IGJsb2JSZWdpc3RyeSgpLnJlZ2lzdGVyQmxvYlVSTEZvclNsaWNlKGNvbnRleHQtPnVybCwgY29u dGV4dC0+c3JjVVJMLCBzdGFydCwgZW5kKTsKKyAgICAgICAgY2FsbE9uTWFpblRocmVhZChbbmV3 VVJMID0gbmV3VVJMLmlzb2xhdGVkQ29weSgpLCBzcmNVUkwgPSBzcmNVUkwuaXNvbGF0ZWRDb3B5 KCksIHN0YXJ0LCBlbmRdIHsKKyAgICAgICAgICAgIGJsb2JSZWdpc3RyeSgpLnJlZ2lzdGVyQmxv YlVSTEZvclNsaWNlKG5ld1VSTCwgc3JjVVJMLCBzdGFydCwgZW5kKTsKICAgICAgICAgfSk7CiAg ICAgfQogfQpAQCAtMTg1LDEwICsxNDYsOSBAQCB1bnNpZ25lZCBsb25nIGxvbmcgVGhyZWFkYWJs ZUJsb2JSZWdpc3RyeTo6YmxvYlNpemUoY29uc3QgVVJMJiB1cmwpCiAgICAgaWYgKGlzTWFpblRo cmVhZCgpKQogICAgICAgICByZXN1bHRTaXplID0gYmxvYlJlZ2lzdHJ5KCkuYmxvYlNpemUodXJs KTsKICAgICBlbHNlIHsKLSAgICAgICAgLy8gQmxvYlJlZ2lzdHJ5Q29udGV4dCBwZXJmb3JtcyBh biBpc29sYXRlZCBjb3B5IG9mIGRhdGEuCiAgICAgICAgIEJpbmFyeVNlbWFwaG9yZSBzZW1hcGhv cmU7Ci0gICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW2NvbnRleHQgPSBzdGQ6Om1ha2VfdW5pcXVl PEJsb2JSZWdpc3RyeUNvbnRleHQ+KHVybCksICZzZW1hcGhvcmUsICZyZXN1bHRTaXplXSB7Ci0g ICAgICAgICAgICByZXN1bHRTaXplID0gYmxvYlJlZ2lzdHJ5KCkuYmxvYlNpemUoY29udGV4dC0+ dXJsKTsKKyAgICAgICAgY2FsbE9uTWFpblRocmVhZChbdXJsID0gdXJsLmlzb2xhdGVkQ29weSgp LCAmc2VtYXBob3JlLCAmcmVzdWx0U2l6ZV0geworICAgICAgICAgICAgcmVzdWx0U2l6ZSA9IGJs b2JSZWdpc3RyeSgpLmJsb2JTaXplKHVybCk7CiAgICAgICAgICAgICBzZW1hcGhvcmUuc2lnbmFs KCk7CiAgICAgICAgIH0pOwogICAgICAgICBzZW1hcGhvcmUud2FpdChzdGQ6Om51bWVyaWNfbGlt aXRzPGRvdWJsZT46Om1heCgpKTsKQEAgLTIwNCw5ICsxNjQsOCBAQCB2b2lkIFRocmVhZGFibGVC bG9iUmVnaXN0cnk6OnVucmVnaXN0ZXJCbG9iVVJMKGNvbnN0IFVSTCYgdXJsKQogICAgIGlmIChp c01haW5UaHJlYWQoKSkKICAgICAgICAgYmxvYlJlZ2lzdHJ5KCkudW5yZWdpc3RlckJsb2JVUkwo dXJsKTsKICAgICBlbHNlIHsKLSAgICAgICAgLy8gQmxvYlJlZ2lzdHJ5Q29udGV4dCBwZXJmb3Jt cyBhbiBpc29sYXRlZCBjb3B5IG9mIGRhdGEuCi0gICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW2Nv bnRleHQgPSBzdGQ6Om1ha2VfdW5pcXVlPEJsb2JSZWdpc3RyeUNvbnRleHQ+KHVybCldIHsKLSAg ICAgICAgICAgIGJsb2JSZWdpc3RyeSgpLnVucmVnaXN0ZXJCbG9iVVJMKGNvbnRleHQtPnVybCk7 CisgICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW3VybCA9IHVybC5pc29sYXRlZENvcHkoKV0gewor ICAgICAgICAgICAgYmxvYlJlZ2lzdHJ5KCkudW5yZWdpc3RlckJsb2JVUkwodXJsKTsKICAgICAg ICAgfSk7CiAgICAgfQogfQo= 280385 2016-06-02 16:57:24 -0700 2016-06-02 17:00:16 -0700 WIP Patch bug-158328-20160602165843.patch text/plain 6851 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjAxNjI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGFlZmM2NzljMzE5NjRl ZThlNWI2YWFkMDZkMTBhYmM0N2Y4ZDJhNi4uNjMxZDg1MTUxZmVlMjljOTY0YmM2ZGViYWYyMDhk ZjM3MGNkOGE1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDE2LTA2LTAyICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgRHJvcCBCbG9iUmVnaXN0cnlD b250ZXh0IGNsYXNzIGFzIGl0IGlzIG5vIGxvbmdlciBuZWVkZWQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1ODMyOAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERyb3AgQmxvYlJlZ2lzdHJ5Q29udGV4dCBj bGFzcyBhcyBpdCBpcyBubyBsb25nZXIgbmVlZGVkLiBXZSBjYW4gbm93CisgICAgICAgIGNhbGwg aXNvbGF0ZWRDb3B5KCkgYXMgd2UgY2FwdHVyZSBpbiB0aGUgbGFtYmRhLgorCisgICAgICAgICog ZmlsZWFwaS9UaHJlYWRhYmxlQmxvYlJlZ2lzdHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRo cmVhZGFibGVCbG9iUmVnaXN0cnk6OnJlZ2lzdGVyRmlsZUJsb2JVUkwpOgorICAgICAgICAoV2Vi Q29yZTo6VGhyZWFkYWJsZUJsb2JSZWdpc3RyeTo6cmVnaXN0ZXJCbG9iVVJMKToKKyAgICAgICAg KFdlYkNvcmU6OlRocmVhZGFibGVCbG9iUmVnaXN0cnk6OnJlZ2lzdGVyQmxvYlVSTEZvclNsaWNl KToKKyAgICAgICAgKFdlYkNvcmU6OlRocmVhZGFibGVCbG9iUmVnaXN0cnk6OmJsb2JTaXplKToK KyAgICAgICAgKFdlYkNvcmU6OlRocmVhZGFibGVCbG9iUmVnaXN0cnk6OnVucmVnaXN0ZXJCbG9i VVJMKToKKyAgICAgICAgKFdlYkNvcmU6OkJsb2JSZWdpc3RyeUNvbnRleHQ6OkJsb2JSZWdpc3Ry eUNvbnRleHQpOiBEZWxldGVkLgorCisyMDE2LTA2LTAyICBDaHJpcyBEdW1leiAgPGNkdW1lekBh cHBsZS5jb20+CisKICAgICAgICAgW1dlYklETF0gJ3VuZGVmaW5lZCcgc2hvdWxkIGJlIGFuIGFj Y2VwdGFibGUgdmFsdWUgZm9yIG51bGxhYmxlIHBhcmFtZXRlcnMKICAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1ODMyMQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9maWxlYXBpL1RocmVhZGFibGVCbG9iUmVnaXN0cnkuY3BwIGIvU291cmNlL1dl YkNvcmUvZmlsZWFwaS9UaHJlYWRhYmxlQmxvYlJlZ2lzdHJ5LmNwcAppbmRleCAxZWM3NzNiMzgx MGIyZjZiMjhlYmNiY2YwZGI2YWFhMDA5ZTVlMjNlLi40Njk1NDZkZmUwMmZlOTU5NmYwMGZiNDA5 NTgxMmUyNzNjOGM0NzU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9maWxlYXBpL1RocmVh ZGFibGVCbG9iUmVnaXN0cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvVGhyZWFk YWJsZUJsb2JSZWdpc3RyeS5jcHAKQEAgLTUxLDQzICs1MSw2IEBAIHVzaW5nIFdURjo6VGhyZWFk U3BlY2lmaWM7CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotc3RydWN0IEJsb2JSZWdpc3RyeUNv bnRleHQgewotICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwotcHVibGljOgotICAgIEJsb2JS ZWdpc3RyeUNvbnRleHQoY29uc3QgVVJMJiB1cmwsIFZlY3RvcjxCbG9iUGFydD4gYmxvYlBhcnRz LCBjb25zdCBTdHJpbmcmIGNvbnRlbnRUeXBlKQotICAgICAgICA6IHVybCh1cmwuaXNvbGF0ZWRD b3B5KCkpCi0gICAgICAgICwgY29udGVudFR5cGUoY29udGVudFR5cGUuaXNvbGF0ZWRDb3B5KCkp Ci0gICAgICAgICwgYmxvYlBhcnRzKFdURk1vdmUoYmxvYlBhcnRzKSkKLSAgICB7Ci0gICAgICAg IGZvciAoQmxvYlBhcnQmIHBhcnQgOiBibG9iUGFydHMpCi0gICAgICAgICAgICBwYXJ0LmRldGFj aEZyb21DdXJyZW50VGhyZWFkKCk7Ci0gICAgfQotCi0gICAgQmxvYlJlZ2lzdHJ5Q29udGV4dChj b25zdCBVUkwmIHVybCwgY29uc3QgVVJMJiBzcmNVUkwpCi0gICAgICAgIDogdXJsKHVybC5pc29s YXRlZENvcHkoKSkKLSAgICAgICAgLCBzcmNVUkwoc3JjVVJMLmlzb2xhdGVkQ29weSgpKQotICAg IHsKLSAgICB9Ci0KLSAgICBCbG9iUmVnaXN0cnlDb250ZXh0KGNvbnN0IFVSTCYgdXJsKQotICAg ICAgICA6IHVybCh1cmwuaXNvbGF0ZWRDb3B5KCkpCi0gICAgewotICAgIH0KLQotICAgIEJsb2JS ZWdpc3RyeUNvbnRleHQoY29uc3QgVVJMJiB1cmwsIGNvbnN0IFN0cmluZyYgcGF0aCwgY29uc3Qg U3RyaW5nJiBjb250ZW50VHlwZSkKLSAgICAgICAgOiB1cmwodXJsLmlzb2xhdGVkQ29weSgpKQot ICAgICAgICAsIHBhdGgocGF0aC5pc29sYXRlZENvcHkoKSkKLSAgICAgICAgLCBjb250ZW50VHlw ZShjb250ZW50VHlwZS5pc29sYXRlZENvcHkoKSkKLSAgICB7Ci0gICAgfQotCi0gICAgVVJMIHVy bDsKLSAgICBVUkwgc3JjVVJMOwotICAgIFN0cmluZyBwYXRoOwotICAgIFN0cmluZyBjb250ZW50 VHlwZTsKLSAgICBWZWN0b3I8QmxvYlBhcnQ+IGJsb2JQYXJ0czsKLX07Ci0KIHR5cGVkZWYgSGFz aE1hcDxTdHJpbmcsIFJlZlB0cjxTZWN1cml0eU9yaWdpbj4+IEJsb2JVcmxPcmlnaW5NYXA7CiAK IHN0YXRpYyBUaHJlYWRTcGVjaWZpYzxCbG9iVXJsT3JpZ2luTWFwPiYgb3JpZ2luTWFwKCkKQEAg LTExNyw5ICs4MCw4IEBAIHZvaWQgVGhyZWFkYWJsZUJsb2JSZWdpc3RyeTo6cmVnaXN0ZXJGaWxl QmxvYlVSTChjb25zdCBVUkwmIHVybCwgY29uc3QgU3RyaW5nJiBwCiAgICAgaWYgKGlzTWFpblRo cmVhZCgpKQogICAgICAgICBibG9iUmVnaXN0cnkoKS5yZWdpc3RlckZpbGVCbG9iVVJMKHVybCwg QmxvYkRhdGFGaWxlUmVmZXJlbmNlOjpjcmVhdGUocGF0aCksIGNvbnRlbnRUeXBlKTsKICAgICBl bHNlIHsKLSAgICAgICAgLy8gQmxvYlJlZ2lzdHJ5Q29udGV4dCBwZXJmb3JtcyBhbiBpc29sYXRl ZCBjb3B5IG9mIGRhdGEuCi0gICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW2NvbnRleHQgPSBzdGQ6 Om1ha2VfdW5pcXVlPEJsb2JSZWdpc3RyeUNvbnRleHQ+KHVybCwgcGF0aCwgY29udGVudFR5cGUp XSB7Ci0gICAgICAgICAgICBibG9iUmVnaXN0cnkoKS5yZWdpc3RlckZpbGVCbG9iVVJMKGNvbnRl eHQtPnVybCwgQmxvYkRhdGFGaWxlUmVmZXJlbmNlOjpjcmVhdGUoY29udGV4dC0+cGF0aCksIGNv bnRleHQtPmNvbnRlbnRUeXBlKTsKKyAgICAgICAgY2FsbE9uTWFpblRocmVhZChbdXJsID0gdXJs Lmlzb2xhdGVkQ29weSgpLCBwYXRoID0gcGF0aC5pc29sYXRlZENvcHkoKSwgY29udGVudFR5cGUg PSBjb250ZW50VHlwZS5pc29sYXRlZENvcHkoKV0geworICAgICAgICAgICAgYmxvYlJlZ2lzdHJ5 KCkucmVnaXN0ZXJGaWxlQmxvYlVSTCh1cmwsIEJsb2JEYXRhRmlsZVJlZmVyZW5jZTo6Y3JlYXRl KHBhdGgpLCBjb250ZW50VHlwZSk7CiAgICAgICAgIH0pOwogICAgIH0KIH0KQEAgLTEyOSw5ICs5 MSwxMCBAQCB2b2lkIFRocmVhZGFibGVCbG9iUmVnaXN0cnk6OnJlZ2lzdGVyQmxvYlVSTChjb25z dCBVUkwmIHVybCwgVmVjdG9yPEJsb2JQYXJ0PiBibAogICAgIGlmIChpc01haW5UaHJlYWQoKSkK ICAgICAgICAgYmxvYlJlZ2lzdHJ5KCkucmVnaXN0ZXJCbG9iVVJMKHVybCwgV1RGTW92ZShibG9i UGFydHMpLCBjb250ZW50VHlwZSk7CiAgICAgZWxzZSB7Ci0gICAgICAgIC8vIEJsb2JSZWdpc3Ry eUNvbnRleHQgcGVyZm9ybXMgYW4gaXNvbGF0ZWQgY29weSBvZiBkYXRhLgotICAgICAgICBjYWxs T25NYWluVGhyZWFkKFtjb250ZXh0ID0gc3RkOjptYWtlX3VuaXF1ZTxCbG9iUmVnaXN0cnlDb250 ZXh0Pih1cmwsIFdURk1vdmUoYmxvYlBhcnRzKSwgY29udGVudFR5cGUpXSB7Ci0gICAgICAgICAg ICBibG9iUmVnaXN0cnkoKS5yZWdpc3RlckJsb2JVUkwoY29udGV4dC0+dXJsLCBXVEZNb3ZlKGNv bnRleHQtPmJsb2JQYXJ0cyksIGNvbnRleHQtPmNvbnRlbnRUeXBlKTsKKyAgICAgICAgZm9yIChh dXRvJiBwYXJ0IDogYmxvYlBhcnRzKQorICAgICAgICAgICAgcGFydC5kZXRhY2hGcm9tQ3VycmVu dFRocmVhZCgpOworICAgICAgICBjYWxsT25NYWluVGhyZWFkKFt1cmwgPSB1cmwuaXNvbGF0ZWRD b3B5KCksIGJsb2JQYXJ0ID0gV1RGTW92ZShibG9iUGFydHMpLCBjb250ZW50VHlwZSA9IGNvbnRl bnRUeXBlLmlzb2xhdGVkQ29weSgpXSgpIG11dGFibGUgeworICAgICAgICAgICAgYmxvYlJlZ2lz dHJ5KCkucmVnaXN0ZXJCbG9iVVJMKHVybCwgV1RGTW92ZShibG9iUGFydHMpLCBjb250ZW50VHlw ZSk7CiAgICAgICAgIH0pOwogICAgIH0KIH0KQEAgLTE0NSw5ICsxMDgsOCBAQCB2b2lkIFRocmVh ZGFibGVCbG9iUmVnaXN0cnk6OnJlZ2lzdGVyQmxvYlVSTChTZWN1cml0eU9yaWdpbiogb3JpZ2lu LCBjb25zdCBVUkwmCiAgICAgaWYgKGlzTWFpblRocmVhZCgpKQogICAgICAgICBibG9iUmVnaXN0 cnkoKS5yZWdpc3RlckJsb2JVUkwodXJsLCBzcmNVUkwpOwogICAgIGVsc2UgewotICAgICAgICAv LyBCbG9iUmVnaXN0cnlDb250ZXh0IHBlcmZvcm1zIGFuIGlzb2xhdGVkIGNvcHkgb2YgZGF0YS4K LSAgICAgICAgY2FsbE9uTWFpblRocmVhZChbY29udGV4dCA9IHN0ZDo6bWFrZV91bmlxdWU8Qmxv YlJlZ2lzdHJ5Q29udGV4dD4odXJsLCBzcmNVUkwpXSB7Ci0gICAgICAgICAgICBibG9iUmVnaXN0 cnkoKS5yZWdpc3RlckJsb2JVUkwoY29udGV4dC0+dXJsLCBjb250ZXh0LT5zcmNVUkwpOworICAg ICAgICBjYWxsT25NYWluVGhyZWFkKFt1cmwgPSB1cmwuaXNvbGF0ZWRDb3B5KCksIHNyY1VSTCA9 IHNyY1VSTC5pc29sYXRlZENvcHkoKV0geworICAgICAgICAgICAgYmxvYlJlZ2lzdHJ5KCkucmVn aXN0ZXJCbG9iVVJMKHVybCwgc3JjVVJMKTsKICAgICAgICAgfSk7CiAgICAgfQogfQpAQCAtMTcy LDkgKzEzNCw4IEBAIHZvaWQgVGhyZWFkYWJsZUJsb2JSZWdpc3RyeTo6cmVnaXN0ZXJCbG9iVVJM Rm9yU2xpY2UoY29uc3QgVVJMJiBuZXdVUkwsIGNvbnN0IFVSCiAgICAgaWYgKGlzTWFpblRocmVh ZCgpKQogICAgICAgICBibG9iUmVnaXN0cnkoKS5yZWdpc3RlckJsb2JVUkxGb3JTbGljZShuZXdV UkwsIHNyY1VSTCwgc3RhcnQsIGVuZCk7CiAgICAgZWxzZSB7Ci0gICAgICAgIC8vIEJsb2JSZWdp c3RyeUNvbnRleHQgcGVyZm9ybXMgYW4gaXNvbGF0ZWQgY29weSBvZiBkYXRhLgotICAgICAgICBj YWxsT25NYWluVGhyZWFkKFtjb250ZXh0ID0gc3RkOjptYWtlX3VuaXF1ZTxCbG9iUmVnaXN0cnlD b250ZXh0PihuZXdVUkwsIHNyY1VSTCksIHN0YXJ0LCBlbmRdIHsKLSAgICAgICAgICAgIGJsb2JS ZWdpc3RyeSgpLnJlZ2lzdGVyQmxvYlVSTEZvclNsaWNlKGNvbnRleHQtPnVybCwgY29udGV4dC0+ c3JjVVJMLCBzdGFydCwgZW5kKTsKKyAgICAgICAgY2FsbE9uTWFpblRocmVhZChbbmV3VVJMID0g bmV3VVJMLmlzb2xhdGVkQ29weSgpLCBzcmNVUkwgPSBzcmNVUkwuaXNvbGF0ZWRDb3B5KCksIHN0 YXJ0LCBlbmRdIHsKKyAgICAgICAgICAgIGJsb2JSZWdpc3RyeSgpLnJlZ2lzdGVyQmxvYlVSTEZv clNsaWNlKG5ld1VSTCwgc3JjVVJMLCBzdGFydCwgZW5kKTsKICAgICAgICAgfSk7CiAgICAgfQog fQpAQCAtMTg1LDEwICsxNDYsOSBAQCB1bnNpZ25lZCBsb25nIGxvbmcgVGhyZWFkYWJsZUJsb2JS ZWdpc3RyeTo6YmxvYlNpemUoY29uc3QgVVJMJiB1cmwpCiAgICAgaWYgKGlzTWFpblRocmVhZCgp KQogICAgICAgICByZXN1bHRTaXplID0gYmxvYlJlZ2lzdHJ5KCkuYmxvYlNpemUodXJsKTsKICAg ICBlbHNlIHsKLSAgICAgICAgLy8gQmxvYlJlZ2lzdHJ5Q29udGV4dCBwZXJmb3JtcyBhbiBpc29s YXRlZCBjb3B5IG9mIGRhdGEuCiAgICAgICAgIEJpbmFyeVNlbWFwaG9yZSBzZW1hcGhvcmU7Ci0g ICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW2NvbnRleHQgPSBzdGQ6Om1ha2VfdW5pcXVlPEJsb2JS ZWdpc3RyeUNvbnRleHQ+KHVybCksICZzZW1hcGhvcmUsICZyZXN1bHRTaXplXSB7Ci0gICAgICAg ICAgICByZXN1bHRTaXplID0gYmxvYlJlZ2lzdHJ5KCkuYmxvYlNpemUoY29udGV4dC0+dXJsKTsK KyAgICAgICAgY2FsbE9uTWFpblRocmVhZChbdXJsID0gdXJsLmlzb2xhdGVkQ29weSgpLCAmc2Vt YXBob3JlLCAmcmVzdWx0U2l6ZV0geworICAgICAgICAgICAgcmVzdWx0U2l6ZSA9IGJsb2JSZWdp c3RyeSgpLmJsb2JTaXplKHVybCk7CiAgICAgICAgICAgICBzZW1hcGhvcmUuc2lnbmFsKCk7CiAg ICAgICAgIH0pOwogICAgICAgICBzZW1hcGhvcmUud2FpdChzdGQ6Om51bWVyaWNfbGltaXRzPGRv dWJsZT46Om1heCgpKTsKQEAgLTIwNCw5ICsxNjQsOCBAQCB2b2lkIFRocmVhZGFibGVCbG9iUmVn aXN0cnk6OnVucmVnaXN0ZXJCbG9iVVJMKGNvbnN0IFVSTCYgdXJsKQogICAgIGlmIChpc01haW5U aHJlYWQoKSkKICAgICAgICAgYmxvYlJlZ2lzdHJ5KCkudW5yZWdpc3RlckJsb2JVUkwodXJsKTsK ICAgICBlbHNlIHsKLSAgICAgICAgLy8gQmxvYlJlZ2lzdHJ5Q29udGV4dCBwZXJmb3JtcyBhbiBp c29sYXRlZCBjb3B5IG9mIGRhdGEuCi0gICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW2NvbnRleHQg PSBzdGQ6Om1ha2VfdW5pcXVlPEJsb2JSZWdpc3RyeUNvbnRleHQ+KHVybCldIHsKLSAgICAgICAg ICAgIGJsb2JSZWdpc3RyeSgpLnVucmVnaXN0ZXJCbG9iVVJMKGNvbnRleHQtPnVybCk7CisgICAg ICAgIGNhbGxPbk1haW5UaHJlYWQoW3VybCA9IHVybC5pc29sYXRlZENvcHkoKV0geworICAgICAg ICAgICAgYmxvYlJlZ2lzdHJ5KCkudW5yZWdpc3RlckJsb2JVUkwodXJsKTsKICAgICAgICAgfSk7 CiAgICAgfQogfQo= 280386 2016-06-02 17:00:18 -0700 2016-06-02 22:37:24 -0700 Patch bug-158328-20160602170138.patch text/plain 6852 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjAxNjI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGFlZmM2NzljMzE5NjRl ZThlNWI2YWFkMDZkMTBhYmM0N2Y4ZDJhNi4uNjMxZDg1MTUxZmVlMjljOTY0YmM2ZGViYWYyMDhk ZjM3MGNkOGE1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDE2LTA2LTAyICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgRHJvcCBCbG9iUmVnaXN0cnlD b250ZXh0IGNsYXNzIGFzIGl0IGlzIG5vIGxvbmdlciBuZWVkZWQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1ODMyOAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERyb3AgQmxvYlJlZ2lzdHJ5Q29udGV4dCBj bGFzcyBhcyBpdCBpcyBubyBsb25nZXIgbmVlZGVkLiBXZSBjYW4gbm93CisgICAgICAgIGNhbGwg aXNvbGF0ZWRDb3B5KCkgYXMgd2UgY2FwdHVyZSBpbiB0aGUgbGFtYmRhLgorCisgICAgICAgICog ZmlsZWFwaS9UaHJlYWRhYmxlQmxvYlJlZ2lzdHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRo cmVhZGFibGVCbG9iUmVnaXN0cnk6OnJlZ2lzdGVyRmlsZUJsb2JVUkwpOgorICAgICAgICAoV2Vi Q29yZTo6VGhyZWFkYWJsZUJsb2JSZWdpc3RyeTo6cmVnaXN0ZXJCbG9iVVJMKToKKyAgICAgICAg KFdlYkNvcmU6OlRocmVhZGFibGVCbG9iUmVnaXN0cnk6OnJlZ2lzdGVyQmxvYlVSTEZvclNsaWNl KToKKyAgICAgICAgKFdlYkNvcmU6OlRocmVhZGFibGVCbG9iUmVnaXN0cnk6OmJsb2JTaXplKToK KyAgICAgICAgKFdlYkNvcmU6OlRocmVhZGFibGVCbG9iUmVnaXN0cnk6OnVucmVnaXN0ZXJCbG9i VVJMKToKKyAgICAgICAgKFdlYkNvcmU6OkJsb2JSZWdpc3RyeUNvbnRleHQ6OkJsb2JSZWdpc3Ry eUNvbnRleHQpOiBEZWxldGVkLgorCisyMDE2LTA2LTAyICBDaHJpcyBEdW1leiAgPGNkdW1lekBh cHBsZS5jb20+CisKICAgICAgICAgW1dlYklETF0gJ3VuZGVmaW5lZCcgc2hvdWxkIGJlIGFuIGFj Y2VwdGFibGUgdmFsdWUgZm9yIG51bGxhYmxlIHBhcmFtZXRlcnMKICAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1ODMyMQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9maWxlYXBpL1RocmVhZGFibGVCbG9iUmVnaXN0cnkuY3BwIGIvU291cmNlL1dl YkNvcmUvZmlsZWFwaS9UaHJlYWRhYmxlQmxvYlJlZ2lzdHJ5LmNwcAppbmRleCAxZWM3NzNiMzgx MGIyZjZiMjhlYmNiY2YwZGI2YWFhMDA5ZTVlMjNlLi43ZjE5YWNjM2M5Y2I3Y2I2Y2U5NmM2Njlm ZGQ4YTk0OWFhMmViODQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9maWxlYXBpL1RocmVh ZGFibGVCbG9iUmVnaXN0cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvVGhyZWFk YWJsZUJsb2JSZWdpc3RyeS5jcHAKQEAgLTUxLDQzICs1MSw2IEBAIHVzaW5nIFdURjo6VGhyZWFk U3BlY2lmaWM7CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotc3RydWN0IEJsb2JSZWdpc3RyeUNv bnRleHQgewotICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwotcHVibGljOgotICAgIEJsb2JS ZWdpc3RyeUNvbnRleHQoY29uc3QgVVJMJiB1cmwsIFZlY3RvcjxCbG9iUGFydD4gYmxvYlBhcnRz LCBjb25zdCBTdHJpbmcmIGNvbnRlbnRUeXBlKQotICAgICAgICA6IHVybCh1cmwuaXNvbGF0ZWRD b3B5KCkpCi0gICAgICAgICwgY29udGVudFR5cGUoY29udGVudFR5cGUuaXNvbGF0ZWRDb3B5KCkp Ci0gICAgICAgICwgYmxvYlBhcnRzKFdURk1vdmUoYmxvYlBhcnRzKSkKLSAgICB7Ci0gICAgICAg IGZvciAoQmxvYlBhcnQmIHBhcnQgOiBibG9iUGFydHMpCi0gICAgICAgICAgICBwYXJ0LmRldGFj aEZyb21DdXJyZW50VGhyZWFkKCk7Ci0gICAgfQotCi0gICAgQmxvYlJlZ2lzdHJ5Q29udGV4dChj b25zdCBVUkwmIHVybCwgY29uc3QgVVJMJiBzcmNVUkwpCi0gICAgICAgIDogdXJsKHVybC5pc29s YXRlZENvcHkoKSkKLSAgICAgICAgLCBzcmNVUkwoc3JjVVJMLmlzb2xhdGVkQ29weSgpKQotICAg IHsKLSAgICB9Ci0KLSAgICBCbG9iUmVnaXN0cnlDb250ZXh0KGNvbnN0IFVSTCYgdXJsKQotICAg ICAgICA6IHVybCh1cmwuaXNvbGF0ZWRDb3B5KCkpCi0gICAgewotICAgIH0KLQotICAgIEJsb2JS ZWdpc3RyeUNvbnRleHQoY29uc3QgVVJMJiB1cmwsIGNvbnN0IFN0cmluZyYgcGF0aCwgY29uc3Qg U3RyaW5nJiBjb250ZW50VHlwZSkKLSAgICAgICAgOiB1cmwodXJsLmlzb2xhdGVkQ29weSgpKQot ICAgICAgICAsIHBhdGgocGF0aC5pc29sYXRlZENvcHkoKSkKLSAgICAgICAgLCBjb250ZW50VHlw ZShjb250ZW50VHlwZS5pc29sYXRlZENvcHkoKSkKLSAgICB7Ci0gICAgfQotCi0gICAgVVJMIHVy bDsKLSAgICBVUkwgc3JjVVJMOwotICAgIFN0cmluZyBwYXRoOwotICAgIFN0cmluZyBjb250ZW50 VHlwZTsKLSAgICBWZWN0b3I8QmxvYlBhcnQ+IGJsb2JQYXJ0czsKLX07Ci0KIHR5cGVkZWYgSGFz aE1hcDxTdHJpbmcsIFJlZlB0cjxTZWN1cml0eU9yaWdpbj4+IEJsb2JVcmxPcmlnaW5NYXA7CiAK IHN0YXRpYyBUaHJlYWRTcGVjaWZpYzxCbG9iVXJsT3JpZ2luTWFwPiYgb3JpZ2luTWFwKCkKQEAg LTExNyw5ICs4MCw4IEBAIHZvaWQgVGhyZWFkYWJsZUJsb2JSZWdpc3RyeTo6cmVnaXN0ZXJGaWxl QmxvYlVSTChjb25zdCBVUkwmIHVybCwgY29uc3QgU3RyaW5nJiBwCiAgICAgaWYgKGlzTWFpblRo cmVhZCgpKQogICAgICAgICBibG9iUmVnaXN0cnkoKS5yZWdpc3RlckZpbGVCbG9iVVJMKHVybCwg QmxvYkRhdGFGaWxlUmVmZXJlbmNlOjpjcmVhdGUocGF0aCksIGNvbnRlbnRUeXBlKTsKICAgICBl bHNlIHsKLSAgICAgICAgLy8gQmxvYlJlZ2lzdHJ5Q29udGV4dCBwZXJmb3JtcyBhbiBpc29sYXRl ZCBjb3B5IG9mIGRhdGEuCi0gICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW2NvbnRleHQgPSBzdGQ6 Om1ha2VfdW5pcXVlPEJsb2JSZWdpc3RyeUNvbnRleHQ+KHVybCwgcGF0aCwgY29udGVudFR5cGUp XSB7Ci0gICAgICAgICAgICBibG9iUmVnaXN0cnkoKS5yZWdpc3RlckZpbGVCbG9iVVJMKGNvbnRl eHQtPnVybCwgQmxvYkRhdGFGaWxlUmVmZXJlbmNlOjpjcmVhdGUoY29udGV4dC0+cGF0aCksIGNv bnRleHQtPmNvbnRlbnRUeXBlKTsKKyAgICAgICAgY2FsbE9uTWFpblRocmVhZChbdXJsID0gdXJs Lmlzb2xhdGVkQ29weSgpLCBwYXRoID0gcGF0aC5pc29sYXRlZENvcHkoKSwgY29udGVudFR5cGUg PSBjb250ZW50VHlwZS5pc29sYXRlZENvcHkoKV0geworICAgICAgICAgICAgYmxvYlJlZ2lzdHJ5 KCkucmVnaXN0ZXJGaWxlQmxvYlVSTCh1cmwsIEJsb2JEYXRhRmlsZVJlZmVyZW5jZTo6Y3JlYXRl KHBhdGgpLCBjb250ZW50VHlwZSk7CiAgICAgICAgIH0pOwogICAgIH0KIH0KQEAgLTEyOSw5ICs5 MSwxMCBAQCB2b2lkIFRocmVhZGFibGVCbG9iUmVnaXN0cnk6OnJlZ2lzdGVyQmxvYlVSTChjb25z dCBVUkwmIHVybCwgVmVjdG9yPEJsb2JQYXJ0PiBibAogICAgIGlmIChpc01haW5UaHJlYWQoKSkK ICAgICAgICAgYmxvYlJlZ2lzdHJ5KCkucmVnaXN0ZXJCbG9iVVJMKHVybCwgV1RGTW92ZShibG9i UGFydHMpLCBjb250ZW50VHlwZSk7CiAgICAgZWxzZSB7Ci0gICAgICAgIC8vIEJsb2JSZWdpc3Ry eUNvbnRleHQgcGVyZm9ybXMgYW4gaXNvbGF0ZWQgY29weSBvZiBkYXRhLgotICAgICAgICBjYWxs T25NYWluVGhyZWFkKFtjb250ZXh0ID0gc3RkOjptYWtlX3VuaXF1ZTxCbG9iUmVnaXN0cnlDb250 ZXh0Pih1cmwsIFdURk1vdmUoYmxvYlBhcnRzKSwgY29udGVudFR5cGUpXSB7Ci0gICAgICAgICAg ICBibG9iUmVnaXN0cnkoKS5yZWdpc3RlckJsb2JVUkwoY29udGV4dC0+dXJsLCBXVEZNb3ZlKGNv bnRleHQtPmJsb2JQYXJ0cyksIGNvbnRleHQtPmNvbnRlbnRUeXBlKTsKKyAgICAgICAgZm9yIChh dXRvJiBwYXJ0IDogYmxvYlBhcnRzKQorICAgICAgICAgICAgcGFydC5kZXRhY2hGcm9tQ3VycmVu dFRocmVhZCgpOworICAgICAgICBjYWxsT25NYWluVGhyZWFkKFt1cmwgPSB1cmwuaXNvbGF0ZWRD b3B5KCksIGJsb2JQYXJ0cyA9IFdURk1vdmUoYmxvYlBhcnRzKSwgY29udGVudFR5cGUgPSBjb250 ZW50VHlwZS5pc29sYXRlZENvcHkoKV0oKSBtdXRhYmxlIHsKKyAgICAgICAgICAgIGJsb2JSZWdp c3RyeSgpLnJlZ2lzdGVyQmxvYlVSTCh1cmwsIFdURk1vdmUoYmxvYlBhcnRzKSwgY29udGVudFR5 cGUpOwogICAgICAgICB9KTsKICAgICB9CiB9CkBAIC0xNDUsOSArMTA4LDggQEAgdm9pZCBUaHJl YWRhYmxlQmxvYlJlZ2lzdHJ5OjpyZWdpc3RlckJsb2JVUkwoU2VjdXJpdHlPcmlnaW4qIG9yaWdp biwgY29uc3QgVVJMJgogICAgIGlmIChpc01haW5UaHJlYWQoKSkKICAgICAgICAgYmxvYlJlZ2lz dHJ5KCkucmVnaXN0ZXJCbG9iVVJMKHVybCwgc3JjVVJMKTsKICAgICBlbHNlIHsKLSAgICAgICAg Ly8gQmxvYlJlZ2lzdHJ5Q29udGV4dCBwZXJmb3JtcyBhbiBpc29sYXRlZCBjb3B5IG9mIGRhdGEu Ci0gICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW2NvbnRleHQgPSBzdGQ6Om1ha2VfdW5pcXVlPEJs b2JSZWdpc3RyeUNvbnRleHQ+KHVybCwgc3JjVVJMKV0gewotICAgICAgICAgICAgYmxvYlJlZ2lz dHJ5KCkucmVnaXN0ZXJCbG9iVVJMKGNvbnRleHQtPnVybCwgY29udGV4dC0+c3JjVVJMKTsKKyAg ICAgICAgY2FsbE9uTWFpblRocmVhZChbdXJsID0gdXJsLmlzb2xhdGVkQ29weSgpLCBzcmNVUkwg PSBzcmNVUkwuaXNvbGF0ZWRDb3B5KCldIHsKKyAgICAgICAgICAgIGJsb2JSZWdpc3RyeSgpLnJl Z2lzdGVyQmxvYlVSTCh1cmwsIHNyY1VSTCk7CiAgICAgICAgIH0pOwogICAgIH0KIH0KQEAgLTE3 Miw5ICsxMzQsOCBAQCB2b2lkIFRocmVhZGFibGVCbG9iUmVnaXN0cnk6OnJlZ2lzdGVyQmxvYlVS TEZvclNsaWNlKGNvbnN0IFVSTCYgbmV3VVJMLCBjb25zdCBVUgogICAgIGlmIChpc01haW5UaHJl YWQoKSkKICAgICAgICAgYmxvYlJlZ2lzdHJ5KCkucmVnaXN0ZXJCbG9iVVJMRm9yU2xpY2UobmV3 VVJMLCBzcmNVUkwsIHN0YXJ0LCBlbmQpOwogICAgIGVsc2UgewotICAgICAgICAvLyBCbG9iUmVn aXN0cnlDb250ZXh0IHBlcmZvcm1zIGFuIGlzb2xhdGVkIGNvcHkgb2YgZGF0YS4KLSAgICAgICAg Y2FsbE9uTWFpblRocmVhZChbY29udGV4dCA9IHN0ZDo6bWFrZV91bmlxdWU8QmxvYlJlZ2lzdHJ5 Q29udGV4dD4obmV3VVJMLCBzcmNVUkwpLCBzdGFydCwgZW5kXSB7Ci0gICAgICAgICAgICBibG9i UmVnaXN0cnkoKS5yZWdpc3RlckJsb2JVUkxGb3JTbGljZShjb250ZXh0LT51cmwsIGNvbnRleHQt PnNyY1VSTCwgc3RhcnQsIGVuZCk7CisgICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW25ld1VSTCA9 IG5ld1VSTC5pc29sYXRlZENvcHkoKSwgc3JjVVJMID0gc3JjVVJMLmlzb2xhdGVkQ29weSgpLCBz dGFydCwgZW5kXSB7CisgICAgICAgICAgICBibG9iUmVnaXN0cnkoKS5yZWdpc3RlckJsb2JVUkxG b3JTbGljZShuZXdVUkwsIHNyY1VSTCwgc3RhcnQsIGVuZCk7CiAgICAgICAgIH0pOwogICAgIH0K IH0KQEAgLTE4NSwxMCArMTQ2LDkgQEAgdW5zaWduZWQgbG9uZyBsb25nIFRocmVhZGFibGVCbG9i UmVnaXN0cnk6OmJsb2JTaXplKGNvbnN0IFVSTCYgdXJsKQogICAgIGlmIChpc01haW5UaHJlYWQo KSkKICAgICAgICAgcmVzdWx0U2l6ZSA9IGJsb2JSZWdpc3RyeSgpLmJsb2JTaXplKHVybCk7CiAg ICAgZWxzZSB7Ci0gICAgICAgIC8vIEJsb2JSZWdpc3RyeUNvbnRleHQgcGVyZm9ybXMgYW4gaXNv bGF0ZWQgY29weSBvZiBkYXRhLgogICAgICAgICBCaW5hcnlTZW1hcGhvcmUgc2VtYXBob3JlOwot ICAgICAgICBjYWxsT25NYWluVGhyZWFkKFtjb250ZXh0ID0gc3RkOjptYWtlX3VuaXF1ZTxCbG9i UmVnaXN0cnlDb250ZXh0Pih1cmwpLCAmc2VtYXBob3JlLCAmcmVzdWx0U2l6ZV0gewotICAgICAg ICAgICAgcmVzdWx0U2l6ZSA9IGJsb2JSZWdpc3RyeSgpLmJsb2JTaXplKGNvbnRleHQtPnVybCk7 CisgICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW3VybCA9IHVybC5pc29sYXRlZENvcHkoKSwgJnNl bWFwaG9yZSwgJnJlc3VsdFNpemVdIHsKKyAgICAgICAgICAgIHJlc3VsdFNpemUgPSBibG9iUmVn aXN0cnkoKS5ibG9iU2l6ZSh1cmwpOwogICAgICAgICAgICAgc2VtYXBob3JlLnNpZ25hbCgpOwog ICAgICAgICB9KTsKICAgICAgICAgc2VtYXBob3JlLndhaXQoc3RkOjpudW1lcmljX2xpbWl0czxk b3VibGU+OjptYXgoKSk7CkBAIC0yMDQsOSArMTY0LDggQEAgdm9pZCBUaHJlYWRhYmxlQmxvYlJl Z2lzdHJ5Ojp1bnJlZ2lzdGVyQmxvYlVSTChjb25zdCBVUkwmIHVybCkKICAgICBpZiAoaXNNYWlu VGhyZWFkKCkpCiAgICAgICAgIGJsb2JSZWdpc3RyeSgpLnVucmVnaXN0ZXJCbG9iVVJMKHVybCk7 CiAgICAgZWxzZSB7Ci0gICAgICAgIC8vIEJsb2JSZWdpc3RyeUNvbnRleHQgcGVyZm9ybXMgYW4g aXNvbGF0ZWQgY29weSBvZiBkYXRhLgotICAgICAgICBjYWxsT25NYWluVGhyZWFkKFtjb250ZXh0 ID0gc3RkOjptYWtlX3VuaXF1ZTxCbG9iUmVnaXN0cnlDb250ZXh0Pih1cmwpXSB7Ci0gICAgICAg ICAgICBibG9iUmVnaXN0cnkoKS51bnJlZ2lzdGVyQmxvYlVSTChjb250ZXh0LT51cmwpOworICAg ICAgICBjYWxsT25NYWluVGhyZWFkKFt1cmwgPSB1cmwuaXNvbGF0ZWRDb3B5KCldIHsKKyAgICAg ICAgICAgIGJsb2JSZWdpc3RyeSgpLnVucmVnaXN0ZXJCbG9iVVJMKHVybCk7CiAgICAgICAgIH0p OwogICAgIH0KIH0K