168075 2017-02-09 13:58:09 -0800 Rename isAppleMacWebKit to isAppleCocoaWebKit 2017-02-09 16:16:01 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 achristensen achristensen commit-queue dbates oldest_to_newest 1275038 0 achristensen 2017-02-09 13:58:09 -0800 Rename isAppleMacWebKit to isAppleCocoaWebKit 1275039 1 301080 achristensen 2017-02-09 13:58:54 -0800 Created attachment 301080 Patch 1275069 2 301080 ggaren 2017-02-09 15:09:50 -0800 Comment on attachment 301080 Patch r=me 1275086 3 301080 commit-queue 2017-02-09 15:48:29 -0800 Comment on attachment 301080 Patch Clearing flags on attachment: 301080 Committed r211998: <http://trac.webkit.org/changeset/211998> 1275087 4 commit-queue 2017-02-09 15:48:34 -0800 All reviewed patches have been landed. Closing bug. 1275105 5 achristensen 2017-02-09 16:16:01 -0800 There are two internal changes related to this. 301080 2017-02-09 13:58:54 -0800 2017-02-09 15:48:29 -0800 Patch bug-168075-20170209135628.patch text/plain 22039 achristensen SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxMTk5MSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDUxIEBACisyMDE3LTAyLTA5ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdl YmtpdC5vcmc+CisKKyAgICAgICAgUmVuYW1lIGlzQXBwbGVNYWNXZWJLaXQgdG8gaXNBcHBsZUNv Y29hV2ViS2l0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNjgwNzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBJdCByZXR1cm5zIHRydWUgZm9yIE1hYyBhbmQgaU9TLiAgImlzQXBwbGVNYWNXZWJLaXQiIGlz IGNvbmZ1c2luZyBhbmQgd3JvbmcuCisKKyAgICAgICAgKiBTY3JpcHRzL2J1aWxkLWFwaS10ZXN0 czoKKyAgICAgICAgKiBTY3JpcHRzL2J1aWxkLWR1bXByZW5kZXJ0cmVlOgorICAgICAgICAqIFNj cmlwdHMvYnVpbGQtanNjOgorICAgICAgICAoYnVpbGRNeVByb2plY3QpOgorICAgICAgICAqIFNj cmlwdHMvYnVpbGQtbGF5b3V0dGVzdHJlbGF5OgorICAgICAgICAqIFNjcmlwdHMvYnVpbGQtd2Vi a2l0OgorICAgICAgICAqIFNjcmlwdHMvYnVpbGQtd2Via2l0dGVzdHJ1bm5lcjoKKyAgICAgICAg KiBTY3JpcHRzL3J1bi1hcGktdGVzdHM6CisgICAgICAgIChpc1N1cHBvcnRlZFBsYXRmb3JtKToK KyAgICAgICAgKHJ1blRlc3QpOgorICAgICAgICAobGlzdEFsbFRlc3RzKToKKyAgICAgICAgKHBy ZXBhcmVFbnZpcm9ubWVudEZvclJ1bm5pbmdUZXN0VG9vbCk6CisgICAgICAgICogU2NyaXB0cy9y dW4tY29udGVudC1leHRlbnNpb24tdGVzdGVyOgorICAgICAgICAqIFNjcmlwdHMvcnVuLWphdmFz Y3JpcHRjb3JlLXRlc3RzOgorICAgICAgICAqIFNjcmlwdHMvcnVuLW1pbmlicm93c2VyOgorICAg ICAgICAqIFNjcmlwdHMvc2hvdy1wcmV0dHktZGlmZjoKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dGRpcnMucG06CisgICAgICAgIChkZXRlcm1pbmVCYXNlUHJvZHVjdERpcik6CisgICAgICAgIChk ZXRlcm1pbmVBcmNoaXRlY3R1cmUpOgorICAgICAgICAoZGV0ZXJtaW5lUGFzc2VkQXJjaGl0ZWN0 dXJlKToKKyAgICAgICAgKHNhZmFyaVBhdGgpOgorICAgICAgICAoYnVpbHREeWxpYlBhdGhGb3JO YW1lKToKKyAgICAgICAgKGNoZWNrRnJhbWV3b3Jrcyk6CisgICAgICAgIChpc0FwcGxlV2ViS2l0 KToKKyAgICAgICAgKGlzQXBwbGVDb2NvYVdlYktpdCk6CisgICAgICAgIChkZXRlcm1pbmVObVBh dGgpOgorICAgICAgICAobGF1bmNoZXJOYW1lKToKKyAgICAgICAgKHdyYXBwZXJQcmVmaXhJZk5l ZWRlZCk6CisgICAgICAgIChpc0NNYWtlQnVpbGQpOgorICAgICAgICAobW9iaWxlU2FmYXJpQnVu ZGxlKToKKyAgICAgICAgKGRlYnVnU2FmYXJpKToKKyAgICAgICAgKHJ1blNhZmFyaSk6CisgICAg ICAgIChydW5NaW5pQnJvd3Nlcik6CisgICAgICAgIChkZWJ1Z01pbmlCcm93c2VyKToKKyAgICAg ICAgKHJ1bldlYktpdFRlc3RSdW5uZXIpOgorICAgICAgICAoZGVidWdXZWJLaXRUZXN0UnVubmVy KToKKyAgICAgICAgKGlzQXBwbGVNYWNXZWJLaXQpOiBEZWxldGVkLgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cGVybC9GZWF0dXJlTGlzdC5wbToKKwogMjAxNy0wMi0wOSAgQWxleCBDaHJpc3Rl bnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIEJ1aWxkIGxpYndlYnJ0 YyBvbiBib3RzIHdpdGhvdXQgdXNpbmcgaXQgeWV0CkluZGV4OiBUb29scy9TY3JpcHRzL2J1aWxk LWFwaS10ZXN0cwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2J1aWxkLWFwaS10ZXN0cwko cmV2aXNpb24gMjExOTgwKQorKysgVG9vbHMvU2NyaXB0cy9idWlsZC1hcGktdGVzdHMJKHdvcmtp bmcgY29weSkKQEAgLTYxLDcgKzYxLDcgQEAgY2hkaXJXZWJLaXQoKTsKICMgQnVpbGQKIAogbXkg JHJlc3VsdDsKLWlmIChpc0FwcGxlTWFjV2ViS2l0KCkpIHsKK2lmIChpc0FwcGxlQ29jb2FXZWJL aXQoKSkgewogICAgIGNoZGlyICJTb3VyY2UvVGhpcmRQYXJ0eS9ndGVzdCI7CiAgICAgYnVpbGRY Q29kZVByb2plY3QoInhjb2RlL2d0ZXN0IiwgJGNsZWFuLCBYY29kZU9wdGlvbnMoKSwgQEFSR1Yp OwogICAgIGNoZGlyICIuLi8uLi8uLi9Ub29scy9UZXN0V2ViS2l0QVBJIiBvciBkaWU7CkluZGV4 OiBUb29scy9TY3JpcHRzL2J1aWxkLWR1bXByZW5kZXJ0cmVlCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L1NjcmlwdHMvYnVpbGQtZHVtcHJlbmRlcnRyZWUJKHJldmlzaW9uIDIxMTk4MCkKKysrIFRvb2xz L1NjcmlwdHMvYnVpbGQtZHVtcHJlbmRlcnRyZWUJKHdvcmtpbmcgY29weSkKQEAgLTY0LDcgKzY0 LDcgQEAgY2hkaXJXZWJLaXQoKTsKIGNoZGlyIEZpbGU6OlNwZWMtPmNhdGRpcigiVG9vbHMiLCAi RHVtcFJlbmRlclRyZWUiKSBvciBkaWU7CiAKIG15ICRyZXN1bHQ7Ci1pZiAoaXNBcHBsZU1hY1dl YktpdCgpKSB7CitpZiAoaXNBcHBsZUNvY29hV2ViS2l0KCkpIHsKICAgICAkcmVzdWx0ID0gYnVp bGRYQ29kZVByb2plY3QoIkR1bXBSZW5kZXJUcmVlIiwgJGNsZWFuLCBYY29kZU9wdGlvbnMoKSwg QEFSR1YpOwogfSBlbHNpZiAoaXNHdGsoKSB8fCBpc0VmbCgpIHx8IGlzQW55V2luZG93cygpKSB7 CiAgICAgIyBHdGssIEVGTCwgYW5kIFdpbmRvd3MgYnVpbGQgZXZlcnl0aGluZyBpbiBvbmUgc2hv dC4gTm8gbmVlZCB0byBidWlsZCBhbnl0aGluZyBoZXJlLgpJbmRleDogVG9vbHMvU2NyaXB0cy9i dWlsZC1qc2MKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9idWlsZC1qc2MJKHJldmlzaW9u IDIxMTk4MCkKKysrIFRvb2xzL1NjcmlwdHMvYnVpbGQtanNjCSh3b3JraW5nIGNvcHkpCkBAIC00 NSw3ICs0NSw3IEBAIG15ICRzaG91bGRSdW5TdGF0aWNBbmFseXplciA9IDA7CiBteSAkbWluaW1h bCA9IDA7CiBteSAkY292ZXJhZ2VTdXBwb3J0ID0gMDsKIG15ICRzaG93SGVscCA9IDA7Ci1teSAk ZnRsSklUID0gaW50KGlzQXBwbGVNYWNXZWJLaXQoKSAmJiAhd2lsbFVzZUlPU1NpbXVsYXRvclNE SygpIHx8IGlzWDg2XzY0KCkgJiYgKGlzR3RrKCkgfHwgaXNFZmwoKSB8fCBpc0pTQ09ubHkoKSkp OworbXkgJGZ0bEpJVCA9IGludChpc0FwcGxlQ29jb2FXZWJLaXQoKSAmJiAhd2lsbFVzZUlPU1Np bXVsYXRvclNESygpIHx8IGlzWDg2XzY0KCkgJiYgKGlzR3RrKCkgfHwgaXNFZmwoKSB8fCBpc0pT Q09ubHkoKSkpOwogbXkgJGZvcmNlQ0xvb3AgPSAwOwogbXkgJGNsaSA9IDA7CiBteSAkbWFrZUFy Z3MgPSAiIjsKQEAgLTE0OCw3ICsxNDgsNyBAQCBpZiAoaXNDTWFrZUJ1aWxkKCkpIHsKICAgICBl eGl0IGV4aXRTdGF0dXMoMCk7CiB9CiAKLWlmIChpc0FwcGxlTWFjV2ViS2l0KCkpIHsKK2lmIChp c0FwcGxlQ29jb2FXZWJLaXQoKSkgewogICAgIHB1c2ggQG9wdGlvbnMsICgkZm9yY2VDTG9vcCA/ ICJFTkFCTEVfSklUPUVOQUJMRV9KSVQ9MCIgOiAiRU5BQkxFX0pJVD1FTkFCTEVfSklUIik7CiAg ICAgcHVzaCBAb3B0aW9ucywgKCRmdGxKSVQgPyAiRU5BQkxFX0ZUTF9KSVQ9RU5BQkxFX0ZUTF9K SVQiIDogIkVOQUJMRV9GVExfSklUPUVOQUJMRV9GVExfSklUPTAiKTsKIApAQCAtMTc5LDcgKzE3 OSw3IEBAIHN1YiBidWlsZE15UHJvamVjdAogICAgIG15ICgkcHJvamVjdERpcmVjdG9yeSwgJHBy b2plY3ROYW1lKSA9IEBfOwogICAgIG15ICRyZXN1bHQ7CiAgICAgY2hkaXIgJHByb2plY3REaXJl Y3Rvcnkgb3IgZGllICJDYW4ndCBmaW5kICRwcm9qZWN0TmFtZSBkaXJlY3RvcnkgdG8gYnVpbGQg ZnJvbSI7Ci0gICAgaWYgKGlzQXBwbGVNYWNXZWJLaXQoKSkgeworICAgIGlmIChpc0FwcGxlQ29j b2FXZWJLaXQoKSkgewogICAgICAgICAkcmVzdWx0ID0gc3lzdGVtICJzaCIsICItYyIsICgneGNv ZGVidWlsZCAtcHJvamVjdCAnIC4gJHByb2plY3ROYW1lIC4gJy54Y29kZXByb2ogIiRAIiB8IGdy ZXAgLXYgc2V0ZW52ICYmIGV4aXQgJHtQSVBFU1RBVFVTWzBdfScpLCAieGNvZGVidWlsZCIsICBA b3B0aW9ucywgQEFSR1YsIEBhZGRpdGlvbmFsU3VwcG9ydE9wdGlvbnM7CiAgICAgfSBlbHNpZiAo aXNBcHBsZVdpbldlYktpdCgpIHx8IGlzV2luQ2Fpcm8oKSkgewogICAgICAgICAjIFdURiBpcyBh IHBhcnQgb2YgSmF2YVNjcmlwdENvcmUuc2xuIGJlY2F1c2UganNjLmV4ZSB3b3VsZG4ndCBzdGFy dCBvdGhlcndpc2UuCkBAIC0yMjgsNiArMjI4LDYgQEAgaWYgKCFpc0FwcGxlV2luV2ViS2l0KCkg JiYgIWlzV2luQ2Fpcm8oKQogfQogYnVpbGRNeVByb2plY3QoIlNvdXJjZS9XVEYiLCAiV1RGIik7 CiBidWlsZE15UHJvamVjdCgiU291cmNlL0phdmFTY3JpcHRDb3JlIiwgIkphdmFTY3JpcHRDb3Jl Iik7Ci1pZiAoaXNBcHBsZU1hY1dlYktpdCgpICYmICRjbGkpIHsKK2lmIChpc0FwcGxlQ29jb2FX ZWJLaXQoKSAmJiAkY2xpKSB7CiAgICAgYnVpbGRNeVByb2plY3QoIlRvb2xzL2pzYy1jbGkiLCAi anNjLWNsaSIpOwogfQpJbmRleDogVG9vbHMvU2NyaXB0cy9idWlsZC1sYXlvdXR0ZXN0cmVsYXkK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9idWlsZC1sYXlvdXR0ZXN0cmVsYXkJKHJldmlz aW9uIDIxMTk4MCkKKysrIFRvb2xzL1NjcmlwdHMvYnVpbGQtbGF5b3V0dGVzdHJlbGF5CSh3b3Jr aW5nIGNvcHkpCkBAIC01OSw3ICs1OSw3IEBAIGNoZGlyICJUb29scy9MYXlvdXRUZXN0UmVsYXki IG9yIGRpZTsKICMgRklYTUU6IFRoaXMgdG9vbCBpcyBvbmx5IHVzZWZ1bCB3aGVuIGJ1aWxkaW5n IFdlYktpdCBmb3IgaU9TIFNpbXVsYXRvci4gRm9yIG5vdywKICMgICAgICAgIHRvIGF2b2lkIGJy ZWFraW5nIHNvbWUgQXBwbGUgSW50ZXJuYWwgdG9vbHMgd2Ugc3VwcG9ydCBjYWxsaW5nIHRoaXMg c2NyaXB0CiAjICAgICAgICB3aXRob3V0IC0taW9zLXNpbXVsYXRvciBzbyBsb25nIGFzIHdlIGFy ZSBidWlsZGluZyBvbiBhIE1hYy4KLWlmIChpc0FwcGxlTWFjV2ViS2l0KCkgJiYgIXdpbGxVc2VJ T1NEZXZpY2VTREsoKSkgeworaWYgKGlzQXBwbGVDb2NvYVdlYktpdCgpICYmICF3aWxsVXNlSU9T RGV2aWNlU0RLKCkpIHsKICAgICAjIEZJWE1FOiBDaGFuZ2luZyBTREsgYXQgdGhpcyBwb2ludCBy ZXN1bHRzIGluIGFuIGluY29uc2lzdGVudCB3ZWJraXRkaXJzIHN0YXRlLgogICAgICMgV2Ugc2hv dWxkIG1ha2UgaXQgc28gdGhhdCB3ZWJraXRkaXJzIGZ1bmN0aW9ucyBuZXZlciBzZWUgdGhlIHdy b25nIFNESy4KICAgICBzZXRYY29kZVNESyh1bmRlZik7ICMgRm9yY2UgdXNlIG9mIE1hYyBTREsg aWYgLS1pb3Mtc2ltdWxhdG9yIHdhcyBwYXNzZWQKSW5kZXg6IFRvb2xzL1NjcmlwdHMvYnVpbGQt d2Via2l0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CShyZXZpc2lv biAyMTE5OTEpCisrKyBUb29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAkod29ya2luZyBjb3B5KQpA QCAtMTQ4LDcgKzE0OCw3IEBAIG15IEBwcm9qZWN0cyA9ICgiU291cmNlL0phdmFTY3JpcHRDb3Jl IiwKICMgQnVpbGQgV1RGIGFzIGEgc2VwYXJhdGUgc3RhdGljIGxpYnJhcnkgb24gcG9ydHMgd2hp Y2ggc3VwcG9ydCBpdC4KIHNwbGljZSBAcHJvamVjdHMsIDAsIDAsICJTb3VyY2UvV1RGIiBpZiBp c0FwcGxlV2ViS2l0KCkgb3IgaXNXaW5DYWlybygpOwogCi1zcGxpY2UgQHByb2plY3RzLCAwLCAw LCAiU291cmNlL2JtYWxsb2MiIGlmIGlzQXBwbGVNYWNXZWJLaXQoKTsKK3NwbGljZSBAcHJvamVj dHMsIDAsIDAsICJTb3VyY2UvYm1hbGxvYyIgaWYgaXNBcHBsZUNvY29hV2ViS2l0KCk7CiAKICMg UG9ydHMgdXNpbmcgQ01ha2Ugd2lsbCBjaGVjayBpZiBkaXJlY3RvcmllcyBleGlzdCBpbiB0aGUg Q01ha2UgY29uZmlndXJhdGlvbi4KIGlmICghaXNDTWFrZUJ1aWxkKCkpIHsKQEAgLTE2NSw3ICsx NjUsNyBAQCBpZiAoKGlzQXBwbGVXZWJLaXQoKSB8fCBpc1dpbkNhaXJvKCkpICYmCiAKIG15IEBv cHRpb25zID0gKCk7CiAKLWlmIChpc0FwcGxlTWFjV2ViS2l0KCkpIHsKK2lmIChpc0FwcGxlQ29j b2FXZWJLaXQoKSkgewogICAgIHB1c2ggQG9wdGlvbnMsIFhjb2RlT3B0aW9ucygpOwogICAgIHN1 YiBvcHRpb24oJCQkKQogICAgIHsKQEAgLTI2OSw3ICsyNjksNyBAQCBpZiAoaXNBcHBsZVdpbldl YktpdCgpIHx8IGlzV2luQ2Fpcm8oKSkgCiAgICAgICAgIH0KICAgICAgICAgZXhpdCBleGl0U3Rh dHVzKCRyZXN1bHQpOwogICAgIH0KLX0gZWxzaWYgKGlzQXBwbGVNYWNXZWJLaXQoKSAmJiAhaXND TWFrZUJ1aWxkKCkpIHsKK30gZWxzaWYgKGlzQXBwbGVDb2NvYVdlYktpdCgpICYmICFpc0NNYWtl QnVpbGQoKSkgewogICAgICMgQnVpbGQsIGFuZCBhYm9ydCBpZiB0aGUgYnVpbGQgZmFpbHMuCiAg ICAgZm9yIG15ICRkaXIgKEBwcm9qZWN0cykgewogICAgICAgICBjaGRpciAkZGlyIG9yIGRpZTsK SW5kZXg6IFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0dGVzdHJ1bm5lcgo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBUb29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdHRlc3RydW5uZXIJKHJldmlzaW9uIDIxMTk4MCkK KysrIFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0dGVzdHJ1bm5lcgkod29ya2luZyBjb3B5KQpA QCAtNTksNyArNTksNyBAQCBjaGRpcldlYktpdCgpOwogY2hkaXIgIlRvb2xzL1dlYktpdFRlc3RS dW5uZXIiIG9yIGRpZTsKIAogbXkgJHJlc3VsdDsKLWlmIChpc0FwcGxlTWFjV2ViS2l0KCkpIHsK K2lmIChpc0FwcGxlQ29jb2FXZWJLaXQoKSkgewogICAgICRyZXN1bHQgPSBidWlsZFhDb2RlUHJv amVjdCgiV2ViS2l0VGVzdFJ1bm5lciIsICRjbGVhbiwgWGNvZGVPcHRpb25zKCksIEBBUkdWKTsK IH0gZWxzaWYgKGlzR3RrKCkgfHwgaXNFZmwoKSkgewogICAgICMgR1RLKyBhbmQgRUZMIGJ1aWxk IGV2ZXJ5dGhpbmcgaW4gb25lIHNob3QuIE5vIG5lZWQgdG8gYnVpbGQgYW55dGhpbmcgaGVyZS4K SW5kZXg6IFRvb2xzL1NjcmlwdHMvcnVuLWFwaS10ZXN0cwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9T Y3JpcHRzL3J1bi1hcGktdGVzdHMJKHJldmlzaW9uIDIxMTk4MCkKKysrIFRvb2xzL1NjcmlwdHMv cnVuLWFwaS10ZXN0cwkod29ya2luZyBjb3B5KQpAQCAtMTM0LDcgKzEzNCw3IEBAIGV4aXQgcnVu VGVzdHNCeVN1aXRlKEB0ZXN0c1RvUnVuKTsKIAogc3ViIGlzU3VwcG9ydGVkUGxhdGZvcm0oKQog ewotICAgIHJldHVybiBpc0FwcGxlTWFjV2ViS2l0KCkgfHwgaXNBcHBsZVdpbldlYktpdCgpOwor ICAgIHJldHVybiBpc0FwcGxlQ29jb2FXZWJLaXQoKSB8fCBpc0FwcGxlV2luV2ViS2l0KCk7CiB9 CiAKIHN1YiBkdW1wVGVzdHNCeVN1aXRlKFxAKQpAQCAtMjA2LDcgKzIwNiw3IEBAIHN1YiBydW5U ZXN0KCQkKQogICAgIG15IEBjb21tb25Bcmd1bWVudHMgPSAoJHRlc3RUb1Rvb2xNYXB7JHRlc3R9 LCAkZ3Rlc3RBcmcsIEBBUkdWKTsKICAgICBpZiAod2lsbFVzZUlPU1NpbXVsYXRvclNESygpKSB7 CiAgICAgICAgICRwaWQgPSBvcGVuMygkY2hpbGRJbiwgJGNoaWxkT3V0LCAkY2hpbGRFcnIsIHF3 KHhjcnVuIC0tc2RrIGlwaG9uZXNpbXVsYXRvciBzaW1jdGwgc3Bhd24pLCAkc2ltdWxhdG9yRGV2 aWNlLT57VURJRH0sIEBjb21tb25Bcmd1bWVudHMpIG9yIGRpZSAiRmFpbGVkIHRvIHJ1biB0ZXN0 OiAkdGVzdC4iOwotICAgIH0gZWxzaWYgKGlzQXBwbGVNYWNXZWJLaXQoKSAmJiBhcmNoaXRlY3R1 cmUoKSkgeworICAgIH0gZWxzaWYgKGlzQXBwbGVDb2NvYVdlYktpdCgpICYmIGFyY2hpdGVjdHVy ZSgpKSB7CiAgICAgICAgICRwaWQgPSBvcGVuMygkY2hpbGRJbiwgJGNoaWxkT3V0LCAkY2hpbGRF cnIsICJhcmNoIiwgIi0iIC4gYXJjaGl0ZWN0dXJlKCksIGFyY2hDb21tYW5kTGluZUFyZ3VtZW50 c0ZvclJlc3RyaWN0ZWRFbnZpcm9ubWVudFZhcmlhYmxlcygpLCBAY29tbW9uQXJndW1lbnRzKSBv ciBkaWUgIkZhaWxlZCB0byBydW4gdGVzdDogJHRlc3QuIjsKICAgICB9IGVsc2UgewogICAgICAg ICAkcGlkID0gb3BlbjMoJGNoaWxkSW4sICRjaGlsZE91dCwgJGNoaWxkRXJyLCBAY29tbW9uQXJn dW1lbnRzKSBvciBkaWUgIkZhaWxlZCB0byBydW4gdGVzdDogJHRlc3QuIjsKQEAgLTI4Myw3ICsy ODMsNyBAQCBzdWIgbGlzdEFsbFRlc3RzKCkKICAgICAgICAgbXkgQGNvbW1vbkFyZ3VtZW50cyA9 ICgkdGVzdFRvb2wsICItLWd0ZXN0X2xpc3RfdGVzdHMiKTsKICAgICAgICAgaWYgKGlzSU9TV2Vi S2l0KCkpIHsKICAgICAgICAgICAgICRwaWQgPSBvcGVuMygkY2hpbGRJbiwgJGNoaWxkT3V0LCAk Y2hpbGRFcnIsIHF3KHhjcnVuIC0tc2RrIGlwaG9uZXNpbXVsYXRvciBzaW1jdGwgc3Bhd24pLCAk c2ltdWxhdG9yRGV2aWNlLT57VURJRH0sIEBjb21tb25Bcmd1bWVudHMpIG9yIGRpZSAiRmFpbGVk IHRvIGJ1aWxkIGxpc3Qgb2YgdGVzdHMhIjsKLSAgICAgICAgfSBlbHNpZiAoaXNBcHBsZU1hY1dl YktpdCgpICYmIGFyY2hpdGVjdHVyZSgpKSB7CisgICAgICAgIH0gZWxzaWYgKGlzQXBwbGVDb2Nv YVdlYktpdCgpICYmIGFyY2hpdGVjdHVyZSgpKSB7CiAgICAgICAgICAgICAkcGlkID0gb3BlbjMo JGNoaWxkSW4sICRjaGlsZE91dCwgJGNoaWxkRXJyLCAiYXJjaCIsICItIiAuIGFyY2hpdGVjdHVy ZSgpLCBhcmNoQ29tbWFuZExpbmVBcmd1bWVudHNGb3JSZXN0cmljdGVkRW52aXJvbm1lbnRWYXJp YWJsZXMoKSwgQGNvbW1vbkFyZ3VtZW50cykgb3IgZGllICJGYWlsZWQgdG8gYnVpbGQgbGlzdCBv ZiB0ZXN0cyEiOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgJHBpZCA9IG9wZW4zKCRj aGlsZEluLCAkY2hpbGRPdXQsICRjaGlsZEVyciwgQGNvbW1vbkFyZ3VtZW50cykgb3IgZGllICJG YWlsZWQgdG8gYnVpbGQgbGlzdCBvZiB0ZXN0cyEiOwpAQCAtMzcwLDcgKzM3MCw3IEBAIHN1YiBi dWlsZFRlc3RUb29sKCkKIAogc3ViIHByZXBhcmVFbnZpcm9ubWVudEZvclJ1bm5pbmdUZXN0VG9v bCgpCiB7Ci0gICAgcmV0dXJuIHVubGVzcyBpc0FwcGxlTWFjV2ViS2l0KCk7CisgICAgcmV0dXJu IHVubGVzcyBpc0FwcGxlQ29jb2FXZWJLaXQoKTsKIAogICAgIGlmICh3aWxsVXNlSU9TU2ltdWxh dG9yU0RLKCkpIHsKICAgICAgICAgbXkgJXNpbXVsYXRvckVOVjsKSW5kZXg6IFRvb2xzL1Njcmlw dHMvcnVuLWNvbnRlbnQtZXh0ZW5zaW9uLXRlc3Rlcgo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3Jp cHRzL3J1bi1jb250ZW50LWV4dGVuc2lvbi10ZXN0ZXIJKHJldmlzaW9uIDIxMTk4MCkKKysrIFRv b2xzL1NjcmlwdHMvcnVuLWNvbnRlbnQtZXh0ZW5zaW9uLXRlc3Rlcgkod29ya2luZyBjb3B5KQpA QCAtMzIsNyArMzIsNyBAQCBwcmludEhlbHBBbmRFeGl0Rm9yUnVuQW5kRGVidWdXZWJLaXRBcHBJ CiAKIHNldENvbmZpZ3VyYXRpb24oKTsKIAotaWYgKCFpc0FwcGxlTWFjV2ViS2l0KCkpIHsKK2lm ICghaXNBcHBsZUNvY29hV2ViS2l0KCkpIHsKICAgICBleGl0IDE7CiB9CiAKSW5kZXg6IFRvb2xz L1NjcmlwdHMvcnVuLWphdmFzY3JpcHRjb3JlLXRlc3RzCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Nj cmlwdHMvcnVuLWphdmFzY3JpcHRjb3JlLXRlc3RzCShyZXZpc2lvbiAyMTE5ODApCisrKyBUb29s cy9TY3JpcHRzL3J1bi1qYXZhc2NyaXB0Y29yZS10ZXN0cwkod29ya2luZyBjb3B5KQpAQCAtNTYs NyArNTYsNyBAQCBteSAkbWVtb3J5TGltaXRlZDsKIAogbXkgJGJ1aWxkSlNDID0gMTsKIAotbXkg JHJ1blRlc3RBUEkgPSBpc0FwcGxlTWFjV2ViS2l0KCkgfHwgaXNBcHBsZVdpbldlYktpdCgpIHx8 IGlzV2luQ2Fpcm8oKTsKK215ICRydW5UZXN0QVBJID0gaXNBcHBsZUNvY29hV2ViS2l0KCkgfHwg aXNBcHBsZVdpbldlYktpdCgpIHx8IGlzV2luQ2Fpcm8oKTsKIAogbXkgJHJ1bkpTQ1N0cmVzcyA9 IDE7CiBteSAkcnVuSklUU3RyZXNzVGVzdHMgPSAxOwpJbmRleDogVG9vbHMvU2NyaXB0cy9ydW4t bWluaWJyb3dzZXIKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9ydW4tbWluaWJyb3dzZXIJ KHJldmlzaW9uIDIxMTk4MCkKKysrIFRvb2xzL1NjcmlwdHMvcnVuLW1pbmlicm93c2VyCSh3b3Jr aW5nIGNvcHkpCkBAIC01Miw3ICs1Miw3IEBAIGlmIChpc0d0aygpIHx8IGlzRWZsKCkpIHsKICAg ICBAamhidWlsZFdyYXBwZXIgPSB3cmFwcGVyUHJlZml4SWZOZWVkZWQoKTsKICAgICBwcmludCAi U3RhcnRpbmcgTWluaUJyb3dzZXIuXG4iOwogICAgIGV4ZWMgQGpoYnVpbGRXcmFwcGVyLCAkbGF1 bmNoZXJQYXRoLCBAQVJHViBvciBkaWU7Ci19IGVsc2lmIChpc0FwcGxlTWFjV2ViS2l0KCkpIHsK K30gZWxzaWYgKGlzQXBwbGVDb2NvYVdlYktpdCgpKSB7CiAgICAgcHJpbnRIZWxwQW5kRXhpdEZv clJ1bkFuZERlYnVnV2ViS2l0QXBwSWZOZWVkZWQoKTsKICAgICBleGl0IGV4aXRTdGF0dXMocnVu TWluaUJyb3dzZXIoKSk7CiB9IGVsc2UgewpJbmRleDogVG9vbHMvU2NyaXB0cy9zaG93LXByZXR0 eS1kaWZmCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvc2hvdy1wcmV0dHktZGlmZgkocmV2 aXNpb24gMjExOTgwKQorKysgVG9vbHMvU2NyaXB0cy9zaG93LXByZXR0eS1kaWZmCSh3b3JraW5n IGNvcHkpCkBAIC02Niw3ICs2Niw3IEBAIG15ICRwcmV0dHlQYXRjaFRvb2wgPSBzb3VyY2VEaXIo KSAuICIvV2UKIG15ICRwYXRoVG9QcmV0dGlmeSA9ICJydWJ5IC1JICIgLiBzb3VyY2VEaXIoKSAu ICIvV2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL1ByZXR0eVBhdGNoLyAiIC4gc291cmNlRGlyKCkg LiAiL1dlYnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy9QcmV0dHlQYXRjaC9wcmV0dGlmeS5yYiI7CiBz eXN0ZW0gIiRwYXRoVG9QcmV0dGlmeSAiIC4gcXVvdGVtZXRhKCRpbnB1dFBhdGgpIC4gIiA+ICRw cmV0dHlkaWZmUGF0aCI7CiAKLWlmIChpc0FwcGxlTWFjV2ViS2l0KCkpIHsKK2lmIChpc0FwcGxl Q29jb2FXZWJLaXQoKSkgewogICAgIHN5c3RlbSAib3BlbiIsICRwcmV0dHlkaWZmUGF0aDsKIH0g ZWxzaWYgKGlzQ3lnd2luKCkpIHsKICAgICBzeXN0ZW0gImN5Z3N0YXJ0IiwkcHJldHR5ZGlmZlBh dGg7CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCShyZXZpc2lvbiAyMTE5ODApCisrKyBUb29scy9TY3Jp cHRzL3dlYmtpdGRpcnMucG0JKHdvcmtpbmcgY29weSkKQEAgLTIyNyw3ICsyMjcsNyBAQCBzdWIg ZGV0ZXJtaW5lQmFzZVByb2R1Y3REaXIKICAgICBteSAkc2V0U2hhcmVkUHJlY29tcHNEaXI7CiAg ICAgJGJhc2VQcm9kdWN0RGlyID0gJEVOVnsiV0VCS0lUX09VVFBVVERJUiJ9OwogCi0gICAgaWYg KCFkZWZpbmVkKCRiYXNlUHJvZHVjdERpcikgYW5kIGlzQXBwbGVNYWNXZWJLaXQoKSkgeworICAg IGlmICghZGVmaW5lZCgkYmFzZVByb2R1Y3REaXIpIGFuZCBpc0FwcGxlQ29jb2FXZWJLaXQoKSkg ewogICAgICAgICAjIFNpbGVudGx5IHJlbW92ZSB+L0xpYnJhcnkvUHJlZmVyZW5jZXMveGNvZGVi dWlsZC5wbGlzdCB3aGljaCBjYW4KICAgICAgICAgIyBjYXVzZSBidWlsZCBmYWlsdXJlLiBUaGUg cHJlc2VuY2Ugb2YKICAgICAgICAgIyB+L0xpYnJhcnkvUHJlZmVyZW5jZXMveGNvZGVidWlsZC5w bGlzdCBjYW4gcHJldmVudCB4Y29kZWJ1aWxkIGZyb20KQEAgLTI2Nyw3ICsyNjcsNyBAQCBzdWIg ZGV0ZXJtaW5lQmFzZVByb2R1Y3REaXIKICAgICAgICAgJGJhc2VQcm9kdWN0RGlyID0gIiRiYXNl UHJvZHVjdERpci8kYnJhbmNoIjsKICAgICB9CiAKLSAgICBpZiAoaXNBcHBsZU1hY1dlYktpdCgp KSB7CisgICAgaWYgKGlzQXBwbGVDb2NvYVdlYktpdCgpKSB7CiAgICAgICAgICRiYXNlUHJvZHVj dERpciA9fiBzfF5cUSQoU1JDUk9PVCkvLi5cRSR8JHNvdXJjZURpcnw7CiAgICAgICAgICRiYXNl UHJvZHVjdERpciA9fiBzfF5cUSQoU1JDUk9PVCkvLi4vfCRzb3VyY2VEaXIvfDsKICAgICAgICAg JGJhc2VQcm9kdWN0RGlyID1+IHN8Xn4vfCRFTlZ7SE9NRX0vfDsKQEAgLTMxOSw3ICszMTksNyBA QCBzdWIgZGV0ZXJtaW5lQXJjaGl0ZWN0dXJlCiAgICAgZGV0ZXJtaW5lQmFzZVByb2R1Y3REaXIo KTsKICAgICBkZXRlcm1pbmVYY29kZVNESygpOwogCi0gICAgaWYgKGlzQXBwbGVNYWNXZWJLaXQo KSkgeworICAgIGlmIChpc0FwcGxlQ29jb2FXZWJLaXQoKSkgewogICAgICAgICBpZiAob3BlbiBB UkNISVRFQ1RVUkUsICIkYmFzZVByb2R1Y3REaXIvQXJjaGl0ZWN0dXJlIikgewogICAgICAgICAg ICAgJGFyY2hpdGVjdHVyZSA9IDxBUkNISVRFQ1RVUkU+OwogICAgICAgICAgICAgY2xvc2UgQVJD SElURUNUVVJFOwpAQCAtNzk4LDcgKzc5OCw3IEBAIHN1YiBkZXRlcm1pbmVQYXNzZWRBcmNoaXRl Y3R1cmUKIAogICAgICRwYXNzZWRBcmNoaXRlY3R1cmUgPSB1bmRlZjsKICAgICBpZiAoY2hlY2tG b3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWKCItLTMyLWJpdCIpKSB7Ci0gICAgICAgIGlmIChp c0FwcGxlTWFjV2ViS2l0KCkpIHsKKyAgICAgICAgaWYgKGlzQXBwbGVDb2NvYVdlYktpdCgpKSB7 CiAgICAgICAgICAgICAjIFBMQVRGT1JNX0lPUzogRG9uJ3QgcnVuIGBhcmNoYCBjb21tYW5kIGlu c2lkZSBTaW11bGF0b3IgZW52aXJvbm1lbnQKICAgICAgICAgICAgIGxvY2FsICVFTlYgPSAlRU5W OwogICAgICAgICAgICAgZGVsZXRlICRFTlZ7RFlMRF9ST09UX1BBVEh9OwpAQCAtODQ4LDcgKzg0 OCw3IEBAIHN1YiBzZXRBcmNoaXRlY3R1cmUKICMgTG9jYXRlIFNhZmFyaS4KIHN1YiBzYWZhcmlQ YXRoCiB7Ci0gICAgZGllICJTYWZhcmkgcGF0aCBpcyBvbmx5IHJlbGV2YW50IG9uIEFwcGxlIE1h YyBwbGF0Zm9ybVxuIiB1bmxlc3MgaXNBcHBsZU1hY1dlYktpdCgpOworICAgIGRpZSAiU2FmYXJp IHBhdGggaXMgb25seSByZWxldmFudCBvbiBBcHBsZSBNYWMgcGxhdGZvcm1cbiIgdW5sZXNzIGlz QXBwbGVDb2NvYVdlYktpdCgpOwogCiAgICAgbXkgJHNhZmFyaVBhdGg7CiAKQEAgLTg4Nyw3ICs4 ODcsNyBAQCBzdWIgYnVpbHREeWxpYlBhdGhGb3JOYW1lCiAgICAgaWYgKGlzSU9TV2ViS2l0KCkp IHsKICAgICAgICAgcmV0dXJuICIkY29uZmlndXJhdGlvblByb2R1Y3REaXIvJGxpYnJhcnlOYW1l LmZyYW1ld29yay8kbGlicmFyeU5hbWUiOwogICAgIH0KLSAgICBpZiAoaXNBcHBsZU1hY1dlYktp dCgpKSB7CisgICAgaWYgKGlzQXBwbGVDb2NvYVdlYktpdCgpKSB7CiAgICAgICAgIHJldHVybiAi JGNvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyLyRsaWJyYXJ5TmFtZS5mcmFtZXdvcmsvVmVyc2lvbnMv QS8kbGlicmFyeU5hbWUiOwogICAgIH0KICAgICBpZiAoaXNBcHBsZVdpbldlYktpdCgpKSB7CkBA IC05MDYsNyArOTA2LDcgQEAgc3ViIGNoZWNrRnJhbWV3b3JrcyAjIEZJWE1FOiBUaGlzIGlzIGEg cAogewogICAgIHJldHVybiBpZiBpc0FueVdpbmRvd3MoKTsKICAgICBteSBAZnJhbWV3b3JrcyA9 ICgiSmF2YVNjcmlwdENvcmUiLCAiV2ViQ29yZSIpOwotICAgIHB1c2goQGZyYW1ld29ya3MsICJX ZWJLaXQiKSBpZiBpc0FwcGxlTWFjV2ViS2l0KCk7ICMgRklYTUU6IFRoaXMgc2VlbXMgd3Jvbmcs IGFsbCBwb3J0cyBzaG91bGQgaGF2ZSBhIFdlYktpdCB0aGVzZSBkYXlzLgorICAgIHB1c2goQGZy YW1ld29ya3MsICJXZWJLaXQiKSBpZiBpc0FwcGxlQ29jb2FXZWJLaXQoKTsgIyBGSVhNRTogVGhp cyBzZWVtcyB3cm9uZywgYWxsIHBvcnRzIHNob3VsZCBoYXZlIGEgV2ViS2l0IHRoZXNlIGRheXMu CiAgICAgZm9yIG15ICRmcmFtZXdvcmsgKEBmcmFtZXdvcmtzKSB7CiAgICAgICAgIG15ICRwYXRo ID0gYnVpbHREeWxpYlBhdGhGb3JOYW1lKCRmcmFtZXdvcmspOwogICAgICAgICBkaWUgIkNhbid0 IGZpbmQgYnVpbHQgZnJhbWV3b3JrIGF0IFwiJHBhdGhcIi5cbiIgdW5sZXNzIC1lICRwYXRoOwpA QCAtMTIwNiwxMCArMTIwNiwxMCBAQCBzdWIgaXNDcm9zc0NvbXBpbGF0aW9uKCkKIAogc3ViIGlz QXBwbGVXZWJLaXQoKQogewotICAgIHJldHVybiBpc0FwcGxlTWFjV2ViS2l0KCkgfHwgaXNBcHBs ZVdpbldlYktpdCgpOworICAgIHJldHVybiBpc0FwcGxlQ29jb2FXZWJLaXQoKSB8fCBpc0FwcGxl V2luV2ViS2l0KCk7CiB9CiAKLXN1YiBpc0FwcGxlTWFjV2ViS2l0KCkKK3N1YiBpc0FwcGxlQ29j b2FXZWJLaXQoKQogewogICAgIHJldHVybiAocG9ydE5hbWUoKSBlcSBNYWMpIHx8IGlzSU9TV2Vi S2l0KCk7CiB9CkBAIC0xMjg2LDcgKzEyODYsNyBAQCBzdWIgZGV0ZXJtaW5lTm1QYXRoKCkKIHsK ICAgICByZXR1cm4gaWYgJG5tUGF0aDsKIAotICAgIGlmIChpc0FwcGxlTWFjV2ViS2l0KCkpIHsK KyAgICBpZiAoaXNBcHBsZUNvY29hV2ViS2l0KCkpIHsKICAgICAgICAgJG5tUGF0aCA9IGB4Y3J1 biAtZmluZCBubWA7CiAgICAgICAgIGNob21wICRubVBhdGg7CiAgICAgfQpAQCAtMTQ0Myw3ICsx NDQzLDcgQEAgc3ViIGxhdW5jaGVyTmFtZSgpCiB7CiAgICAgaWYgKGlzR3RrKCkgfHwgaXNFZmwo KSkgewogICAgICAgICByZXR1cm4gIk1pbmlCcm93c2VyIjsKLSAgICB9IGVsc2lmIChpc0FwcGxl TWFjV2ViS2l0KCkpIHsKKyAgICB9IGVsc2lmIChpc0FwcGxlQ29jb2FXZWJLaXQoKSkgewogICAg ICAgICByZXR1cm4gIlNhZmFyaSI7CiAgICAgfSBlbHNpZiAoaXNBcHBsZVdpbldlYktpdCgpKSB7 CiAgICAgICAgIHJldHVybiAiTWluaUJyb3dzZXIiOwpAQCAtMTc4MSw3ICsxNzgxLDcgQEAgc3Vi IHdyYXBwZXJQcmVmaXhJZk5lZWRlZCgpCiAgICAgaWYgKGlzQW55V2luZG93cygpIHx8IGlzSlND T25seSgpKSB7CiAgICAgICAgIHJldHVybiAoKTsKICAgICB9Ci0gICAgaWYgKGlzQXBwbGVNYWNX ZWJLaXQoKSkgeworICAgIGlmIChpc0FwcGxlQ29jb2FXZWJLaXQoKSkgewogICAgICAgICByZXR1 cm4gKCJ4Y3J1biIpOwogICAgIH0KICAgICBpZiAoLWUgZ2V0SmhidWlsZFBhdGgoKSkgewpAQCAt MjA1NSw3ICsyMDU1LDcgQEAgc3ViIGRldGVybWluZUlzQ01ha2VCdWlsZCgpCiAKIHN1YiBpc0NN YWtlQnVpbGQoKQogewotICAgIHJldHVybiAxIHVubGVzcyBpc0FwcGxlTWFjV2ViS2l0KCk7Cisg ICAgcmV0dXJuIDEgdW5sZXNzIGlzQXBwbGVDb2NvYVdlYktpdCgpOwogICAgIGRldGVybWluZUlz Q01ha2VCdWlsZCgpOwogICAgIHJldHVybiAkaXNDTWFrZUJ1aWxkOwogfQpAQCAtMjE2Myw3ICsy MTYzLDcgQEAgc3ViIG1vYmlsZVNhZmFyaUJ1bmRsZSgpCiAgICAgZGV0ZXJtaW5lQ29uZmlndXJh dGlvblByb2R1Y3REaXIoKTsKIAogICAgICMgVXNlIE1vYmlsZVNhZmFyaS5hcHAgaW4gcHJvZHVj dCBkaXJlY3RvcnkgaWYgcHJlc2VudC4KLSAgICBpZiAoaXNBcHBsZU1hY1dlYktpdCgpICYmIC1k ICIkY29uZmlndXJhdGlvblByb2R1Y3REaXIvTW9iaWxlU2FmYXJpLmFwcCIpIHsKKyAgICBpZiAo aXNBcHBsZUNvY29hV2ViS2l0KCkgJiYgLWQgIiRjb25maWd1cmF0aW9uUHJvZHVjdERpci9Nb2Jp bGVTYWZhcmkuYXBwIikgewogICAgICAgICByZXR1cm4gIiRjb25maWd1cmF0aW9uUHJvZHVjdERp ci9Nb2JpbGVTYWZhcmkuYXBwIjsKICAgICB9CiAgICAgcmV0dXJuIGluc3RhbGxlZE1vYmlsZVNh ZmFyaUJ1bmRsZSgpOwpAQCAtMjQ2Nyw3ICsyNDY3LDcgQEAgc3ViIGV4ZWNNYWNXZWJLaXRBcHBG b3JEZWJ1Z2dpbmcoJCkKIAogc3ViIGRlYnVnU2FmYXJpCiB7Ci0gICAgaWYgKGlzQXBwbGVNYWNX ZWJLaXQoKSkgeworICAgIGlmIChpc0FwcGxlQ29jb2FXZWJLaXQoKSkgewogICAgICAgICBjaGVj a0ZyYW1ld29ya3MoKTsKICAgICAgICAgZXhlY01hY1dlYktpdEFwcEZvckRlYnVnZ2luZyhzYWZh cmlQYXRoKCkpOwogICAgIH0KQEAgLTI0ODEsNyArMjQ4MSw3IEBAIHN1YiBydW5TYWZhcmkKICAg ICAgICAgcmV0dXJuIHJ1bklPU1dlYktpdEFwcChtb2JpbGVTYWZhcmlCdW5kbGUoKSk7CiAgICAg fQogCi0gICAgaWYgKGlzQXBwbGVNYWNXZWJLaXQoKSkgeworICAgIGlmIChpc0FwcGxlQ29jb2FX ZWJLaXQoKSkgewogICAgICAgICByZXR1cm4gcnVuTWFjV2ViS2l0QXBwKHNhZmFyaVBhdGgoKSk7 CiAgICAgfQogCkBAIC0yNDk2LDcgKzI0OTYsNyBAQCBzdWIgcnVuU2FmYXJpCiAKIHN1YiBydW5N aW5pQnJvd3NlcgogewotICAgIGlmIChpc0FwcGxlTWFjV2ViS2l0KCkpIHsKKyAgICBpZiAoaXNB cHBsZUNvY29hV2ViS2l0KCkpIHsKICAgICAgICAgcmV0dXJuIHJ1bk1hY1dlYktpdEFwcChGaWxl OjpTcGVjLT5jYXRmaWxlKHByb2R1Y3REaXIoKSwgIk1pbmlCcm93c2VyLmFwcCIsICJDb250ZW50 cyIsICJNYWNPUyIsICJNaW5pQnJvd3NlciIpKTsKICAgICB9IGVsc2lmIChpc0FwcGxlV2luV2Vi S2l0KCkpIHsKICAgICAgICAgbXkgJHJlc3VsdDsKQEAgLTI1MDksNyArMjUwOSw3IEBAIHN1YiBy dW5NaW5pQnJvd3NlcgogCiBzdWIgZGVidWdNaW5pQnJvd3NlcgogewotICAgIGlmIChpc0FwcGxl TWFjV2ViS2l0KCkpIHsKKyAgICBpZiAoaXNBcHBsZUNvY29hV2ViS2l0KCkpIHsKICAgICAgICAg ZXhlY01hY1dlYktpdEFwcEZvckRlYnVnZ2luZyhGaWxlOjpTcGVjLT5jYXRmaWxlKHByb2R1Y3RE aXIoKSwgIk1pbmlCcm93c2VyLmFwcCIsICJDb250ZW50cyIsICJNYWNPUyIsICJNaW5pQnJvd3Nl ciIpKTsKICAgICB9CiAgICAgCkBAIC0yNTE4LDcgKzI1MTgsNyBAQCBzdWIgZGVidWdNaW5pQnJv d3NlcgogCiBzdWIgcnVuV2ViS2l0VGVzdFJ1bm5lcgogewotICAgIGlmIChpc0FwcGxlTWFjV2Vi S2l0KCkpIHsKKyAgICBpZiAoaXNBcHBsZUNvY29hV2ViS2l0KCkpIHsKICAgICAgICAgcmV0dXJu IHJ1bk1hY1dlYktpdEFwcChGaWxlOjpTcGVjLT5jYXRmaWxlKHByb2R1Y3REaXIoKSwgIldlYktp dFRlc3RSdW5uZXIiKSk7CiAgICAgfQogCkBAIC0yNTI3LDcgKzI1MjcsNyBAQCBzdWIgcnVuV2Vi S2l0VGVzdFJ1bm5lcgogCiBzdWIgZGVidWdXZWJLaXRUZXN0UnVubmVyCiB7Ci0gICAgaWYgKGlz QXBwbGVNYWNXZWJLaXQoKSkgeworICAgIGlmIChpc0FwcGxlQ29jb2FXZWJLaXQoKSkgewogICAg ICAgICBleGVjTWFjV2ViS2l0QXBwRm9yRGVidWdnaW5nKEZpbGU6OlNwZWMtPmNhdGZpbGUocHJv ZHVjdERpcigpLCAiV2ViS2l0VGVzdFJ1bm5lciIpKTsKICAgICB9CiAKSW5kZXg6IFRvb2xzL1Nj cmlwdHMvd2Via2l0cGVybC9GZWF0dXJlTGlzdC5wbQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3Jp cHRzL3dlYmtpdHBlcmwvRmVhdHVyZUxpc3QucG0JKHJldmlzaW9uIDIxMTk4MCkKKysrIFRvb2xz L1NjcmlwdHMvd2Via2l0cGVybC9GZWF0dXJlTGlzdC5wbQkod29ya2luZyBjb3B5KQpAQCAtMTQ3 LDcgKzE0Nyw3IEBAIHByb2hpYml0VW5rbm93blBvcnQoKTsKIAogbXkgQGZlYXR1cmVzID0gKAog ICAgIHsgb3B0aW9uID0+ICIzZC1yZW5kZXJpbmciLCBkZXNjID0+ICJUb2dnbGUgM0QgUmVuZGVy aW5nIHN1cHBvcnQiLAotICAgICAgZGVmaW5lID0+ICJFTkFCTEVfM0RfVFJBTlNGT1JNUyIsIGRl ZmF1bHQgPT4gKGlzQXBwbGVNYWNXZWJLaXQoKSB8fCBpc0lPU1dlYktpdCgpIHx8IGlzR3RrKCkg fHwgaXNFZmwoKSksIHZhbHVlID0+IFwkdGhyZWVEVHJhbnNmb3Jtc1N1cHBvcnQgfSwKKyAgICAg IGRlZmluZSA9PiAiRU5BQkxFXzNEX1RSQU5TRk9STVMiLCBkZWZhdWx0ID0+IChpc0FwcGxlQ29j b2FXZWJLaXQoKSB8fCBpc0lPU1dlYktpdCgpIHx8IGlzR3RrKCkgfHwgaXNFZmwoKSksIHZhbHVl ID0+IFwkdGhyZWVEVHJhbnNmb3Jtc1N1cHBvcnQgfSwKIAogICAgIHsgb3B0aW9uID0+ICJhY2Nl bGVyYXRlZC0yZC1jYW52YXMiLCBkZXNjID0+ICJUb2dnbGUgQWNjZWxlcmF0ZWQgMkQgQ2FudmFz IHN1cHBvcnQiLAogICAgICAgZGVmaW5lID0+ICJFTkFCTEVfQUNDRUxFUkFURURfMkRfQ0FOVkFT IiwgZGVmYXVsdCA9PiAwLCB2YWx1ZSA9PiBcJGFjY2VsZXJhdGVkMkRDYW52YXNTdXBwb3J0IH0s CkBAIC0yMzQsNyArMjM0LDcgQEAgbXkgQGZlYXR1cmVzID0gKAogICAgICAgZGVmaW5lID0+ICJF TkFCTEVfRlRQRElSIiwgZGVmYXVsdCA9PiAxLCB2YWx1ZSA9PiBcJGZ0cERpclN1cHBvcnQgfSwK IAogICAgIHsgb3B0aW9uID0+ICJmdWxsc2NyZWVuLWFwaSIsIGRlc2MgPT4gIlRvZ2dsZSBGdWxs c2NyZWVuIEFQSSBzdXBwb3J0IiwKLSAgICAgIGRlZmluZSA9PiAiRU5BQkxFX0ZVTExTQ1JFRU5f QVBJIiwgZGVmYXVsdCA9PiAoaXNBcHBsZU1hY1dlYktpdCgpIHx8IGlzRWZsKCkgfHwgaXNHdGso KSksIHZhbHVlID0+IFwkZnVsbHNjcmVlbkFQSVN1cHBvcnQgfSwKKyAgICAgIGRlZmluZSA9PiAi RU5BQkxFX0ZVTExTQ1JFRU5fQVBJIiwgZGVmYXVsdCA9PiAoaXNBcHBsZUNvY29hV2ViS2l0KCkg fHwgaXNFZmwoKSB8fCBpc0d0aygpKSwgdmFsdWUgPT4gXCRmdWxsc2NyZWVuQVBJU3VwcG9ydCB9 LAogCiAgICAgeyBvcHRpb24gPT4gImdhbWVwYWQiLCBkZXNjID0+ICJUb2dnbGUgR2FtZXBhZCBz dXBwb3J0IiwKICAgICAgIGRlZmluZSA9PiAiRU5BQkxFX0dBTUVQQUQiLCBkZWZhdWx0ID0+IDAs IHZhbHVlID0+IFwkZ2FtZXBhZFN1cHBvcnQgfSwKQEAgLTI0OSw3ICsyNDksNyBAQCBteSBAZmVh dHVyZXMgPSAoCiAgICAgICBkZWZpbmUgPT4gIkVOQUJMRV9JQ09OREFUQUJBU0UiLCBkZWZhdWx0 ID0+ICFpc0lPU1dlYktpdCgpLCB2YWx1ZSA9PiBcJGljb25kYXRhYmFzZVN1cHBvcnQgfSwKIAog ICAgIHsgb3B0aW9uID0+ICJpbmRleGVkLWRhdGFiYXNlIiwgZGVzYyA9PiAiVG9nZ2xlIEluZGV4 ZWQgRGF0YWJhc2Ugc3VwcG9ydCIsCi0gICAgICBkZWZpbmUgPT4gIkVOQUJMRV9JTkRFWEVEX0RB VEFCQVNFIiwgZGVmYXVsdCA9PiAoaXNBcHBsZU1hY1dlYktpdCgpIHx8IGlzRWZsKCkgfHwgaXNH dGsoKSksIHZhbHVlID0+IFwkaW5kZXhlZERhdGFiYXNlU3VwcG9ydCB9LAorICAgICAgZGVmaW5l ID0+ICJFTkFCTEVfSU5ERVhFRF9EQVRBQkFTRSIsIGRlZmF1bHQgPT4gKGlzQXBwbGVDb2NvYVdl YktpdCgpIHx8IGlzRWZsKCkgfHwgaXNHdGsoKSksIHZhbHVlID0+IFwkaW5kZXhlZERhdGFiYXNl U3VwcG9ydCB9LAogCiAgICAgeyBvcHRpb24gPT4gImlucHV0LXNwZWVjaCIsIGRlc2MgPT4gIlRv Z2dsZSBJbnB1dCBTcGVlY2ggc3VwcG9ydCIsCiAgICAgICBkZWZpbmUgPT4gIkVOQUJMRV9JTlBV VF9TUEVFQ0giLCBkZWZhdWx0ID0+IDAsIHZhbHVlID0+IFwkaW5wdXRTcGVlY2hTdXBwb3J0IH0s CkBAIC0zNjAsNyArMzYwLDcgQEAgbXkgQGZlYXR1cmVzID0gKAogICAgICAgZGVmaW5lID0+ICJF TkFCTEVfU0NSSVBURURfU1BFRUNIIiwgZGVmYXVsdCA9PiAwLCB2YWx1ZSA9PiBcJHNjcmlwdGVk U3BlZWNoU3VwcG9ydCB9LAogCiAgICAgeyBvcHRpb24gPT4gInN1YnRsZS1jcnlwdG8iLCBkZXNj ID0+ICJUb2dnbGUgV2ViQ3J5cHRvIFN1YnRsZS1DcnlwdG8gc3VwcG9ydCIsCi0gICAgICBkZWZp bmUgPT4gIkVOQUJMRV9TVUJUTEVfQ1JZUFRPIiwgZGVmYXVsdCA9PiAoaXNHdGsoKSB8fCBpc0Vm bCgpIHx8IGlzQXBwbGVNYWNXZWJLaXQoKSB8fCBpc0lPU1dlYktpdCgpKSwgdmFsdWUgPT4gXCRz dWJ0bGVDcnlwdG8gfSwKKyAgICAgIGRlZmluZSA9PiAiRU5BQkxFX1NVQlRMRV9DUllQVE8iLCBk ZWZhdWx0ID0+IChpc0d0aygpIHx8IGlzRWZsKCkgfHwgaXNBcHBsZUNvY29hV2ViS2l0KCkgfHwg aXNJT1NXZWJLaXQoKSksIHZhbHVlID0+IFwkc3VidGxlQ3J5cHRvIH0sCiAKICAgICB7IG9wdGlv biA9PiAic3ZnLWZvbnRzIiwgZGVzYyA9PiAiVG9nZ2xlIFNWRyBGb250cyBzdXBwb3J0IiwKICAg ICAgIGRlZmluZSA9PiAiRU5BQkxFX1NWR19GT05UUyIsIGRlZmF1bHQgPT4gMSwgdmFsdWUgPT4g XCRzdmdGb250c1N1cHBvcnQgfSwKQEAgLTM5NiwxMCArMzk2LDEwIEBAIG15IEBmZWF0dXJlcyA9 ICgKICAgICAgIGRlZmluZSA9PiAiRU5BQkxFX1dFQl9BVURJTyIsIGRlZmF1bHQgPT4gKGlzRWZs KCkgfHwgaXNHdGsoKSksIHZhbHVlID0+IFwkd2ViQXVkaW9TdXBwb3J0IH0sCiAKICAgICB7IG9w dGlvbiA9PiAid2ViLXJlcGxheSIsIGRlc2MgPT4gIlRvZ2dsZSBXZWIgUmVwbGF5IHN1cHBvcnQi LAotICAgICAgZGVmaW5lID0+ICJFTkFCTEVfV0VCX1JFUExBWSIsIGRlZmF1bHQgPT4gaXNBcHBs ZU1hY1dlYktpdCgpLCB2YWx1ZSA9PiBcJHdlYlJlcGxheVN1cHBvcnQgfSwKKyAgICAgIGRlZmlu ZSA9PiAiRU5BQkxFX1dFQl9SRVBMQVkiLCBkZWZhdWx0ID0+IGlzQXBwbGVDb2NvYVdlYktpdCgp LCB2YWx1ZSA9PiBcJHdlYlJlcGxheVN1cHBvcnQgfSwKIAogICAgIHsgb3B0aW9uID0+ICJ3ZWIt cnRjIiwgZGVzYyA9PiAiVG9nZ2xlIFdlYlJUQyBzdXBwb3J0IiwKLSAgICAgIGRlZmluZSA9PiAi RU5BQkxFX1dFQl9SVEMiLCBkZWZhdWx0ID0+IChpc0FwcGxlTWFjV2ViS2l0KCkgfHwgaXNJT1NX ZWJLaXQoKSB8fCBpc0d0aygpKSwgdmFsdWUgPT4gXCR3ZWJSVENTdXBwb3J0IH0sCisgICAgICBk ZWZpbmUgPT4gIkVOQUJMRV9XRUJfUlRDIiwgZGVmYXVsdCA9PiAoaXNBcHBsZUNvY29hV2ViS2l0 KCkgfHwgaXNJT1NXZWJLaXQoKSB8fCBpc0d0aygpKSwgdmFsdWUgPT4gXCR3ZWJSVENTdXBwb3J0 IH0sCiAKICAgICB7IG9wdGlvbiA9PiAid2ViLXNvY2tldHMiLCBkZXNjID0+ICJUb2dnbGUgV2Vi IFNvY2tldHMgc3VwcG9ydCIsCiAgICAgICBkZWZpbmUgPT4gIkVOQUJMRV9XRUJfU09DS0VUUyIs IGRlZmF1bHQgPT4gMSwgdmFsdWUgPT4gXCR3ZWJTb2NrZXRzU3VwcG9ydCB9LApAQCAtNDExLDcg KzQxMSw3IEBAIG15IEBmZWF0dXJlcyA9ICgKICAgICAgIGRlZmluZSA9PiAiRU5BQkxFX1dFQkFT U0VNQkxZIiwgZGVmYXVsdCA9PiAwLCB2YWx1ZSA9PiBcJHdlYkFzc2VtYmx5U3VwcG9ydCB9LAog CiAgICAgeyBvcHRpb24gPT4gIndlYmdsIiwgZGVzYyA9PiAiVG9nZ2xlIFdlYkdMIHN1cHBvcnQi LAotICAgICAgZGVmaW5lID0+ICJFTkFCTEVfV0VCR0wiLCBkZWZhdWx0ID0+IChpc0FwcGxlTWFj V2ViS2l0KCkgfHwgaXNJT1NXZWJLaXQoKSB8fCBpc0d0aygpIHx8IGlzRWZsKCkpLCB2YWx1ZSA9 PiBcJHdlYmdsU3VwcG9ydCB9LAorICAgICAgZGVmaW5lID0+ICJFTkFCTEVfV0VCR0wiLCBkZWZh dWx0ID0+IChpc0FwcGxlQ29jb2FXZWJLaXQoKSB8fCBpc0d0aygpIHx8IGlzRWZsKCkpLCB2YWx1 ZSA9PiBcJHdlYmdsU3VwcG9ydCB9LAogCiAgICAgeyBvcHRpb24gPT4gIndyaXRhYmxlU3RyZWFt QVBJIiwgZGVzYyA9PiAiVG9nZ2xlIFdyaXRhYmxlU3RyZWFtIEFQSSBzdXBwb3J0IiwKICAgICAg IGRlZmluZSA9PiAiRU5BQkxFX1dSSVRBQkxFX1NUUkVBTV9BUEkiLCBkZWZhdWx0ID0+IDEsIHZh bHVlID0+IFwkd3JpdGFibGVTdHJlYW1BUElTdXBwb3J0IH0sCg==