143951 2015-04-20 10:09:42 -0700 Web Inspector: Improve Support for WeakSet in Console 2015-04-20 13:27:07 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer ysuzuki oldest_to_newest 1086807 0 joepeck 2015-04-20 10:09:42 -0700 * SUMMARY Improve Support for WeakSet in Console WeakSet landed in r182994. We should make sure our support for WeakSet is similar to WeakMap, here we can show values in Web Inspector. 1086808 1 webkit-bug-importer 2015-04-20 10:10:32 -0700 <rdar://problem/20617342> 1086855 2 251175 joepeck 2015-04-20 11:48:56 -0700 Created attachment 251175 [PATCH] Proposed Fix 1086887 3 251175 commit-queue 2015-04-20 13:27:03 -0700 Comment on attachment 251175 [PATCH] Proposed Fix Clearing flags on attachment: 251175 Committed r183025: <http://trac.webkit.org/changeset/183025> 1086888 4 commit-queue 2015-04-20 13:27:07 -0700 All reviewed patches have been landed. Closing bug. 251175 2015-04-20 11:48:56 -0700 2015-04-20 13:27:03 -0700 [PATCH] Proposed Fix weakset.patch text/plain 31397 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAxZjlhN2M2Li5jOTg2MWY4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTUtMDQt MjAgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIg SW5zcGVjdG9yOiBJbXByb3ZlIFN1cHBvcnQgZm9yIFdlYWtTZXQgaW4gQ29uc29sZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQzOTUxCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvbW9k ZWwvcmVtb3RlLW9iamVjdC1leHBlY3RlZC50eHQ6CisgICAgICAgICogaW5zcGVjdG9yL21vZGVs L3JlbW90ZS1vYmplY3QuaHRtbDoKKyAgICAgICAgVXBkYXRlIHRoZSB0ZXN0IHRvIGluY2x1ZGUg YSBXZWFrU2V0IGV4YW1wbGUuCisgICAgICAgIEFsc28gcmViYXNlbGluZSBmb3IgaXRlcmF0b3Ig Y2hhbmdlcyB0aGF0IGxhbmRlZCByZWNlbnRseS4KKwogMjAxNS0wNC0yMCAgQnJhZHkgRWlkc29u ICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgQ3Jhc2ggaW4gU3R5bGVSZXNvbHZlcjo6 aW52YWxpZGF0ZU1hdGNoZWRQcm9wZXJ0aWVzQ2FjaGUoKSB3aGVuIHVzaW5nIGNvbnRlbnQgZXh0 ZW5zaW9ucy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9tb2RlbC9yZW1vdGUt b2JqZWN0LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9tb2RlbC9yZW1vdGUt b2JqZWN0LWV4cGVjdGVkLnR4dAppbmRleCBmYjRhNzQ5Li5mNzhiMDFhIDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9pbnNwZWN0b3IvbW9kZWwvcmVtb3RlLW9iamVjdC1leHBlY3RlZC50eHQKKysr IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL21vZGVsL3JlbW90ZS1vYmplY3QtZXhwZWN0ZWQudHh0 CkBAIC0zMTI4LDE2ICszMTI4LDUzIEBAIEVYUFJFU1NJT046IHNldCA9IG5ldyBTZXQ7IGZvciAo dmFyIGkgPSAwOyBpIDw9IDEwMDsgaSsrKSBzZXQuYWRkKGkpOyBzZXQKIH0KIAogLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KK0VYUFJFU1NJT046 IHNldCA9IG5ldyBXZWFrU2V0OyBzdHJvbmdLZXkgPSB7aWQ6MX07IHNldC5hZGQoc3Ryb25nS2V5 KTsgc2V0Cit7CisgICJfdHlwZSI6ICJvYmplY3QiLAorICAiX3N1YnR5cGUiOiAid2Vha3NldCIs CisgICJfb2JqZWN0SWQiOiAiPGZpbHRlcmVkPiIsCisgICJfZGVzY3JpcHRpb24iOiAiV2Vha1Nl dCIsCisgICJfc2l6ZSI6IDEsCisgICJfcHJldmlldyI6IHsKKyAgICAiX3R5cGUiOiAib2JqZWN0 IiwKKyAgICAiX3N1YnR5cGUiOiAid2Vha3NldCIsCisgICAgIl9kZXNjcmlwdGlvbiI6ICJXZWFr U2V0IiwKKyAgICAiX2xvc3NsZXNzIjogdHJ1ZSwKKyAgICAiX292ZXJmbG93IjogZmFsc2UsCisg ICAgIl9zaXplIjogMSwKKyAgICAiX3Byb3BlcnRpZXMiOiBbXSwKKyAgICAiX2VudHJpZXMiOiBb CisgICAgICB7CisgICAgICAgICJfdmFsdWUiOiB7CisgICAgICAgICAgIl90eXBlIjogIm9iamVj dCIsCisgICAgICAgICAgIl9kZXNjcmlwdGlvbiI6ICJPYmplY3QiLAorICAgICAgICAgICJfbG9z c2xlc3MiOiB0cnVlLAorICAgICAgICAgICJfb3ZlcmZsb3ciOiBmYWxzZSwKKyAgICAgICAgICAi X3Byb3BlcnRpZXMiOiBbCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICJfbmFtZSI6ICJp ZCIsCisgICAgICAgICAgICAgICJfdHlwZSI6ICJudW1iZXIiLAorICAgICAgICAgICAgICAiX3Zh bHVlIjogIjEiCisgICAgICAgICAgICB9CisgICAgICAgICAgXSwKKyAgICAgICAgICAiX2VudHJp ZXMiOiBudWxsCisgICAgICAgIH0KKyAgICAgIH0KKyAgICBdCisgIH0KK30KKworLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIEVYUFJFU1NJT046 ICdhJ1tTeW1ib2wuaXRlcmF0b3JdKCkKIHsKICAgIl90eXBlIjogIm9iamVjdCIsCiAgICJfc3Vi dHlwZSI6ICJpdGVyYXRvciIsCiAgICJfb2JqZWN0SWQiOiAiPGZpbHRlcmVkPiIsCi0gICJfZGVz Y3JpcHRpb24iOiAiU3RyaW5nSXRlcmF0b3IiLAorICAiX2Rlc2NyaXB0aW9uIjogIlN0cmluZyBJ dGVyYXRvciIsCiAgICJfcHJldmlldyI6IHsKICAgICAiX3R5cGUiOiAib2JqZWN0IiwKICAgICAi X3N1YnR5cGUiOiAiaXRlcmF0b3IiLAotICAgICJfZGVzY3JpcHRpb24iOiAiU3RyaW5nSXRlcmF0 b3IiLAorICAgICJfZGVzY3JpcHRpb24iOiAiU3RyaW5nIEl0ZXJhdG9yIiwKICAgICAiX2xvc3Ns ZXNzIjogdHJ1ZSwKICAgICAiX292ZXJmbG93IjogZmFsc2UsCiAgICAgIl9wcm9wZXJ0aWVzIjog WwpAQCAtMzE2OSwxMSArMzIwNiwxMSBAQCBFWFBSRVNTSU9OOiAnbG9uZyBzdHJpbmcnW1N5bWJv bC5pdGVyYXRvcl0oKQogICAiX3R5cGUiOiAib2JqZWN0IiwKICAgIl9zdWJ0eXBlIjogIml0ZXJh dG9yIiwKICAgIl9vYmplY3RJZCI6ICI8ZmlsdGVyZWQ+IiwKLSAgIl9kZXNjcmlwdGlvbiI6ICJT dHJpbmdJdGVyYXRvciIsCisgICJfZGVzY3JpcHRpb24iOiAiU3RyaW5nIEl0ZXJhdG9yIiwKICAg Il9wcmV2aWV3IjogewogICAgICJfdHlwZSI6ICJvYmplY3QiLAogICAgICJfc3VidHlwZSI6ICJp dGVyYXRvciIsCi0gICAgIl9kZXNjcmlwdGlvbiI6ICJTdHJpbmdJdGVyYXRvciIsCisgICAgIl9k ZXNjcmlwdGlvbiI6ICJTdHJpbmcgSXRlcmF0b3IiLAogICAgICJfbG9zc2xlc3MiOiBmYWxzZSwK ICAgICAiX292ZXJmbG93IjogdHJ1ZSwKICAgICAiX3Byb3BlcnRpZXMiOiBbCkBAIC0zMjQ1LDEx ICszMjgyLDExIEBAIEVYUFJFU1NJT046IFtdW1N5bWJvbC5pdGVyYXRvcl0oKQogICAiX3R5cGUi OiAib2JqZWN0IiwKICAgIl9zdWJ0eXBlIjogIml0ZXJhdG9yIiwKICAgIl9vYmplY3RJZCI6ICI8 ZmlsdGVyZWQ+IiwKLSAgIl9kZXNjcmlwdGlvbiI6ICJBcnJheUl0ZXJhdG9yIiwKKyAgIl9kZXNj cmlwdGlvbiI6ICJBcnJheSBJdGVyYXRvciIsCiAgICJfcHJldmlldyI6IHsKICAgICAiX3R5cGUi OiAib2JqZWN0IiwKICAgICAiX3N1YnR5cGUiOiAiaXRlcmF0b3IiLAotICAgICJfZGVzY3JpcHRp b24iOiAiQXJyYXlJdGVyYXRvciIsCisgICAgIl9kZXNjcmlwdGlvbiI6ICJBcnJheSBJdGVyYXRv ciIsCiAgICAgIl9sb3NzbGVzcyI6IHRydWUsCiAgICAgIl9vdmVyZmxvdyI6IGZhbHNlLAogICAg ICJfcHJvcGVydGllcyI6IFsKQEAgLTMyODYsMTEgKzMzMjMsMTEgQEAgRVhQUkVTU0lPTjogWzFd W1N5bWJvbC5pdGVyYXRvcl0oKQogICAiX3R5cGUiOiAib2JqZWN0IiwKICAgIl9zdWJ0eXBlIjog Iml0ZXJhdG9yIiwKICAgIl9vYmplY3RJZCI6ICI8ZmlsdGVyZWQ+IiwKLSAgIl9kZXNjcmlwdGlv biI6ICJBcnJheUl0ZXJhdG9yIiwKKyAgIl9kZXNjcmlwdGlvbiI6ICJBcnJheSBJdGVyYXRvciIs CiAgICJfcHJldmlldyI6IHsKICAgICAiX3R5cGUiOiAib2JqZWN0IiwKICAgICAiX3N1YnR5cGUi OiAiaXRlcmF0b3IiLAotICAgICJfZGVzY3JpcHRpb24iOiAiQXJyYXlJdGVyYXRvciIsCisgICAg Il9kZXNjcmlwdGlvbiI6ICJBcnJheSBJdGVyYXRvciIsCiAgICAgIl9sb3NzbGVzcyI6IHRydWUs CiAgICAgIl9vdmVyZmxvdyI6IGZhbHNlLAogICAgICJfcHJvcGVydGllcyI6IFsKQEAgLTMzNDQs MTEgKzMzODEsMTEgQEAgRVhQUkVTU0lPTjogWzEsICd0d28nLCAzLCAnZm91cicsIDUsICdzaXpl J11bU3ltYm9sLml0ZXJhdG9yXSgpCiAgICJfdHlwZSI6ICJvYmplY3QiLAogICAiX3N1YnR5cGUi OiAiaXRlcmF0b3IiLAogICAiX29iamVjdElkIjogIjxmaWx0ZXJlZD4iLAotICAiX2Rlc2NyaXB0 aW9uIjogIkFycmF5SXRlcmF0b3IiLAorICAiX2Rlc2NyaXB0aW9uIjogIkFycmF5IEl0ZXJhdG9y IiwKICAgIl9wcmV2aWV3IjogewogICAgICJfdHlwZSI6ICJvYmplY3QiLAogICAgICJfc3VidHlw ZSI6ICJpdGVyYXRvciIsCi0gICAgIl9kZXNjcmlwdGlvbiI6ICJBcnJheUl0ZXJhdG9yIiwKKyAg ICAiX2Rlc2NyaXB0aW9uIjogIkFycmF5IEl0ZXJhdG9yIiwKICAgICAiX2xvc3NsZXNzIjogZmFs c2UsCiAgICAgIl9vdmVyZmxvdyI6IHRydWUsCiAgICAgIl9wcm9wZXJ0aWVzIjogWwpAQCAtMzQy NywxMSArMzQ2NCwxMSBAQCBFWFBSRVNTSU9OOiBbMSwgJ3R3bycsIDMsICdmb3VyJywgNSwgJ3Np emUnXS5rZXlzKCkKICAgIl90eXBlIjogIm9iamVjdCIsCiAgICJfc3VidHlwZSI6ICJpdGVyYXRv ciIsCiAgICJfb2JqZWN0SWQiOiAiPGZpbHRlcmVkPiIsCi0gICJfZGVzY3JpcHRpb24iOiAiQXJy YXlJdGVyYXRvciIsCisgICJfZGVzY3JpcHRpb24iOiAiQXJyYXkgSXRlcmF0b3IiLAogICAiX3By ZXZpZXciOiB7CiAgICAgIl90eXBlIjogIm9iamVjdCIsCiAgICAgIl9zdWJ0eXBlIjogIml0ZXJh dG9yIiwKLSAgICAiX2Rlc2NyaXB0aW9uIjogIkFycmF5SXRlcmF0b3IiLAorICAgICJfZGVzY3Jp cHRpb24iOiAiQXJyYXkgSXRlcmF0b3IiLAogICAgICJfbG9zc2xlc3MiOiBmYWxzZSwKICAgICAi X292ZXJmbG93IjogdHJ1ZSwKICAgICAiX3Byb3BlcnRpZXMiOiBbCkBAIC0zNTEwLDExICszNTQ3 LDExIEBAIEVYUFJFU1NJT046IFsxLCAndHdvJywgMywgJ2ZvdXInLCA1LCAnc2l6ZSddLmVudHJp ZXMoKQogICAiX3R5cGUiOiAib2JqZWN0IiwKICAgIl9zdWJ0eXBlIjogIml0ZXJhdG9yIiwKICAg Il9vYmplY3RJZCI6ICI8ZmlsdGVyZWQ+IiwKLSAgIl9kZXNjcmlwdGlvbiI6ICJBcnJheUl0ZXJh dG9yIiwKKyAgIl9kZXNjcmlwdGlvbiI6ICJBcnJheSBJdGVyYXRvciIsCiAgICJfcHJldmlldyI6 IHsKICAgICAiX3R5cGUiOiAib2JqZWN0IiwKICAgICAiX3N1YnR5cGUiOiAiaXRlcmF0b3IiLAot ICAgICJfZGVzY3JpcHRpb24iOiAiQXJyYXlJdGVyYXRvciIsCisgICAgIl9kZXNjcmlwdGlvbiI6 ICJBcnJheSBJdGVyYXRvciIsCiAgICAgIl9sb3NzbGVzcyI6IGZhbHNlLAogICAgICJfb3ZlcmZs b3ciOiB0cnVlLAogICAgICJfcHJvcGVydGllcyI6IFsKQEAgLTQwMDUsMTYgKzQwNDIsMTYgQEAg RVhQUkVTU0lPTjogeCA9IHVuZGVmaW5lZDsgKGZ1bmN0aW9uKCkgeyB4ID0gYXJndW1lbnRzOyB9 KSgxLCAndHdvJyk7IHhbU3ltYm9sLmkKICAgIl90eXBlIjogIm9iamVjdCIsCiAgICJfc3VidHlw ZSI6ICJpdGVyYXRvciIsCiAgICJfb2JqZWN0SWQiOiAiPGZpbHRlcmVkPiIsCi0gICJfZGVzY3Jp cHRpb24iOiAiQXJndW1lbnRzSXRlcmF0b3IiLAorICAiX2Rlc2NyaXB0aW9uIjogIkFycmF5IEl0 ZXJhdG9yIiwKICAgIl9wcmV2aWV3IjogewogICAgICJfdHlwZSI6ICJvYmplY3QiLAogICAgICJf c3VidHlwZSI6ICJpdGVyYXRvciIsCi0gICAgIl9kZXNjcmlwdGlvbiI6ICJBcmd1bWVudHNJdGVy YXRvciIsCisgICAgIl9kZXNjcmlwdGlvbiI6ICJBcnJheSBJdGVyYXRvciIsCiAgICAgIl9sb3Nz bGVzcyI6IHRydWUsCiAgICAgIl9vdmVyZmxvdyI6IGZhbHNlLAogICAgICJfcHJvcGVydGllcyI6 IFsKICAgICAgIHsKLSAgICAgICAgIl9uYW1lIjogImFyZ3VtZW50cyIsCisgICAgICAgICJfbmFt ZSI6ICJhcnJheSIsCiAgICAgICAgICJfdHlwZSI6ICJvYmplY3QiLAogICAgICAgICAiX3N1YnR5 cGUiOiAiYXJyYXkiLAogICAgICAgICAiX3ZhbHVlUHJldmlldyI6IHsKQEAgLTQwMzksNiArNDA3 NiwxMiBAQCBFWFBSRVNTSU9OOiB4ID0gdW5kZWZpbmVkOyAoZnVuY3Rpb24oKSB7IHggPSBhcmd1 bWVudHM7IH0pKDEsICd0d28nKTsgeFtTeW1ib2wuaQogICAgICAgICAgICJfZW50cmllcyI6IG51 bGwKICAgICAgICAgfSwKICAgICAgICAgIl9pbnRlcm5hbCI6IHRydWUKKyAgICAgIH0sCisgICAg ICB7CisgICAgICAgICJfbmFtZSI6ICJraW5kIiwKKyAgICAgICAgIl90eXBlIjogInN0cmluZyIs CisgICAgICAgICJfdmFsdWUiOiAidmFsdWUiLAorICAgICAgICAiX2ludGVybmFsIjogdHJ1ZQog ICAgICAgfQogICAgIF0sCiAgICAgIl9lbnRyaWVzIjogWwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL21vZGVsL3JlbW90ZS1vYmplY3QuaHRtbCBiL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9tb2RlbC9yZW1vdGUtb2JqZWN0Lmh0bWwKaW5kZXggMzg0YzVhZS4uMjUzMGVhNiAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL21vZGVsL3JlbW90ZS1vYmplY3QuaHRtbAor KysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvbW9kZWwvcmVtb3RlLW9iamVjdC5odG1sCkBAIC0x MjksMTEgKzEyOSwxMiBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAge2V4cHJlc3Npb246ICJt YXAgPSBuZXcgTWFwOyBmb3IgKHZhciBpID0gMDsgaSA8PSAxMDA7IGkrKykgbWFwLnNldChpLCBp KTsgbWFwIn0sCiAgICAgICAgIHtleHByZXNzaW9uOiAibWFwID0gbmV3IFdlYWtNYXA7IHN0cm9u Z0tleSA9IHtpZDoxfTsgbWFwLnNldChzdHJvbmdLZXksIFsxLDJdKTsgbWFwIn0sCiAKLSAgICAg ICAgLy8gU2V0CisgICAgICAgIC8vIFNldCAvIFdlYWtTZXQKICAgICAgICAge2V4cHJlc3Npb246 ICJuZXcgU2V0In0sCiAgICAgICAgIHtleHByZXNzaW9uOiAic2V0ID0gbmV3IFNldDsgc2V0LmFk ZCgxKTsgc2V0LmFkZCgyKTsgc2V0LmFkZCgna2V5Jyk7IHNldCJ9LAogICAgICAgICB7ZXhwcmVz c2lvbjogInNldCA9IG5ldyBTZXQ7IHNldC5hZGQoe2E6MX0pOyBzZXQuYWRkKGRvY3VtZW50LmJv ZHkpOyBzZXQuYWRkKFsxLDJdKTsgc2V0In0sCiAgICAgICAgIHtleHByZXNzaW9uOiAic2V0ID0g bmV3IFNldDsgZm9yICh2YXIgaSA9IDA7IGkgPD0gMTAwOyBpKyspIHNldC5hZGQoaSk7IHNldCJ9 LAorICAgICAgICB7ZXhwcmVzc2lvbjogInNldCA9IG5ldyBXZWFrU2V0OyBzdHJvbmdLZXkgPSB7 aWQ6MX07IHNldC5hZGQoc3Ryb25nS2V5KTsgc2V0In0sCiAKICAgICAgICAgLy8gSXRlcmF0b3Jz CiAgICAgICAgIHtleHByZXNzaW9uOiAiJ2EnW1N5bWJvbC5pdGVyYXRvcl0oKSJ9LApkaWZmIC0t Z2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cKaW5kZXggNzI4NTMzOC4uMmZlNTg4MiAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTUtMDQtMjAgIEpvc2VwaCBQZWNvcmFybyAgPHBl Y29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBJbXByb3ZlIFN1cHBv cnQgZm9yIFdlYWtTZXQgaW4gQ29uc29sZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTQzOTUxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRTb3VyY2UuanM6Cisg ICAgICAgICogaW5zcGVjdG9yL0pTSW5qZWN0ZWRTY3JpcHRIb3N0LmNwcDoKKyAgICAgICAgKElu c3BlY3Rvcjo6SlNJbmplY3RlZFNjcmlwdEhvc3Q6OnN1YnR5cGUpOgorICAgICAgICAoSW5zcGVj dG9yOjpKU0luamVjdGVkU2NyaXB0SG9zdDo6d2Vha1NldFNpemUpOgorICAgICAgICAoSW5zcGVj dG9yOjpKU0luamVjdGVkU2NyaXB0SG9zdDo6d2Vha1NldEVudHJpZXMpOgorICAgICAgICAqIGlu c3BlY3Rvci9KU0luamVjdGVkU2NyaXB0SG9zdC5oOgorICAgICAgICAqIGluc3BlY3Rvci9KU0lu amVjdGVkU2NyaXB0SG9zdFByb3RvdHlwZS5jcHA6CisgICAgICAgIChJbnNwZWN0b3I6OkpTSW5q ZWN0ZWRTY3JpcHRIb3N0UHJvdG90eXBlOjpmaW5pc2hDcmVhdGlvbik6CisgICAgICAgIChJbnNw ZWN0b3I6OmpzSW5qZWN0ZWRTY3JpcHRIb3N0UHJvdG90eXBlRnVuY3Rpb25XZWFrU2V0U2l6ZSk6 CisgICAgICAgIChJbnNwZWN0b3I6OmpzSW5qZWN0ZWRTY3JpcHRIb3N0UHJvdG90eXBlRnVuY3Rp b25XZWFrU2V0RW50cmllcyk6CisgICAgICAgIFRyZWF0IFdlYWtTZXRzIGxpa2Ugc3BlY2lhbCBz ZXRzLgorCisgICAgICAgICogaW5zcGVjdG9yL3Byb3RvY29sL1J1bnRpbWUuanNvbjoKKyAgICAg ICAgQWRkIGEgbmV3IG9iamVjdCBzdWJ0eXBlLCAid2Vha3NldCIuCisKIDIwMTUtMDQtMjAgIEpv cmRhbiBIYXJiYW5kICA8bGpoYXJiQGdtYWlsLmNvbT4KIAogICAgICAgICBJbXBsZW1lbnQgYE9i amVjdC5pc2AKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSW5q ZWN0ZWRTY3JpcHRTb3VyY2UuanMgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0lu amVjdGVkU2NyaXB0U291cmNlLmpzCmluZGV4IGQyYzBjNzUuLjFkYjVmNTUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRTb3VyY2UuanMK KysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdFNvdXJj ZS5qcwpAQCAtODUzLDYgKzg1MywxMSBAQCBJbmplY3RlZFNjcmlwdC5wcm90b3R5cGUgPSB7CiAg ICAgICAgIHJldHVybiBJbmplY3RlZFNjcmlwdEhvc3Qud2Vha01hcEVudHJpZXMob2JqZWN0LCBu dW1iZXJUb0ZldGNoKTsKICAgICB9LAogCisgICAgX2dldFdlYWtTZXRFbnRyaWVzOiBmdW5jdGlv bihvYmplY3QsIG51bWJlclRvRmV0Y2gpCisgICAgeworICAgICAgICByZXR1cm4gSW5qZWN0ZWRT Y3JpcHRIb3N0LndlYWtTZXRFbnRyaWVzKG9iamVjdCwgbnVtYmVyVG9GZXRjaCk7CisgICAgfSwK KwogICAgIF9nZXRJdGVyYXRvckVudHJpZXM6IGZ1bmN0aW9uKG9iamVjdCwgbnVtYmVyVG9GZXRj aCkKICAgICB7CiAgICAgICAgIHJldHVybiBJbmplY3RlZFNjcmlwdEhvc3QuaXRlcmF0b3JFbnRy aWVzKG9iamVjdCwgbnVtYmVyVG9GZXRjaCk7CkBAIC04NjYsNiArODcxLDggQEAgSW5qZWN0ZWRT Y3JpcHQucHJvdG90eXBlID0gewogICAgICAgICAgICAgcmV0dXJuIHRoaXMuX2dldE1hcEVudHJp ZXMob2JqZWN0LCBzdGFydEluZGV4LCBudW1iZXJUb0ZldGNoKTsKICAgICAgICAgaWYgKHN1YnR5 cGUgPT09ICJ3ZWFrbWFwIikKICAgICAgICAgICAgIHJldHVybiB0aGlzLl9nZXRXZWFrTWFwRW50 cmllcyhvYmplY3QsIG51bWJlclRvRmV0Y2gpOworICAgICAgICBpZiAoc3VidHlwZSA9PT0gIndl YWtzZXQiKQorICAgICAgICAgICAgcmV0dXJuIHRoaXMuX2dldFdlYWtTZXRFbnRyaWVzKG9iamVj dCwgbnVtYmVyVG9GZXRjaCk7CiAgICAgICAgIGlmIChzdWJ0eXBlID09PSAiaXRlcmF0b3IiKQog ICAgICAgICAgICAgcmV0dXJuIHRoaXMuX2dldEl0ZXJhdG9yRW50cmllcyhvYmplY3QsIG51bWJl clRvRmV0Y2gpOwogCkBAIC05MzksNiArOTQ2LDggQEAgSW5qZWN0ZWRTY3JpcHQuUmVtb3RlT2Jq ZWN0ID0gZnVuY3Rpb24ob2JqZWN0LCBvYmplY3RHcm91cE5hbWUsIGZvcmNlVmFsdWVUeXBlLAog ICAgICAgICB0aGlzLnNpemUgPSBvYmplY3Quc2l6ZTsKICAgICBlbHNlIGlmIChzdWJ0eXBlID09 PSAid2Vha21hcCIpCiAgICAgICAgIHRoaXMuc2l6ZSA9IEluamVjdGVkU2NyaXB0SG9zdC53ZWFr TWFwU2l6ZShvYmplY3QpOworICAgIGVsc2UgaWYgKHN1YnR5cGUgPT09ICJ3ZWFrc2V0IikKKyAg ICAgICAgdGhpcy5zaXplID0gSW5qZWN0ZWRTY3JpcHRIb3N0LndlYWtTZXRTaXplKG9iamVjdCk7 CiAgICAgZWxzZSBpZiAoc3VidHlwZSA9PT0gImNsYXNzIikKICAgICAgICAgdGhpcy5jbGFzc1By b3RvdHlwZSA9IGluamVjdGVkU2NyaXB0Ll93cmFwT2JqZWN0KG9iamVjdC5wcm90b3R5cGUsIG9i amVjdEdyb3VwTmFtZSk7CiAKQEAgLTk5OCw3ICsxMDA3LDcgQEAgSW5qZWN0ZWRTY3JpcHQuUmVt b3RlT2JqZWN0LnByb3RvdHlwZSA9IHsKIAogICAgICAgICB0cnkgewogICAgICAgICAgICAgLy8g TWFwcywgU2V0cywgYW5kIEl0ZXJhdG9ycyBoYXZlIGVudHJpZXMuCi0gICAgICAgICAgICBpZiAo dGhpcy5zdWJ0eXBlID09PSAibWFwIiB8fCB0aGlzLnN1YnR5cGUgPT09ICJzZXQiIHx8IHRoaXMu c3VidHlwZSA9PT0gIndlYWttYXAiIHx8IHRoaXMuc3VidHlwZSA9PT0gIml0ZXJhdG9yIikKKyAg ICAgICAgICAgIGlmICh0aGlzLnN1YnR5cGUgPT09ICJtYXAiIHx8IHRoaXMuc3VidHlwZSA9PT0g InNldCIgfHwgdGhpcy5zdWJ0eXBlID09PSAid2Vha21hcCIgfHwgdGhpcy5zdWJ0eXBlID09PSAi d2Vha3NldCIgfHwgdGhpcy5zdWJ0eXBlID09PSAiaXRlcmF0b3IiKQogICAgICAgICAgICAgICAg IHRoaXMuX2FwcGVuZEVudHJ5UHJldmlld3Mob2JqZWN0LCBwcmV2aWV3KTsKIAogICAgICAgICAg ICAgcHJldmlldy5wcm9wZXJ0aWVzID0gW107CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvaW5zcGVjdG9yL0pTSW5qZWN0ZWRTY3JpcHRIb3N0LmNwcCBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9pbnNwZWN0b3IvSlNJbmplY3RlZFNjcmlwdEhvc3QuY3BwCmluZGV4IGJmYTIwM2Eu LjBjOGI2Y2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSlNJ bmplY3RlZFNjcmlwdEhvc3QuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0 b3IvSlNJbmplY3RlZFNjcmlwdEhvc3QuY3BwCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHly aWdodCAoQykgMjAxMyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmln aHQgKEMpIDIwMTMsIDIwMTUgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAq IFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGgg b3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQg dGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC00Myw2ICs0Myw3IEBACiAjaW5jbHVkZSAiSlNT dHJpbmdJdGVyYXRvci5oIgogI2luY2x1ZGUgIkpTVHlwZWRBcnJheXMuaCIKICNpbmNsdWRlICJK U1dlYWtNYXAuaCIKKyNpbmNsdWRlICJKU1dlYWtTZXQuaCIKICNpbmNsdWRlICJPYmplY3RDb25z dHJ1Y3Rvci5oIgogI2luY2x1ZGUgIlJlZ0V4cE9iamVjdC5oIgogI2luY2x1ZGUgIlNvdXJjZUNv ZGUuaCIKQEAgLTE1OCw2ICsxNTksOCBAQCBKU1ZhbHVlIEpTSW5qZWN0ZWRTY3JpcHRIb3N0Ojpz dWJ0eXBlKEV4ZWNTdGF0ZSogZXhlYykKICAgICAgICAgcmV0dXJuIGpzTm9udHJpdmlhbFN0cmlu ZyhleGVjLCBBU0NJSUxpdGVyYWwoInNldCIpKTsKICAgICBpZiAodmFsdWUuaW5oZXJpdHMoSlNX ZWFrTWFwOjppbmZvKCkpKQogICAgICAgICByZXR1cm4ganNOb250cml2aWFsU3RyaW5nKGV4ZWMs IEFTQ0lJTGl0ZXJhbCgid2Vha21hcCIpKTsKKyAgICBpZiAodmFsdWUuaW5oZXJpdHMoSlNXZWFr U2V0OjppbmZvKCkpKQorICAgICAgICByZXR1cm4ganNOb250cml2aWFsU3RyaW5nKGV4ZWMsIEFT Q0lJTGl0ZXJhbCgid2Vha3NldCIpKTsKIAogICAgIGlmICh2YWx1ZS5pbmhlcml0cyhKU0FycmF5 SXRlcmF0b3I6OmluZm8oKSkKICAgICAgICAgfHwgdmFsdWUuaW5oZXJpdHMoSlNNYXBJdGVyYXRv cjo6aW5mbygpKQpAQCAtMzgyLDYgKzM4NSw0OSBAQCBKU1ZhbHVlIEpTSW5qZWN0ZWRTY3JpcHRI b3N0Ojp3ZWFrTWFwRW50cmllcyhFeGVjU3RhdGUqIGV4ZWMpCiAgICAgcmV0dXJuIGFycmF5Owog fQogCitKU1ZhbHVlIEpTSW5qZWN0ZWRTY3JpcHRIb3N0Ojp3ZWFrU2V0U2l6ZShFeGVjU3RhdGUq IGV4ZWMpCit7CisgICAgaWYgKGV4ZWMtPmFyZ3VtZW50Q291bnQoKSA8IDEpCisgICAgICAgIHJl dHVybiBqc1VuZGVmaW5lZCgpOworCisgICAgSlNWYWx1ZSB2YWx1ZSA9IGV4ZWMtPnVuY2hlY2tl ZEFyZ3VtZW50KDApOworICAgIEpTV2Vha1NldCogd2Vha1NldCA9IGpzRHluYW1pY0Nhc3Q8SlNX ZWFrU2V0Kj4odmFsdWUpOworICAgIGlmICghd2Vha1NldCkKKyAgICAgICAgcmV0dXJuIGpzVW5k ZWZpbmVkKCk7CisKKyAgICByZXR1cm4ganNOdW1iZXIod2Vha1NldC0+d2Vha01hcERhdGEoKS0+ c2l6ZSgpKTsKK30KKworSlNWYWx1ZSBKU0luamVjdGVkU2NyaXB0SG9zdDo6d2Vha1NldEVudHJp ZXMoRXhlY1N0YXRlKiBleGVjKQoreworICAgIGlmIChleGVjLT5hcmd1bWVudENvdW50KCkgPCAx KQorICAgICAgICByZXR1cm4ganNVbmRlZmluZWQoKTsKKworICAgIEpTVmFsdWUgdmFsdWUgPSBl eGVjLT51bmNoZWNrZWRBcmd1bWVudCgwKTsKKyAgICBKU1dlYWtTZXQqIHdlYWtTZXQgPSBqc0R5 bmFtaWNDYXN0PEpTV2Vha1NldCo+KHZhbHVlKTsKKyAgICBpZiAoIXdlYWtTZXQpCisgICAgICAg IHJldHVybiBqc1VuZGVmaW5lZCgpOworCisgICAgdW5zaWduZWQgZmV0Y2hlZCA9IDA7CisgICAg dW5zaWduZWQgbnVtYmVyVG9GZXRjaCA9IDEwMDsKKworICAgIEpTVmFsdWUgbnVtYmVyVG9GZXRj aEFyZyA9IGV4ZWMtPmFyZ3VtZW50KDEpOworICAgIGRvdWJsZSBmZXRjaERvdWJsZSA9IG51bWJl clRvRmV0Y2hBcmcudG9JbnRlZ2VyKGV4ZWMpOworICAgIGlmIChmZXRjaERvdWJsZSA+PSAwKQor ICAgICAgICBudW1iZXJUb0ZldGNoID0gc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KGZldGNoRG91Ymxl KTsKKworICAgIEpTQXJyYXkqIGFycmF5ID0gY29uc3RydWN0RW1wdHlBcnJheShleGVjLCBudWxs cHRyKTsKKyAgICBmb3IgKGF1dG8gaXQgPSB3ZWFrU2V0LT53ZWFrTWFwRGF0YSgpLT5iZWdpbigp OyBpdCAhPSB3ZWFrU2V0LT53ZWFrTWFwRGF0YSgpLT5lbmQoKTsgKytpdCkgeworICAgICAgICBK U09iamVjdCogZW50cnkgPSBjb25zdHJ1Y3RFbXB0eU9iamVjdChleGVjKTsKKyAgICAgICAgZW50 cnktPnB1dERpcmVjdChleGVjLT52bSgpLCBJZGVudGlmaWVyOjpmcm9tU3RyaW5nKGV4ZWMsICJ2 YWx1ZSIpLCBpdC0+a2V5KTsKKyAgICAgICAgYXJyYXktPnB1dERpcmVjdEluZGV4KGV4ZWMsIGZl dGNoZWQrKywgZW50cnkpOworICAgICAgICBpZiAobnVtYmVyVG9GZXRjaCAmJiBmZXRjaGVkID49 IG51bWJlclRvRmV0Y2gpCisgICAgICAgICAgICBicmVhazsKKyAgICB9CisKKyAgICByZXR1cm4g YXJyYXk7Cit9CisKIEpTVmFsdWUgSlNJbmplY3RlZFNjcmlwdEhvc3Q6Oml0ZXJhdG9yRW50cmll cyhFeGVjU3RhdGUqIGV4ZWMpCiB7CiAgICAgaWYgKGV4ZWMtPmFyZ3VtZW50Q291bnQoKSA8IDEp CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0pTSW5qZWN0ZWRT Y3JpcHRIb3N0LmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0pTSW5qZWN0ZWRT Y3JpcHRIb3N0LmgKaW5kZXggMjU4NGFkNi4uODY4OTE1MSAxMDA2NDQKLS0tIGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL2luc3BlY3Rvci9KU0luamVjdGVkU2NyaXB0SG9zdC5oCisrKyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSlNJbmplY3RlZFNjcmlwdEhvc3QuaApAQCAtMjgs NiArMjgsMTAgQEAKIAogI2luY2x1ZGUgIkpTRGVzdHJ1Y3RpYmxlT2JqZWN0LmgiCiAKK25hbWVz cGFjZSBKU0MgeworY2xhc3MgV2Vha01hcERhdGE7Cit9CisKIG5hbWVzcGFjZSBJbnNwZWN0b3Ig ewogCiBjbGFzcyBJbmplY3RlZFNjcmlwdEhvc3Q7CkBAIC02OCw2ICs3Miw4IEBAIHB1YmxpYzoK ICAgICBKU0M6OkpTVmFsdWUgZ2V0SW50ZXJuYWxQcm9wZXJ0aWVzKEpTQzo6RXhlY1N0YXRlKik7 CiAgICAgSlNDOjpKU1ZhbHVlIHdlYWtNYXBTaXplKEpTQzo6RXhlY1N0YXRlKik7CiAgICAgSlND OjpKU1ZhbHVlIHdlYWtNYXBFbnRyaWVzKEpTQzo6RXhlY1N0YXRlKik7CisgICAgSlNDOjpKU1Zh bHVlIHdlYWtTZXRTaXplKEpTQzo6RXhlY1N0YXRlKik7CisgICAgSlNDOjpKU1ZhbHVlIHdlYWtT ZXRFbnRyaWVzKEpTQzo6RXhlY1N0YXRlKik7CiAgICAgSlNDOjpKU1ZhbHVlIGl0ZXJhdG9yRW50 cmllcyhKU0M6OkV4ZWNTdGF0ZSopOwogCiBwcm90ZWN0ZWQ6CmRpZmYgLS1naXQgYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0pTSW5qZWN0ZWRTY3JpcHRIb3N0UHJvdG90eXBlLmNw cCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSlNJbmplY3RlZFNjcmlwdEhvc3RQ cm90b3R5cGUuY3BwCmluZGV4IGIxY2UwYTEuLmI4NmEyZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSlNJbmplY3RlZFNjcmlwdEhvc3RQcm90b3R5cGUuY3Bw CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSlNJbmplY3RlZFNjcmlwdEhv c3RQcm90b3R5cGUuY3BwCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAx MyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTMs IDIwMTUgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0 aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAog ICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2lu ZyBjb25kaXRpb25zCkBAIC00NSw2ICs0NSw4IEBAIHN0YXRpYyBFbmNvZGVkSlNWYWx1ZSBKU0Nf SE9TVF9DQUxMIGpzSW5qZWN0ZWRTY3JpcHRIb3N0UHJvdG90eXBlRnVuY3Rpb25JbnRlcm5hCiBz dGF0aWMgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBqc0luamVjdGVkU2NyaXB0SG9zdFBy b3RvdHlwZUZ1bmN0aW9uSXNIVE1MQWxsQ29sbGVjdGlvbihFeGVjU3RhdGUqKTsKIHN0YXRpYyBF bmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGpzSW5qZWN0ZWRTY3JpcHRIb3N0UHJvdG90eXBl RnVuY3Rpb25XZWFrTWFwU2l6ZShFeGVjU3RhdGUqKTsKIHN0YXRpYyBFbmNvZGVkSlNWYWx1ZSBK U0NfSE9TVF9DQUxMIGpzSW5qZWN0ZWRTY3JpcHRIb3N0UHJvdG90eXBlRnVuY3Rpb25XZWFrTWFw RW50cmllcyhFeGVjU3RhdGUqKTsKK3N0YXRpYyBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxM IGpzSW5qZWN0ZWRTY3JpcHRIb3N0UHJvdG90eXBlRnVuY3Rpb25XZWFrU2V0U2l6ZShFeGVjU3Rh dGUqKTsKK3N0YXRpYyBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGpzSW5qZWN0ZWRTY3Jp cHRIb3N0UHJvdG90eXBlRnVuY3Rpb25XZWFrU2V0RW50cmllcyhFeGVjU3RhdGUqKTsKIHN0YXRp YyBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGpzSW5qZWN0ZWRTY3JpcHRIb3N0UHJvdG90 eXBlRnVuY3Rpb25JdGVyYXRvckVudHJpZXMoRXhlY1N0YXRlKik7CiAKIHN0YXRpYyBFbmNvZGVk SlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGpzSW5qZWN0ZWRTY3JpcHRIb3N0UHJvdG90eXBlQXR0cmli dXRlRXZhbHVhdGUoRXhlY1N0YXRlKik7CkBAIC02NCw2ICs2Niw4IEBAIHZvaWQgSlNJbmplY3Rl ZFNjcmlwdEhvc3RQcm90b3R5cGU6OmZpbmlzaENyZWF0aW9uKFZNJiB2bSwgSlNHbG9iYWxPYmpl Y3QqIGdsb2JhCiAgICAgSlNDX05BVElWRV9GVU5DVElPTigiaXNIVE1MQWxsQ29sbGVjdGlvbiIs IGpzSW5qZWN0ZWRTY3JpcHRIb3N0UHJvdG90eXBlRnVuY3Rpb25Jc0hUTUxBbGxDb2xsZWN0aW9u LCBEb250RW51bSwgMSk7CiAgICAgSlNDX05BVElWRV9GVU5DVElPTigid2Vha01hcFNpemUiLCBq c0luamVjdGVkU2NyaXB0SG9zdFByb3RvdHlwZUZ1bmN0aW9uV2Vha01hcFNpemUsIERvbnRFbnVt LCAxKTsKICAgICBKU0NfTkFUSVZFX0ZVTkNUSU9OKCJ3ZWFrTWFwRW50cmllcyIsIGpzSW5qZWN0 ZWRTY3JpcHRIb3N0UHJvdG90eXBlRnVuY3Rpb25XZWFrTWFwRW50cmllcywgRG9udEVudW0sIDEp OworICAgIEpTQ19OQVRJVkVfRlVOQ1RJT04oIndlYWtTZXRTaXplIiwganNJbmplY3RlZFNjcmlw dEhvc3RQcm90b3R5cGVGdW5jdGlvbldlYWtTZXRTaXplLCBEb250RW51bSwgMSk7CisgICAgSlND X05BVElWRV9GVU5DVElPTigid2Vha1NldEVudHJpZXMiLCBqc0luamVjdGVkU2NyaXB0SG9zdFBy b3RvdHlwZUZ1bmN0aW9uV2Vha1NldEVudHJpZXMsIERvbnRFbnVtLCAxKTsKICAgICBKU0NfTkFU SVZFX0ZVTkNUSU9OKCJpdGVyYXRvckVudHJpZXMiLCBqc0luamVjdGVkU2NyaXB0SG9zdFByb3Rv dHlwZUZ1bmN0aW9uSXRlcmF0b3JFbnRyaWVzLCBEb250RW51bSwgMSk7CiAKICAgICBJZGVudGlm aWVyIGV2YWx1YXRlSWRlbnRpZmllciA9IElkZW50aWZpZXI6OmZyb21TdHJpbmcoJnZtLCAiZXZh bHVhdGUiKTsKQEAgLTEyOCw2ICsxMzIsMjggQEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FM TCBqc0luamVjdGVkU2NyaXB0SG9zdFByb3RvdHlwZUZ1bmN0aW9uV2Vha01hcEVudHJpZXMKICAg ICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGNhc3RlZFRoaXMtPndlYWtNYXBFbnRyaWVzKGV4ZWMp KTsKIH0KIAorRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBqc0luamVjdGVkU2NyaXB0SG9z dFByb3RvdHlwZUZ1bmN0aW9uV2Vha1NldFNpemUoRXhlY1N0YXRlKiBleGVjKQoreworICAgIEpT VmFsdWUgdGhpc1ZhbHVlID0gZXhlYy0+dGhpc1ZhbHVlKCk7CisgICAgSlNJbmplY3RlZFNjcmlw dEhvc3QqIGNhc3RlZFRoaXMgPSBqc0R5bmFtaWNDYXN0PEpTSW5qZWN0ZWRTY3JpcHRIb3N0Kj4o dGhpc1ZhbHVlKTsKKyAgICBpZiAoIWNhc3RlZFRoaXMpCisgICAgICAgIHJldHVybiB0aHJvd1ZN VHlwZUVycm9yKGV4ZWMpOworCisgICAgQVNTRVJUX0dDX09CSkVDVF9JTkhFUklUUyhjYXN0ZWRU aGlzLCBKU0luamVjdGVkU2NyaXB0SG9zdDo6aW5mbygpKTsKKyAgICByZXR1cm4gSlNWYWx1ZTo6 ZW5jb2RlKGNhc3RlZFRoaXMtPndlYWtTZXRTaXplKGV4ZWMpKTsKK30KKworRW5jb2RlZEpTVmFs dWUgSlNDX0hPU1RfQ0FMTCBqc0luamVjdGVkU2NyaXB0SG9zdFByb3RvdHlwZUZ1bmN0aW9uV2Vh a1NldEVudHJpZXMoRXhlY1N0YXRlKiBleGVjKQoreworICAgIEpTVmFsdWUgdGhpc1ZhbHVlID0g ZXhlYy0+dGhpc1ZhbHVlKCk7CisgICAgSlNJbmplY3RlZFNjcmlwdEhvc3QqIGNhc3RlZFRoaXMg PSBqc0R5bmFtaWNDYXN0PEpTSW5qZWN0ZWRTY3JpcHRIb3N0Kj4odGhpc1ZhbHVlKTsKKyAgICBp ZiAoIWNhc3RlZFRoaXMpCisgICAgICAgIHJldHVybiB0aHJvd1ZNVHlwZUVycm9yKGV4ZWMpOwor CisgICAgQVNTRVJUX0dDX09CSkVDVF9JTkhFUklUUyhjYXN0ZWRUaGlzLCBKU0luamVjdGVkU2Ny aXB0SG9zdDo6aW5mbygpKTsKKyAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGNhc3RlZFRoaXMt PndlYWtTZXRFbnRyaWVzKGV4ZWMpKTsKK30KKwogRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FM TCBqc0luamVjdGVkU2NyaXB0SG9zdFByb3RvdHlwZUZ1bmN0aW9uSXRlcmF0b3JFbnRyaWVzKEV4 ZWNTdGF0ZSogZXhlYykKIHsKICAgICBKU1ZhbHVlIHRoaXNWYWx1ZSA9IGV4ZWMtPnRoaXNWYWx1 ZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9wcm90b2Nv bC9SdW50aW1lLmpzb24gYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Byb3RvY29s L1J1bnRpbWUuanNvbgppbmRleCA3M2I2NTI4Li5jMzIxZjZhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Byb3RvY29sL1J1bnRpbWUuanNvbgorKysgYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Byb3RvY29sL1J1bnRpbWUuanNvbgpAQCAtMTMs MTIgKzEzLDEyIEBACiAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiTWlycm9yIG9iamVjdCBy ZWZlcmVuY2luZyBvcmlnaW5hbCBKYXZhU2NyaXB0IG9iamVjdC4iLAogICAgICAgICAgICAgInBy b3BlcnRpZXMiOiBbCiAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ0eXBlIiwgInR5cGUiOiAi c3RyaW5nIiwgImVudW0iOiBbIm9iamVjdCIsICJmdW5jdGlvbiIsICJ1bmRlZmluZWQiLCAic3Ry aW5nIiwgIm51bWJlciIsICJib29sZWFuIiwgInN5bWJvbCJdLCAiZGVzY3JpcHRpb24iOiAiT2Jq ZWN0IHR5cGUuIiB9LAotICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic3VidHlwZSIsICJ0eXBl IjogInN0cmluZyIsICJvcHRpb25hbCI6IHRydWUsICJlbnVtIjogWyJhcnJheSIsICJudWxsIiwg Im5vZGUiLCAicmVnZXhwIiwgImRhdGUiLCAiZXJyb3IiLCAibWFwIiwgInNldCIsICJ3ZWFrbWFw IiwgIml0ZXJhdG9yIiwgImNsYXNzIl0sICJkZXNjcmlwdGlvbiI6ICJPYmplY3Qgc3VidHlwZSBo aW50LiBTcGVjaWZpZWQgZm9yIDxjb2RlPm9iamVjdDwvY29kZT4gPGNvZGU+ZnVuY3Rpb248L2Nv ZGU+IChmb3IgY2xhc3MpIHR5cGUgdmFsdWVzIG9ubHkuIiB9LAorICAgICAgICAgICAgICAgIHsg Im5hbWUiOiAic3VidHlwZSIsICJ0eXBlIjogInN0cmluZyIsICJvcHRpb25hbCI6IHRydWUsICJl bnVtIjogWyJhcnJheSIsICJudWxsIiwgIm5vZGUiLCAicmVnZXhwIiwgImRhdGUiLCAiZXJyb3Ii LCAibWFwIiwgInNldCIsICJ3ZWFrbWFwIiwgIndlYWtzZXQiLCAiaXRlcmF0b3IiLCAiY2xhc3Mi XSwgImRlc2NyaXB0aW9uIjogIk9iamVjdCBzdWJ0eXBlIGhpbnQuIFNwZWNpZmllZCBmb3IgPGNv ZGU+b2JqZWN0PC9jb2RlPiA8Y29kZT5mdW5jdGlvbjwvY29kZT4gKGZvciBjbGFzcykgdHlwZSB2 YWx1ZXMgb25seS4iIH0sCiAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJjbGFzc05hbWUiLCAi dHlwZSI6ICJzdHJpbmciLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiT2JqZWN0 IGNsYXNzIChjb25zdHJ1Y3RvcikgbmFtZS4gU3BlY2lmaWVkIGZvciA8Y29kZT5vYmplY3Q8L2Nv ZGU+IHR5cGUgdmFsdWVzIG9ubHkuIiB9LAogICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidmFs dWUiLCAidHlwZSI6ICJhbnkiLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiUmVt b3RlIG9iamVjdCB2YWx1ZSAoaW4gY2FzZSBvZiBwcmltaXRpdmUgdmFsdWVzIG9yIEpTT04gdmFs dWVzIGlmIGl0IHdhcyByZXF1ZXN0ZWQpLiIgfSwKICAgICAgICAgICAgICAgICB7ICJuYW1lIjog ImRlc2NyaXB0aW9uIiwgInR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2Ny aXB0aW9uIjogIlN0cmluZyByZXByZXNlbnRhdGlvbiBvZiB0aGUgb2JqZWN0LiIgfSwKICAgICAg ICAgICAgICAgICB7ICJuYW1lIjogIm9iamVjdElkIiwgIiRyZWYiOiAiUmVtb3RlT2JqZWN0SWQi LCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiVW5pcXVlIG9iamVjdCBpZGVudGlm aWVyIChmb3Igbm9uLXByaW1pdGl2ZSB2YWx1ZXMpLiIgfSwKLSAgICAgICAgICAgICAgICB7ICJu YW1lIjogInNpemUiLCAidHlwZSI6ICJpbnRlZ2VyIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2Ny aXB0aW9uIjogIlNpemUgb2YgdGhlIGFycmF5L2NvbGxlY3Rpb24uIFNwZWNpZmllZCBmb3IgYXJy YXkvbWFwL3NldC93ZWFrbWFwIG9iamVjdCB0eXBlIHZhbHVlcyBvbmx5LiIgfSwKKyAgICAgICAg ICAgICAgICB7ICJuYW1lIjogInNpemUiLCAidHlwZSI6ICJpbnRlZ2VyIiwgIm9wdGlvbmFsIjog dHJ1ZSwgImRlc2NyaXB0aW9uIjogIlNpemUgb2YgdGhlIGFycmF5L2NvbGxlY3Rpb24uIFNwZWNp ZmllZCBmb3IgYXJyYXkvbWFwL3NldC93ZWFrbWFwL3dlYWtzZXQgb2JqZWN0IHR5cGUgdmFsdWVz IG9ubHkuIiB9LAogICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiY2xhc3NQcm90b3R5cGUiLCAi JHJlZiI6ICJSZW1vdGVPYmplY3QiLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAi UmVtb3RlIG9iamVjdCBmb3IgdGhlIGNsYXNzIHByb3RvdHlwZS4gU3BlY2lmaWVkIGZvciBjbGFz cyBvYmplY3QgdHlwZSB2YWx1ZXMgb25seS4iIH0sCiAgICAgICAgICAgICAgICAgeyAibmFtZSI6 ICJwcmV2aWV3IiwgIiRyZWYiOiAiT2JqZWN0UHJldmlldyIsICJvcHRpb25hbCI6IHRydWUsICJk ZXNjcmlwdGlvbiI6ICJQcmV2aWV3IGNvbnRhaW5pbmcgYWJicmV2aWF0ZWQgcHJvcGVydHkgdmFs dWVzLiBTcGVjaWZpZWQgZm9yIDxjb2RlPm9iamVjdDwvY29kZT4gdHlwZSB2YWx1ZXMgb25seS4i IH0KICAgICAgICAgICAgIF0KQEAgLTI5LDEzICsyOSwxMyBAQAogICAgICAgICAgICAgImRlc2Ny aXB0aW9uIjogIk9iamVjdCBjb250YWluaW5nIGFiYnJldmlhdGVkIHJlbW90ZSBvYmplY3QgdmFs dWUuIiwKICAgICAgICAgICAgICJwcm9wZXJ0aWVzIjogWwogICAgICAgICAgICAgICAgIHsgIm5h bWUiOiAidHlwZSIsICJ0eXBlIjogInN0cmluZyIsICJlbnVtIjogWyJvYmplY3QiLCAiZnVuY3Rp b24iLCAidW5kZWZpbmVkIiwgInN0cmluZyIsICJudW1iZXIiLCAiYm9vbGVhbiIsICJzeW1ib2wi XSwgImRlc2NyaXB0aW9uIjogIk9iamVjdCB0eXBlLiIgfSwKLSAgICAgICAgICAgICAgICB7ICJu YW1lIjogInN1YnR5cGUiLCAidHlwZSI6ICJzdHJpbmciLCAib3B0aW9uYWwiOiB0cnVlLCAiZW51 bSI6IFsiYXJyYXkiLCAibnVsbCIsICJub2RlIiwgInJlZ2V4cCIsICJkYXRlIiwgImVycm9yIiwg Im1hcCIsICJzZXQiLCAid2Vha21hcCIsICJpdGVyYXRvciIsICJjbGFzcyJdLCAiZGVzY3JpcHRp b24iOiAiT2JqZWN0IHN1YnR5cGUgaGludC4gU3BlY2lmaWVkIGZvciA8Y29kZT5vYmplY3Q8L2Nv ZGU+IHR5cGUgdmFsdWVzIG9ubHkuIiB9LAorICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic3Vi dHlwZSIsICJ0eXBlIjogInN0cmluZyIsICJvcHRpb25hbCI6IHRydWUsICJlbnVtIjogWyJhcnJh eSIsICJudWxsIiwgIm5vZGUiLCAicmVnZXhwIiwgImRhdGUiLCAiZXJyb3IiLCAibWFwIiwgInNl dCIsICJ3ZWFrbWFwIiwgIndlYWtzZXQiLCAiaXRlcmF0b3IiLCAiY2xhc3MiXSwgImRlc2NyaXB0 aW9uIjogIk9iamVjdCBzdWJ0eXBlIGhpbnQuIFNwZWNpZmllZCBmb3IgPGNvZGU+b2JqZWN0PC9j b2RlPiB0eXBlIHZhbHVlcyBvbmx5LiIgfSwKICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImRl c2NyaXB0aW9uIiwgInR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0 aW9uIjogIlN0cmluZyByZXByZXNlbnRhdGlvbiBvZiB0aGUgb2JqZWN0LiIgfSwKICAgICAgICAg ICAgICAgICB7ICJuYW1lIjogImxvc3NsZXNzIiwgInR5cGUiOiAiYm9vbGVhbiIsICJkZXNjcmlw dGlvbiI6ICJEZXRlcm1pbmVzIHdoZXRoZXIgcHJldmlldyBpcyBsb3NzbGVzcyAoY29udGFpbnMg YWxsIGluZm9ybWF0aW9uIG9mIHRoZSBvcmlnaW5hbCBvYmplY3QpLiIgfSwKICAgICAgICAgICAg ICAgICB7ICJuYW1lIjogIm92ZXJmbG93IiwgInR5cGUiOiAiYm9vbGVhbiIsICJvcHRpb25hbCI6 IHRydWUsICJkZXNjcmlwdGlvbiI6ICJUcnVlIGlmZiBzb21lIG9mIHRoZSBwcm9wZXJ0aWVzIG9m IHRoZSBvcmlnaW5hbCBkaWQgbm90IGZpdC4iIH0sCiAgICAgICAgICAgICAgICAgeyAibmFtZSI6 ICJwcm9wZXJ0aWVzIiwgInR5cGUiOiAiYXJyYXkiLCAiaXRlbXMiOiB7ICIkcmVmIjogIlByb3Bl cnR5UHJldmlldyIgfSwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIkxpc3Qgb2Yg dGhlIHByb3BlcnRpZXMuIiB9LAogICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiZW50cmllcyIs ICJ0eXBlIjogImFycmF5IiwgIml0ZW1zIjogeyAiJHJlZiI6ICJFbnRyeVByZXZpZXciIH0sICJv cHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJMaXN0IG9mIHRoZSBlbnRyaWVzLiBTcGVj aWZpZWQgZm9yIDxjb2RlPm1hcDwvY29kZT4gYW5kIDxjb2RlPnNldDwvY29kZT4gc3VidHlwZSB2 YWx1ZXMgb25seS4iIH0sCi0gICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzaXplIiwgInR5cGUi OiAiaW50ZWdlciIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJTaXplIG9mIHRo ZSBhcnJheS9jb2xsZWN0aW9uLiBTcGVjaWZpZWQgZm9yIGFycmF5L21hcC9zZXQvd2Vha21hcCBv YmplY3QgdHlwZSB2YWx1ZXMgb25seS4iIH0KKyAgICAgICAgICAgICAgICB7ICJuYW1lIjogInNp emUiLCAidHlwZSI6ICJpbnRlZ2VyIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjog IlNpemUgb2YgdGhlIGFycmF5L2NvbGxlY3Rpb24uIFNwZWNpZmllZCBmb3IgYXJyYXkvbWFwL3Nl dC93ZWFrbWFwL3dlYWtzZXQgb2JqZWN0IHR5cGUgdmFsdWVzIG9ubHkuIiB9CiAgICAgICAgICAg ICBdCiAgICAgICAgIH0sCiAgICAgICAgIHsKQEAgLTQ0LDcgKzQ0LDcgQEAKICAgICAgICAgICAg ICJwcm9wZXJ0aWVzIjogWwogICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibmFtZSIsICJ0eXBl IjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJQcm9wZXJ0eSBuYW1lLiIgfSwKICAgICAgICAg ICAgICAgICB7ICJuYW1lIjogInR5cGUiLCAidHlwZSI6ICJzdHJpbmciLCAiZW51bSI6IFsib2Jq ZWN0IiwgImZ1bmN0aW9uIiwgInVuZGVmaW5lZCIsICJzdHJpbmciLCAibnVtYmVyIiwgImJvb2xl YW4iLCAic3ltYm9sIiwgImFjY2Vzc29yIl0sICJkZXNjcmlwdGlvbiI6ICJPYmplY3QgdHlwZS4i IH0sCi0gICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzdWJ0eXBlIiwgInR5cGUiOiAic3RyaW5n IiwgIm9wdGlvbmFsIjogdHJ1ZSwgImVudW0iOiBbImFycmF5IiwgIm51bGwiLCAibm9kZSIsICJy ZWdleHAiLCAiZGF0ZSIsICJlcnJvciIsICJtYXAiLCAic2V0IiwgIndlYWttYXAiLCAiaXRlcmF0 b3IiLCAiY2xhc3MiXSwgImRlc2NyaXB0aW9uIjogIk9iamVjdCBzdWJ0eXBlIGhpbnQuIFNwZWNp ZmllZCBmb3IgPGNvZGU+b2JqZWN0PC9jb2RlPiB0eXBlIHZhbHVlcyBvbmx5LiIgfSwKKyAgICAg ICAgICAgICAgICB7ICJuYW1lIjogInN1YnR5cGUiLCAidHlwZSI6ICJzdHJpbmciLCAib3B0aW9u YWwiOiB0cnVlLCAiZW51bSI6IFsiYXJyYXkiLCAibnVsbCIsICJub2RlIiwgInJlZ2V4cCIsICJk YXRlIiwgImVycm9yIiwgIm1hcCIsICJzZXQiLCAid2Vha21hcCIsICJ3ZWFrc2V0IiwgIml0ZXJh dG9yIiwgImNsYXNzIl0sICJkZXNjcmlwdGlvbiI6ICJPYmplY3Qgc3VidHlwZSBoaW50LiBTcGVj aWZpZWQgZm9yIDxjb2RlPm9iamVjdDwvY29kZT4gdHlwZSB2YWx1ZXMgb25seS4iIH0sCiAgICAg ICAgICAgICAgICAgeyAibmFtZSI6ICJ2YWx1ZSIsICJ0eXBlIjogInN0cmluZyIsICJvcHRpb25h bCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJVc2VyLWZyaWVuZGx5IHByb3BlcnR5IHZhbHVlIHN0 cmluZy4iIH0sCiAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ2YWx1ZVByZXZpZXciLCAiJHJl ZiI6ICJPYmplY3RQcmV2aWV3IiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIk5l c3RlZCB2YWx1ZSBwcmV2aWV3LiIgfSwKICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImludGVy bmFsIiwgInR5cGUiOiAiYm9vbGVhbiIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6 ICJUcnVlIGlmIHRoaXMgaXMgYW4gaW50ZXJuYWwgcHJvcGVydHkuIiB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0No YW5nZUxvZwppbmRleCBkM2Y4Zjk2Li5iMTBiNWE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cK QEAgLTEsMyArMSwzMyBAQAorMjAxNS0wNC0yMCAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9A YXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEltcHJvdmUgU3VwcG9ydCBmb3Ig V2Vha1NldCBpbiBDb25zb2xlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNDM5NTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL05hdGl2ZUZ1bmN0aW9uUGFyYW1ldGVy cy5qczoKKyAgICAgICAgV2Vha1NldCBoYXMgdGhlIHNhbWUgQVBJcyBhbmQgcGFyYW1ldGVycyBh cyBTZXQgZm9yIHRoZSBmdW5jdGlvbnMgaXQgaW1wbGVtZW50cy4KKworICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvUHJvdG9jb2wvUmVtb3RlT2JqZWN0LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlJlbW90ZU9iamVjdC5wcm90b3R5cGUuaXNDb2xsZWN0aW9uVHlwZSk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuUmVtb3RlT2JqZWN0LnByb3RvdHlwZS5pc1dlYWtDb2xsZWN0aW9uKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QucHJvdG90eXBlLmdldENvbGxlY3Rpb25FbnRy aWVzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QucHJvdG90eXBlLl93ZWFr Q29sbGVjdGlvbk9iamVjdEdyb3VwKToKKyAgICAgICAgV2Vha1NldCBpcyBhIHdlYWsgY29sbGVj dGlvbi4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL09iamVjdFByZXZpZXcuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuT2JqZWN0UHJldmlldy5wcm90b3R5cGUuaGFzU2l6ZSk6 CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Db25zb2xlTWVzc2FnZVZpZXcuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2VWaWV3LnByb3RvdHlwZS5fZm9ybWF0 UGFyYW1ldGVyKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0Zvcm1hdHRlZFZhbHVl LmNzczoKKyAgICAgICAgKC5mb3JtYXR0ZWQtb2JqZWN0LCAuZm9ybWF0dGVkLW5vZGUsIC5mb3Jt YXR0ZWQtZXJyb3IsIC5mb3JtYXR0ZWQtbWFwLCAuZm9ybWF0dGVkLXNldCwgLmZvcm1hdHRlZC13 ZWFrbWFwLCAuZm9ybWF0dGVkLXdlYWtzZXQpOgorICAgICAgICAoOm1hdGNoZXMoLmZvcm1hdHRl ZC1hcnJheSwgLmZvcm1hdHRlZC1tYXAsIC5mb3JtYXR0ZWQtc2V0LCAuZm9ybWF0dGVkLXdlYWtt YXAsIC5mb3JtYXR0ZWQtd2Vha3NldCkgPiAuc2l6ZSk6CisgICAgICAgICguZm9ybWF0dGVkLW9i amVjdCwgLmZvcm1hdHRlZC1ub2RlLCAuZm9ybWF0dGVkLWVycm9yLCAuZm9ybWF0dGVkLW1hcCwg LmZvcm1hdHRlZC1zZXQsIC5mb3JtYXR0ZWQtd2Vha21hcCk6IERlbGV0ZWQuCisgICAgICAgICg6 bWF0Y2hlcyguZm9ybWF0dGVkLWFycmF5LCAuZm9ybWF0dGVkLW1hcCwgLmZvcm1hdHRlZC1zZXQs IC5mb3JtYXR0ZWQtd2Vha21hcCkgPiAuc2l6ZSk6IERlbGV0ZWQuCisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9Gb3JtYXR0ZWRWYWx1ZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5G b3JtYXR0ZWRWYWx1ZS5jcmVhdGVFbGVtZW50Rm9yVHlwZXNBbmRWYWx1ZSk6CisgICAgICAgIFRy ZWF0IGEgV2Vha1NldCBsaWtlIGEgc2V0IGluIG1vcmUgcGxhY2VzLgorCiAyMDE1LTA0LTE4ICBO aWtpdGEgVmFzaWx5ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFBhc3MgbXVsdGlwbGUgYXJndW1lbnRzIHRvIGNsYXNzTGlzdC5hZGQgYW5kIGNsYXNz TGlzdC5yZW1vdmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL01vZGVscy9OYXRpdmVGdW5jdGlvblBhcmFtZXRlcnMuanMgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvTmF0aXZlRnVuY3Rpb25QYXJhbWV0ZXJzLmpzCmlu ZGV4IDk5YjliNTkuLjEzMzAxMDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL01vZGVscy9OYXRpdmVGdW5jdGlvblBhcmFtZXRlcnMuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL05hdGl2ZUZ1bmN0aW9uUGFy YW1ldGVycy5qcwpAQCAtMjA2Myw2ICsyMDYzLDcgQEAgV2ViSW5zcGVjdG9yLk5hdGl2ZVByb3Rv dHlwZUZ1bmN0aW9uUGFyYW1ldGVycyA9IHsKIH07CiAKIFdlYkluc3BlY3Rvci5OYXRpdmVQcm90 b3R5cGVGdW5jdGlvblBhcmFtZXRlcnMuV2Vha01hcCA9IFdlYkluc3BlY3Rvci5OYXRpdmVQcm90 b3R5cGVGdW5jdGlvblBhcmFtZXRlcnMuTWFwOworV2ViSW5zcGVjdG9yLk5hdGl2ZVByb3RvdHlw ZUZ1bmN0aW9uUGFyYW1ldGVycy5XZWFrU2V0ID0gV2ViSW5zcGVjdG9yLk5hdGl2ZVByb3RvdHlw ZUZ1bmN0aW9uUGFyYW1ldGVycy5TZXQ7CiAKIChmdW5jdGlvbigpIHsKICAgICBmdW5jdGlvbiBt aXhpbihvLCBtaXhpbikgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvTW9kZWxzL09iamVjdFByZXZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Nb2RlbHMvT2JqZWN0UHJldmlldy5qcwppbmRleCA4YmQ4NWE2Li45OGE4 Y2ZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2Rl bHMvT2JqZWN0UHJldmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9Nb2RlbHMvT2JqZWN0UHJldmlldy5qcwpAQCAtMTEyLDYgKzExMiw2IEBAIFdlYkluc3Bl Y3Rvci5PYmplY3RQcmV2aWV3ID0gY2xhc3MgT2JqZWN0UHJldmlldyBleHRlbmRzIFdlYkluc3Bl Y3Rvci5PYmplY3QKIAogICAgIGhhc1NpemUoKQogICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMu X3NpemUgIT09IHVuZGVmaW5lZCAmJiAodGhpcy5fc3VidHlwZSA9PT0gImFycmF5IiB8fCB0aGlz Ll9zdWJ0eXBlID09PSAic2V0IiB8fCB0aGlzLl9zdWJ0eXBlID09PSAibWFwIiB8fCB0aGlzLl9z dWJ0eXBlID09PSAid2Vha21hcCIpOworICAgICAgICByZXR1cm4gdGhpcy5fc2l6ZSAhPT0gdW5k ZWZpbmVkICYmICh0aGlzLl9zdWJ0eXBlID09PSAiYXJyYXkiIHx8IHRoaXMuX3N1YnR5cGUgPT09 ICJzZXQiIHx8IHRoaXMuX3N1YnR5cGUgPT09ICJtYXAiIHx8IHRoaXMuX3N1YnR5cGUgPT09ICJ3 ZWFrbWFwIiB8fCB0aGlzLl9zdWJ0eXBlID09PSAid2Vha3NldCIpOwogICAgIH0KIH07CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9SZW1v dGVPYmplY3QuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2Nv bC9SZW1vdGVPYmplY3QuanMKaW5kZXggZWUzMDYzMi4uZGJjMTg2MiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvUmVtb3RlT2JqZWN0Lmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL1JlbW90 ZU9iamVjdC5qcwpAQCAtMzQyLDEyICszNDIsMTIgQEAgV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVj dCA9IGNsYXNzIFJlbW90ZU9iamVjdAogCiAgICAgaXNDb2xsZWN0aW9uVHlwZSgpCiAgICAgewot ICAgICAgICByZXR1cm4gdGhpcy5fc3VidHlwZSA9PT0gIm1hcCIgfHwgdGhpcy5fc3VidHlwZSA9 PT0gInNldCIgfHwgdGhpcy5fc3VidHlwZSA9PT0gIndlYWttYXAiOworICAgICAgICByZXR1cm4g dGhpcy5fc3VidHlwZSA9PT0gIm1hcCIgfHwgdGhpcy5fc3VidHlwZSA9PT0gInNldCIgfHwgdGhp cy5fc3VidHlwZSA9PT0gIndlYWttYXAiIHx8IHRoaXMuX3N1YnR5cGUgPT09ICJ3ZWFrc2V0IjsK ICAgICB9CiAKICAgICBpc1dlYWtDb2xsZWN0aW9uKCkKICAgICB7Ci0gICAgICAgIHJldHVybiB0 aGlzLl9zdWJ0eXBlID09PSAid2Vha21hcCI7CisgICAgICAgIHJldHVybiB0aGlzLl9zdWJ0eXBl ID09PSAid2Vha21hcCIgfHwgdGhpcy5fc3VidHlwZSA9PT0gIndlYWtzZXQiOwogICAgIH0KIAog ICAgIGdldENvbGxlY3Rpb25FbnRyaWVzKHN0YXJ0LCBudW1iZXJUb0ZldGNoLCBjYWxsYmFjaykK QEAgLTM1OSw4ICszNTksOSBAQCBXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0ID0gY2xhc3MgUmVt b3RlT2JqZWN0CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KG51bWJlclRvRmV0Y2ggPj0gMCk7CiAg ICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRoaXMuaXNDb2xsZWN0aW9uVHlwZSgpKTsKIAotICAgICAg ICAvLyBXZWFrTWFwcyBhcmUgbm90IG9yZGVyZWQuIFdlIHNob3VsZCBuZXZlciBzZW5kIGEgbm9u LXplcm8gc3RhcnQuCisgICAgICAgIC8vIFdlYWtNYXBzIGFuZCBXZWFrU2V0cyBhcmUgbm90IG9y ZGVyZWQuIFdlIHNob3VsZCBuZXZlciBzZW5kIGEgbm9uLXplcm8gc3RhcnQuCiAgICAgICAgIGNv bnNvbGUuYXNzZXJ0KCh0aGlzLl9zdWJ0eXBlID09PSAid2Vha21hcCIgJiYgc3RhcnQgPT09IDAp IHx8IHRoaXMuX3N1YnR5cGUgIT09ICJ3ZWFrbWFwIik7CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0 KCh0aGlzLl9zdWJ0eXBlID09PSAid2Vha3NldCIgJiYgc3RhcnQgPT09IDApIHx8IHRoaXMuX3N1 YnR5cGUgIT09ICJ3ZWFrc2V0Iik7CiAKICAgICAgICAgdmFyIG9iamVjdEdyb3VwID0gdGhpcy5p c1dlYWtDb2xsZWN0aW9uKCkgPyB0aGlzLl93ZWFrQ29sbGVjdGlvbk9iamVjdEdyb3VwKCkgOiAi IjsKIApAQCAtNDc2LDcgKzQ3Nyw3IEBAIFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QgPSBjbGFz cyBSZW1vdGVPYmplY3QKIAogICAgIF93ZWFrQ29sbGVjdGlvbk9iamVjdEdyb3VwKCkKICAgICB7 Ci0gICAgICAgIHJldHVybiBKU09OLnN0cmluZ2lmeSh0aGlzLl9vYmplY3RJZCkgKyAiLVdlYWtN YXAiOworICAgICAgICByZXR1cm4gSlNPTi5zdHJpbmdpZnkodGhpcy5fb2JqZWN0SWQpICsgIi0i ICsgdGhpcy5fc3VidHlwZTsKICAgICB9CiAKICAgICBfZ2V0UHJvcGVydHlEZXNjcmlwdG9ycyhv d25Qcm9wZXJ0aWVzLCBjYWxsYmFjaykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnNvbGVNZXNzYWdlVmlldy5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnNvbGVNZXNzYWdlVmlldy5qcwppbmRl eCAyMDE3OTA0Li5iYjRmZTQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9Db25zb2xlTWVzc2FnZVZpZXcuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29uc29sZU1lc3NhZ2VWaWV3LmpzCkBAIC00 MzMsNiArNDMzLDcgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlVmlldyA9IGNsYXNzIENv bnNvbGVNZXNzYWdlVmlldyBleHRlbmRzIFdlYkluc3BlY3Rvci4KICAgICAgICAgICAgICJtYXAi OiB0aGlzLl9mb3JtYXRQYXJhbWV0ZXJBc09iamVjdCwKICAgICAgICAgICAgICJzZXQiOiB0aGlz Ll9mb3JtYXRQYXJhbWV0ZXJBc09iamVjdCwKICAgICAgICAgICAgICJ3ZWFrbWFwIjogdGhpcy5f Zm9ybWF0UGFyYW1ldGVyQXNPYmplY3QsCisgICAgICAgICAgICAid2Vha3NldCI6IHRoaXMuX2Zv cm1hdFBhcmFtZXRlckFzT2JqZWN0LAogICAgICAgICAgICAgIml0ZXJhdG9yIjogdGhpcy5fZm9y bWF0UGFyYW1ldGVyQXNPYmplY3QsCiAgICAgICAgICAgICAiY2xhc3MiOiB0aGlzLl9mb3JtYXRQ YXJhbWV0ZXJBc09iamVjdCwKICAgICAgICAgICAgICJhcnJheSI6IHRoaXMuX2Zvcm1hdFBhcmFt ZXRlckFzQXJyYXksCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9Gb3JtYXR0ZWRWYWx1ZS5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9Gb3JtYXR0ZWRWYWx1ZS5jc3MKaW5kZXggMGNlMzRmNi4uNDA3Mzdm OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv Rm9ybWF0dGVkVmFsdWUuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0Zvcm1hdHRlZFZhbHVlLmNzcwpAQCAtMjMsMTMgKzIzLDEzIEBACiAgKiBUSEUg UE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAotLmZvcm1hdHRlZC1vYmplY3QsIC5m b3JtYXR0ZWQtbm9kZSwgLmZvcm1hdHRlZC1lcnJvciwgLmZvcm1hdHRlZC1tYXAsIC5mb3JtYXR0 ZWQtc2V0LCAuZm9ybWF0dGVkLXdlYWttYXAgeworLmZvcm1hdHRlZC1vYmplY3QsIC5mb3JtYXR0 ZWQtbm9kZSwgLmZvcm1hdHRlZC1lcnJvciwgLmZvcm1hdHRlZC1tYXAsIC5mb3JtYXR0ZWQtc2V0 LCAuZm9ybWF0dGVkLXdlYWttYXAsIC5mb3JtYXR0ZWQtd2Vha3NldCB7CiAgICAgcG9zaXRpb246 IHJlbGF0aXZlOwogICAgIGRpc3BsYXk6IGlubGluZS1ibG9jazsKICAgICBjb2xvcjogYmxhY2s7 CiB9CiAKLTptYXRjaGVzKC5mb3JtYXR0ZWQtYXJyYXksIC5mb3JtYXR0ZWQtbWFwLCAuZm9ybWF0 dGVkLXNldCwgLmZvcm1hdHRlZC13ZWFrbWFwKSA+IC5zaXplIHsKKzptYXRjaGVzKC5mb3JtYXR0 ZWQtYXJyYXksIC5mb3JtYXR0ZWQtbWFwLCAuZm9ybWF0dGVkLXNldCwgLmZvcm1hdHRlZC13ZWFr bWFwLCAuZm9ybWF0dGVkLXdlYWtzZXQpID4gLnNpemUgewogICAgIGZvbnQtc3R5bGU6IG5vcm1h bDsKICAgICBjb2xvcjogcmdiYSgwLCAwLCAwLCAwLjMzKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Zvcm1hdHRlZFZhbHVlLmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRm9ybWF0dGVkVmFsdWUu anMKaW5kZXggZDYzNTcxZC4uYzZkYzg3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRm9ybWF0dGVkVmFsdWUuanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRm9ybWF0dGVkVmFsdWUuanMKQEAgLTk3 LDcgKzk3LDcgQEAgV2ViSW5zcGVjdG9yLkZvcm1hdHRlZFZhbHVlLmNyZWF0ZUVsZW1lbnRGb3JU eXBlc0FuZFZhbHVlID0gZnVuY3Rpb24odHlwZSwgc3VidHkKICAgICBzcGFuLnRleHRDb250ZW50 ID0gZGlzcGxheVN0cmluZzsKIAogICAgIC8vIElmIHRoZXJlIGlzIGEgc2l6ZSwgaW5jbHVkZSBp dC4KLSAgICBpZiAoc2l6ZSAhPT0gdW5kZWZpbmVkICYmIChzdWJ0eXBlID09PSAiYXJyYXkiIHx8 IHN1YnR5cGUgPT09ICJzZXQiIHx8IHN1YnR5cGUgPT09ICJtYXAiIHx8IHN1YnR5cGUgPT09ICJ3 ZWFrbWFwIikpIHsKKyAgICBpZiAoc2l6ZSAhPT0gdW5kZWZpbmVkICYmIChzdWJ0eXBlID09PSAi YXJyYXkiIHx8IHN1YnR5cGUgPT09ICJzZXQiIHx8IHN1YnR5cGUgPT09ICJtYXAiIHx8IHN1YnR5 cGUgPT09ICJ3ZWFrbWFwIiB8fCBzdWJ0eXBlID09PSAid2Vha3NldCIpKSB7CiAgICAgICAgIHZh ciBzaXplRWxlbWVudCA9IHNwYW4uYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgi c3BhbiIpKTsKICAgICAgICAgc2l6ZUVsZW1lbnQuY2xhc3NOYW1lID0gInNpemUiOwogICAgICAg ICBzaXplRWxlbWVudC50ZXh0Q29udGVudCA9ICIgKCIgKyBzaXplICsgIikiOwo=