163323 2016-10-12 00:16:22 -0700 Web Inspector: Improve support for logging Proxy objects in console 2016-10-15 00:27:03 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue joepeck keith_miller mark.lam mattbaker msaboff nvasilyev saam timothy webkit-bug-importer oldest_to_newest 1239211 0 joepeck 2016-10-12 00:16:22 -0700 Summary: Improve support for logging Proxy objects in console - Avoid accessing Proxy traps where possible - Display "Proxy" but preview the target value since that is what users will want - Expanding should show Internal [[Target]] and [[Handler]] properties Test: <script> console.log(new Proxy({foo:1}, { get() { alert('error'); } }); </script> 1239212 1 joepeck 2016-10-12 00:16:31 -0700 <rdar://problem/28432553> 1239213 2 291343 joepeck 2016-10-12 00:24:04 -0700 Created attachment 291343 [PATCH] Proposed Fix 1239214 3 291343 saam 2016-10-12 00:35:34 -0700 Comment on attachment 291343 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=291343&action=review > Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp:393 > + while (ProxyObject* proxy = jsDynamicCast<ProxyObject*>(target)) Would it ever be worth showing the intermediate Proxy tree or is it worth reviewing until we find a non-proxy target? 1239216 4 291343 saam 2016-10-12 00:38:05 -0700 Comment on attachment 291343 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=291343&action=review > Source/JavaScriptCore/bindings/ScriptValue.cpp:138 > + return JSValueIsStrictEqual(toRef(scriptState), toRef(scriptState, jsValue()), toRef(scriptState, anotherValue.jsValue())); Maybe it's worth adding a test here like where you log an object followed by a number and ensure that valueOf isn't called in the object? 1239219 5 291343 joepeck 2016-10-12 00:41:38 -0700 Comment on attachment 291343 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=291343&action=review >> Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp:393 >> + while (ProxyObject* proxy = jsDynamicCast<ProxyObject*>(target)) > > Would it ever be worth showing the intermediate Proxy tree or is it worth reviewing until we find a non-proxy target? Expanding a Proxy object will show you the full Proxy tree. However the initial preview will show the final target value. For example: var innerProxy = new Proxy({foo:1, bar:2}, {}); var outerProxy = new Proxy(innerProxy, {}); Logging just the outerProxy would show something immediately useful like: ▶︎ Proxy {foo: 1, bar: 2} Expanding the Proxy would show [[Target]] and [[Handler]] so you get the full tree: ▼ Proxy handler: {} target: ▼ Proxy handler: {} target: {foo: 1, bar: 2} 1239376 6 291343 joepeck 2016-10-12 11:25:02 -0700 Comment on attachment 291343 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=291343&action=review >> Source/JavaScriptCore/bindings/ScriptValue.cpp:138 >> + return JSValueIsStrictEqual(toRef(scriptState), toRef(scriptState, jsValue()), toRef(scriptState, anotherValue.jsValue())); > > Maybe it's worth adding a test here like where you log an object followed by a number and ensure that valueOf isn't called in the object? I'll add a test. 1239377 7 291372 joepeck 2016-10-12 11:25:58 -0700 Created attachment 291372 [PATCH] Proposed Fix 1240575 8 joepeck 2016-10-15 00:27:03 -0700 <https://trac.webkit.org/changeset/207229> 291343 2016-10-12 00:24:04 -0700 2016-10-12 11:25:58 -0700 [PATCH] Proposed Fix proxy-1.patch text/plain 26510 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkNTE5MzEwLi5iOWYwMzg1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTYtMTAt MTIgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIg SW5zcGVjdG9yOiBJbXByb3ZlIHN1cHBvcnQgZm9yIGxvZ2dpbmcgUHJveHkgb2JqZWN0cyBpbiBj b25zb2xlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NjMzMjMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI4NDMyNTUzPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2NvbnNvbGUvY29u c29sZS1sb2ctcHJveHktZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBpbnNwZWN0b3Iv Y29uc29sZS9jb25zb2xlLWxvZy1wcm94eS5odG1sOiBBZGRlZC4KKyAgICAgICAgQWRkIGEgdGVz dCBzcGVjaWZpYyB0byBjb25zb2xlIGxvZ3Mgb2YgUHJveHkgb2JqZWN0cyB0byBlbnN1cmUgdGhl IGdldAorICAgICAgICB0cmFwIGlzIG5vdCB1c2VkLgorCisgICAgICAgICogaW5zcGVjdG9yL21v ZGVsL3JlbW90ZS1vYmplY3QtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGluc3BlY3Rvci9tb2Rl bC9yZW1vdGUtb2JqZWN0Lmh0bWw6CisgICAgICAgICogcGxhdGZvcm0vbWFjL2luc3BlY3Rvci9t b2RlbC9yZW1vdGUtb2JqZWN0LWV4cGVjdGVkLnR4dDoKKyAgICAgICAgVXBkYXRlIHJlc3VsdHMg Zm9yIFByb3h5IG9iamVjdHMgYW5kIGluY2x1ZGUgYSB0ZXN0IGZvciBhIG11bHRpLWxldmVsCisg ICAgICAgIFByb3h5IG9iamVjdCwgd2hpY2ggc2hvdWxkIHByZXZpZXcgdGhlIHRhcmdldC4KKwog MjAxNi0xMC0xMSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAg ICAgIEVtaXQgRGVidWdIb29rcyB1bmlmb3JtbHkgd2l0aCBwYXVzZSBsb2NhdGlvbnMgaW5zdGVh ZCBvZiBoYXZpbmcgc2VwYXJhdGUgcGF1c2UgbG9jYXRpb25zIGFuZCBvcF9kZWJ1ZyBlbWl0cwpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUvY29uc29sZS1sb2ctcHJv eHktZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUvY29uc29sZS1s b2ctcHJveHktZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAu LjU1YjU4YWMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29s ZS9jb25zb2xlLWxvZy1wcm94eS1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw4IEBACitDT05TT0xF IE1FU1NBR0U6IGxpbmUgMTY6IFtvYmplY3QgUHJveHldCitUZXN0cyBmb3IgdGhlIGNvbnNvbGUu bG9nIHdpdGggUHJveHkgb2JqZWN0cy4KKworCis9PSBSdW5uaW5nIHRlc3Qgc3VpdGU6IGNvbnNv bGUubG9nLnByb3h5CistLSBSdW5uaW5nIHRlc3QgY2FzZTogQmFzaWNQcm94eUxvZworUEFTUzog TG9nZ2luZyBQcm94eSBvYmplY3RzIHNob3VsZCBub3QgaGF2ZSB0cmlnZ2VyZWQgZ2V0IHRyYXAu CisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlL2NvbnNvbGUtbG9n LXByb3h5Lmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS9jb25zb2xlLWxvZy1w cm94eS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjNmYmZjMjYKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS9jb25zb2xlLWxv Zy1wcm94eS5odG1sCkBAIC0wLDAgKzEsNDQgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8 aGVhZD4KKzxzY3JpcHQgc3JjPSIuLi8uLi9odHRwL3Rlc3RzL2luc3BlY3Rvci9yZXNvdXJjZXMv aW5zcGVjdG9yLXRlc3QuanMiPjwvc2NyaXB0PgorPHNjcmlwdD4KK2Z1bmN0aW9uIHRyaWdnZXJQ cm94eUNvbnNvbGVMb2coKSB7CisgICAgd2luZG93LmFjY2Vzc2VkSGFuZGxlckdldCA9IGZhbHNl OworCisgICAgbGV0IHByb3h5ID0gbmV3IFByb3h5KHtmb286IDF9LCB7CisgICAgICAgIGdldCh0 YXJnZXQsIG5hbWUsIHJlY2VpdmVyKSB7CisgICAgICAgICAgICB3aW5kb3cuYWNjZXNzZWRIYW5k bGVyR2V0ID0gdHJ1ZTsKKyAgICAgICAgICAgIHJldHVybiB0YXJnZXRbbmFtZV07CisgICAgICAg IH0KKyAgICB9KTsKKworICAgIGNvbnNvbGUubG9nKHByb3h5KTsKK30KKworZnVuY3Rpb24gdGVz dCgpCit7CisgICAgbGV0IHN1aXRlID0gSW5zcGVjdG9yVGVzdC5jcmVhdGVBc3luY1N1aXRlKCJj b25zb2xlLmxvZy5wcm94eSIpOworCisgICAgc3VpdGUuYWRkVGVzdENhc2UoeworICAgICAgICBu YW1lOiAiQmFzaWNQcm94eUxvZyIsCisgICAgICAgIGRlc2NyaXB0aW9uOiAiY29uc29sZS5sb2cg b2YgYSBQcm94eSBvYmplY3Qgc2hvdWxkIG5vdCB0cmlnZ2VyIHByb3h5IGdldCB0cmFwLiIsCisg ICAgICAgIHRlc3QocmVzb2x2ZSwgcmVqZWN0KSB7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0 LmV2YWx1YXRlSW5QYWdlKCJ0cmlnZ2VyUHJveHlDb25zb2xlTG9nKCkiLCAoKSA9PiB7CisgICAg ICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5ldmFsdWF0ZUluUGFnZSgid2luZG93LmFjY2Vzc2Vk SGFuZGxlckdldCIsIChlcnJvciwgcmVzdWx0KSA9PiB7CisgICAgICAgICAgICAgICAgICAgIGxl dCB2YWx1ZSA9IFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QuZnJvbVBheWxvYWQocmVzdWx0KS52 YWx1ZTsKKyAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbCh2YWx1 ZSwgZmFsc2UsICJMb2dnaW5nIFByb3h5IG9iamVjdHMgc2hvdWxkIG5vdCBoYXZlIHRyaWdnZXJl ZCBnZXQgdHJhcC4iKTsKKyAgICAgICAgICAgICAgICAgICAgcmVzb2x2ZSgpOworICAgICAgICAg ICAgICAgIH0pOworICAgICAgICAgICAgfSk7CisgICAgICAgIH0KKyAgICB9KTsKKworICAgIHN1 aXRlLnJ1blRlc3RDYXNlc0FuZEZpbmlzaCgpOworfQorPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9k eSBvbmxvYWQ9InJ1blRlc3QoKSI+Cis8cD5UZXN0cyBmb3IgdGhlIGNvbnNvbGUubG9nIHdpdGgg UHJveHkgb2JqZWN0cy48L3A+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9pbnNwZWN0b3IvbW9kZWwvcmVtb3RlLW9iamVjdC1leHBlY3RlZC50eHQgYi9MYXlvdXRU ZXN0cy9pbnNwZWN0b3IvbW9kZWwvcmVtb3RlLW9iamVjdC1leHBlY3RlZC50eHQKaW5kZXggZGFl YzRmMC4uNjAwMDY4YiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL21vZGVsL3Jl bW90ZS1vYmplY3QtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9tb2Rl bC9yZW1vdGUtb2JqZWN0LWV4cGVjdGVkLnR4dApAQCAtNDY1OSw2NCArNDY1OSw2MCBAQCBFWFBS RVNTSU9OOiBQcm9taXNlLnJlc29sdmUoe3Jlc3VsdDoxfSkKIEVYUFJFU1NJT046IG5ldyBQcm94 eSh7eDoxLCB5OjF9LCB7aGFuZGxlcjogdHJ1ZX0pCiB7CiAgICJfdHlwZSI6ICJvYmplY3QiLAor ICAiX3N1YnR5cGUiOiAicHJveHkiLAogICAiX29iamVjdElkIjogIjxmaWx0ZXJlZD4iLAotICAi X2Rlc2NyaXB0aW9uIjogIlByb3h5T2JqZWN0IiwKKyAgIl9kZXNjcmlwdGlvbiI6ICJQcm94eSIs CiAgICJfcHJldmlldyI6IHsKICAgICAiX2xpc3RlbmVycyI6IG51bGwsCiAgICAgIl90eXBlIjog Im9iamVjdCIsCi0gICAgIl9kZXNjcmlwdGlvbiI6ICJQcm94eU9iamVjdCIsCi0gICAgIl9sb3Nz bGVzcyI6IHRydWUsCisgICAgIl9zdWJ0eXBlIjogInByb3h5IiwKKyAgICAiX2Rlc2NyaXB0aW9u IjogIlByb3h5IiwKKyAgICAiX2xvc3NsZXNzIjogZmFsc2UsCiAgICAgIl9vdmVyZmxvdyI6IGZh bHNlLAogICAgICJfcHJvcGVydGllcyI6IFsKICAgICAgIHsKICAgICAgICAgIl9saXN0ZW5lcnMi OiBudWxsLAotICAgICAgICAiX25hbWUiOiAidGFyZ2V0IiwKLSAgICAgICAgIl90eXBlIjogIm9i amVjdCIsCi0gICAgICAgICJfdmFsdWVQcmV2aWV3IjogewotICAgICAgICAgICJfbGlzdGVuZXJz IjogbnVsbCwKLSAgICAgICAgICAiX3R5cGUiOiAib2JqZWN0IiwKLSAgICAgICAgICAiX2Rlc2Ny aXB0aW9uIjogIk9iamVjdCIsCi0gICAgICAgICAgIl9sb3NzbGVzcyI6IHRydWUsCi0gICAgICAg ICAgIl9vdmVyZmxvdyI6IGZhbHNlLAotICAgICAgICAgICJfcHJvcGVydGllcyI6IFsKLSAgICAg ICAgICAgIHsKLSAgICAgICAgICAgICAgIl9saXN0ZW5lcnMiOiBudWxsLAotICAgICAgICAgICAg ICAiX25hbWUiOiAieCIsCi0gICAgICAgICAgICAgICJfdHlwZSI6ICJudW1iZXIiLAotICAgICAg ICAgICAgICAiX3ZhbHVlIjogIjEiCi0gICAgICAgICAgICB9LAotICAgICAgICAgICAgewotICAg ICAgICAgICAgICAiX2xpc3RlbmVycyI6IG51bGwsCi0gICAgICAgICAgICAgICJfbmFtZSI6ICJ5 IiwKLSAgICAgICAgICAgICAgIl90eXBlIjogIm51bWJlciIsCi0gICAgICAgICAgICAgICJfdmFs dWUiOiAiMSIKLSAgICAgICAgICAgIH0KLSAgICAgICAgICBdLAotICAgICAgICAgICJfZW50cmll cyI6IG51bGwKLSAgICAgICAgfSwKLSAgICAgICAgIl9pbnRlcm5hbCI6IHRydWUKKyAgICAgICAg Il9uYW1lIjogIngiLAorICAgICAgICAiX3R5cGUiOiAibnVtYmVyIiwKKyAgICAgICAgIl92YWx1 ZSI6ICIxIgogICAgICAgfSwKICAgICAgIHsKICAgICAgICAgIl9saXN0ZW5lcnMiOiBudWxsLAot ICAgICAgICAiX25hbWUiOiAiaGFuZGxlciIsCi0gICAgICAgICJfdHlwZSI6ICJvYmplY3QiLAot ICAgICAgICAiX3ZhbHVlUHJldmlldyI6IHsKLSAgICAgICAgICAiX2xpc3RlbmVycyI6IG51bGws Ci0gICAgICAgICAgIl90eXBlIjogIm9iamVjdCIsCi0gICAgICAgICAgIl9kZXNjcmlwdGlvbiI6 ICJPYmplY3QiLAotICAgICAgICAgICJfbG9zc2xlc3MiOiB0cnVlLAotICAgICAgICAgICJfb3Zl cmZsb3ciOiBmYWxzZSwKLSAgICAgICAgICAiX3Byb3BlcnRpZXMiOiBbCi0gICAgICAgICAgICB7 Ci0gICAgICAgICAgICAgICJfbGlzdGVuZXJzIjogbnVsbCwKLSAgICAgICAgICAgICAgIl9uYW1l IjogImhhbmRsZXIiLAotICAgICAgICAgICAgICAiX3R5cGUiOiAiYm9vbGVhbiIsCi0gICAgICAg ICAgICAgICJfdmFsdWUiOiAidHJ1ZSIKLSAgICAgICAgICAgIH0KLSAgICAgICAgICBdLAotICAg ICAgICAgICJfZW50cmllcyI6IG51bGwKLSAgICAgICAgfSwKLSAgICAgICAgIl9pbnRlcm5hbCI6 IHRydWUKKyAgICAgICAgIl9uYW1lIjogInkiLAorICAgICAgICAiX3R5cGUiOiAibnVtYmVyIiwK KyAgICAgICAgIl92YWx1ZSI6ICIxIgorICAgICAgfQorICAgIF0sCisgICAgIl9lbnRyaWVzIjog bnVsbAorICB9Cit9CisKKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tCitFWFBSRVNTSU9OOiBuZXcgUHJveHkobmV3IFByb3h5KHtmb286MSwgYmFy OjF9LCB7fSksIHt9KQoreworICAiX3R5cGUiOiAib2JqZWN0IiwKKyAgIl9zdWJ0eXBlIjogInBy b3h5IiwKKyAgIl9vYmplY3RJZCI6ICI8ZmlsdGVyZWQ+IiwKKyAgIl9kZXNjcmlwdGlvbiI6ICJQ cm94eSIsCisgICJfcHJldmlldyI6IHsKKyAgICAiX2xpc3RlbmVycyI6IG51bGwsCisgICAgIl90 eXBlIjogIm9iamVjdCIsCisgICAgIl9zdWJ0eXBlIjogInByb3h5IiwKKyAgICAiX2Rlc2NyaXB0 aW9uIjogIlByb3h5IiwKKyAgICAiX2xvc3NsZXNzIjogZmFsc2UsCisgICAgIl9vdmVyZmxvdyI6 IGZhbHNlLAorICAgICJfcHJvcGVydGllcyI6IFsKKyAgICAgIHsKKyAgICAgICAgIl9saXN0ZW5l cnMiOiBudWxsLAorICAgICAgICAiX25hbWUiOiAiZm9vIiwKKyAgICAgICAgIl90eXBlIjogIm51 bWJlciIsCisgICAgICAgICJfdmFsdWUiOiAiMSIKKyAgICAgIH0sCisgICAgICB7CisgICAgICAg ICJfbGlzdGVuZXJzIjogbnVsbCwKKyAgICAgICAgIl9uYW1lIjogImJhciIsCisgICAgICAgICJf dHlwZSI6ICJudW1iZXIiLAorICAgICAgICAiX3ZhbHVlIjogIjEiCiAgICAgICB9CiAgICAgXSwK ICAgICAiX2VudHJpZXMiOiBudWxsCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Iv bW9kZWwvcmVtb3RlLW9iamVjdC5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL21vZGVsL3Jl bW90ZS1vYmplY3QuaHRtbAppbmRleCAxM2FlNWEzLi5lNWZlZDQwIDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvbW9kZWwvcmVtb3RlLW9iamVjdC5odG1sCisrKyBiL0xheW91dFRl c3RzL2luc3BlY3Rvci9tb2RlbC9yZW1vdGUtb2JqZWN0Lmh0bWwKQEAgLTE3MCw2ICsxNzAsNyBA QCBmdW5jdGlvbiB0ZXN0KCkKIAogICAgICAgICAvLyBQcm94eQogICAgICAgICB7ZXhwcmVzc2lv bjogIm5ldyBQcm94eSh7eDoxLCB5OjF9LCB7aGFuZGxlcjogdHJ1ZX0pIn0sCisgICAgICAgIHtl eHByZXNzaW9uOiAibmV3IFByb3h5KG5ldyBQcm94eSh7Zm9vOjEsIGJhcjoxfSwge30pLCB7fSki fSwKIAogICAgIC8vIENsYXNzZXMKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0v bWFjL2luc3BlY3Rvci9tb2RlbC9yZW1vdGUtb2JqZWN0LWV4cGVjdGVkLnR4dCBiL0xheW91dFRl c3RzL3BsYXRmb3JtL21hYy9pbnNwZWN0b3IvbW9kZWwvcmVtb3RlLW9iamVjdC1leHBlY3RlZC50 eHQKaW5kZXggM2Y0NGJmNy4uYjE1ZGYyMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZv cm0vbWFjL2luc3BlY3Rvci9tb2RlbC9yZW1vdGUtb2JqZWN0LWV4cGVjdGVkLnR4dAorKysgYi9M YXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvaW5zcGVjdG9yL21vZGVsL3JlbW90ZS1vYmplY3QtZXhw ZWN0ZWQudHh0CkBAIC00NjYwLDY3ICs0NjYwLDE5IEBAIEVYUFJFU1NJT046IFByb21pc2UucmVz b2x2ZSh7cmVzdWx0OjF9KQogRVhQUkVTU0lPTjogbmV3IFByb3h5KHt4OjEsIHk6MX0sIHtoYW5k bGVyOiB0cnVlfSkKIHsKICAgIl90eXBlIjogIm9iamVjdCIsCisgICJfc3VidHlwZSI6ICJwcm94 eSIsCiAgICJfb2JqZWN0SWQiOiAiPGZpbHRlcmVkPiIsCi0gICJfZGVzY3JpcHRpb24iOiAiUHJv eHlPYmplY3QiLAorICAiX2Rlc2NyaXB0aW9uIjogIlByb3h5IiwKICAgIl9wcmV2aWV3Ijogewog ICAgICJfbGlzdGVuZXJzIjogbnVsbCwKICAgICAiX3R5cGUiOiAib2JqZWN0IiwKLSAgICAiX2Rl c2NyaXB0aW9uIjogIlByb3h5T2JqZWN0IiwKLSAgICAiX2xvc3NsZXNzIjogdHJ1ZSwKKyAgICAi X3N1YnR5cGUiOiAicHJveHkiLAorICAgICJfZGVzY3JpcHRpb24iOiAiUHJveHkiLAorICAgICJf bG9zc2xlc3MiOiBmYWxzZSwKICAgICAiX292ZXJmbG93IjogZmFsc2UsCiAgICAgIl9wcm9wZXJ0 aWVzIjogWwogICAgICAgewogICAgICAgICAiX2xpc3RlbmVycyI6IG51bGwsCi0gICAgICAgICJf bmFtZSI6ICJ0YXJnZXQiLAotICAgICAgICAiX3R5cGUiOiAib2JqZWN0IiwKLSAgICAgICAgIl92 YWx1ZVByZXZpZXciOiB7Ci0gICAgICAgICAgIl9saXN0ZW5lcnMiOiBudWxsLAotICAgICAgICAg ICJfdHlwZSI6ICJvYmplY3QiLAotICAgICAgICAgICJfZGVzY3JpcHRpb24iOiAiT2JqZWN0IiwK LSAgICAgICAgICAiX2xvc3NsZXNzIjogdHJ1ZSwKLSAgICAgICAgICAiX292ZXJmbG93IjogZmFs c2UsCi0gICAgICAgICAgIl9wcm9wZXJ0aWVzIjogWwotICAgICAgICAgICAgewotICAgICAgICAg ICAgICAiX2xpc3RlbmVycyI6IG51bGwsCi0gICAgICAgICAgICAgICJfbmFtZSI6ICJ4IiwKLSAg ICAgICAgICAgICAgIl90eXBlIjogIm51bWJlciIsCi0gICAgICAgICAgICAgICJfdmFsdWUiOiAi MSIKLSAgICAgICAgICAgIH0sCi0gICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICJfbGlzdGVu ZXJzIjogbnVsbCwKLSAgICAgICAgICAgICAgIl9uYW1lIjogInkiLAotICAgICAgICAgICAgICAi X3R5cGUiOiAibnVtYmVyIiwKLSAgICAgICAgICAgICAgIl92YWx1ZSI6ICIxIgotICAgICAgICAg ICAgfQotICAgICAgICAgIF0sCi0gICAgICAgICAgIl9lbnRyaWVzIjogbnVsbAotICAgICAgICB9 LAotICAgICAgICAiX2ludGVybmFsIjogdHJ1ZQotICAgICAgfSwKLSAgICAgIHsKLSAgICAgICAg Il9saXN0ZW5lcnMiOiBudWxsLAotICAgICAgICAiX25hbWUiOiAiaGFuZGxlciIsCi0gICAgICAg ICJfdHlwZSI6ICJvYmplY3QiLAotICAgICAgICAiX3ZhbHVlUHJldmlldyI6IHsKLSAgICAgICAg ICAiX2xpc3RlbmVycyI6IG51bGwsCi0gICAgICAgICAgIl90eXBlIjogIm9iamVjdCIsCi0gICAg ICAgICAgIl9kZXNjcmlwdGlvbiI6ICJPYmplY3QiLAotICAgICAgICAgICJfbG9zc2xlc3MiOiB0 cnVlLAotICAgICAgICAgICJfb3ZlcmZsb3ciOiBmYWxzZSwKLSAgICAgICAgICAiX3Byb3BlcnRp ZXMiOiBbCi0gICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICJfbGlzdGVuZXJzIjogbnVsbCwK LSAgICAgICAgICAgICAgIl9uYW1lIjogImhhbmRsZXIiLAotICAgICAgICAgICAgICAiX3R5cGUi OiAiYm9vbGVhbiIsCi0gICAgICAgICAgICAgICJfdmFsdWUiOiAidHJ1ZSIKLSAgICAgICAgICAg IH0KLSAgICAgICAgICBdLAotICAgICAgICAgICJfZW50cmllcyI6IG51bGwKLSAgICAgICAgfSwK LSAgICAgICAgIl9pbnRlcm5hbCI6IHRydWUKLSAgICAgIH0sCi0gICAgICB7Ci0gICAgICAgICJf bGlzdGVuZXJzIjogbnVsbCwKICAgICAgICAgIl9uYW1lIjogIngiLAogICAgICAgICAiX3R5cGUi OiAibnVtYmVyIiwKICAgICAgICAgIl92YWx1ZSI6ICIxIgpAQCAtNDczNyw2ICs0Njg5LDM4IEBA IEVYUFJFU1NJT046IG5ldyBQcm94eSh7eDoxLCB5OjF9LCB7aGFuZGxlcjogdHJ1ZX0pCiB9CiAK IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCitF WFBSRVNTSU9OOiBuZXcgUHJveHkobmV3IFByb3h5KHtmb286MSwgYmFyOjF9LCB7fSksIHt9KQor eworICAiX3R5cGUiOiAib2JqZWN0IiwKKyAgIl9zdWJ0eXBlIjogInByb3h5IiwKKyAgIl9vYmpl Y3RJZCI6ICI8ZmlsdGVyZWQ+IiwKKyAgIl9kZXNjcmlwdGlvbiI6ICJQcm94eSIsCisgICJfcHJl dmlldyI6IHsKKyAgICAiX2xpc3RlbmVycyI6IG51bGwsCisgICAgIl90eXBlIjogIm9iamVjdCIs CisgICAgIl9zdWJ0eXBlIjogInByb3h5IiwKKyAgICAiX2Rlc2NyaXB0aW9uIjogIlByb3h5IiwK KyAgICAiX2xvc3NsZXNzIjogZmFsc2UsCisgICAgIl9vdmVyZmxvdyI6IGZhbHNlLAorICAgICJf cHJvcGVydGllcyI6IFsKKyAgICAgIHsKKyAgICAgICAgIl9saXN0ZW5lcnMiOiBudWxsLAorICAg ICAgICAiX25hbWUiOiAiZm9vIiwKKyAgICAgICAgIl90eXBlIjogIm51bWJlciIsCisgICAgICAg ICJfdmFsdWUiOiAiMSIKKyAgICAgIH0sCisgICAgICB7CisgICAgICAgICJfbGlzdGVuZXJzIjog bnVsbCwKKyAgICAgICAgIl9uYW1lIjogImJhciIsCisgICAgICAgICJfdHlwZSI6ICJudW1iZXIi LAorICAgICAgICAiX3ZhbHVlIjogIjEiCisgICAgICB9CisgICAgXSwKKyAgICAiX2VudHJpZXMi OiBudWxsCisgIH0KK30KKworLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0KIEVYUFJFU1NJT046IFBlcnNvbiA9IGNsYXNzIFBlcnNvbiB7IGNvbnN0 cnVjdG9yKG5hbWUpe30gZ2V0IGZ1bGxOYW1lKCl7fSBtZXRob2ROYW1lKHAxLCBwMil7fSB9OyBQ ZXJzb24KIHsKICAgIl90eXBlIjogImZ1bmN0aW9uIiwKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmlu ZGV4IGJjYmFmZjEuLmUwZWI2MmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9D aGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsx LDUxIEBACisyMDE2LTEwLTEyICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogSW1wcm92ZSBzdXBwb3J0IGZvciBsb2dnaW5nIFBy b3h5IG9iamVjdHMgaW4gY29uc29sZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTYzMzIzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yODQzMjU1Mz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlz IGJhc2VkIG9mZiBvZiBzaW1pbGlhciBwYXRjaGVzIGluIEJsaW5rIGZvciBQcm94eSBoYW5kbGlu Zy4KKworICAgICAgICAqIGJpbmRpbmdzL1NjcmlwdFZhbHVlLmNwcDoKKyAgICAgICAgKERlcHJl Y2F0ZWQ6OlNjcmlwdFZhbHVlOjppc0VxdWFsKToKKyAgICAgICAgVXNlIHN0cmljdCBlcXVhbGl0 eS4gVGhpcyBpcyB0aGUgaW50ZW50LCBhbmQgaXQgcHJldmVudHMgdGhlIHBvc3NpYmlsaXR5IG9m IHRyaWdnZXJpbmcKKyAgICAgICAgcHJpbWl0aXZlIGNvbnZlcnNpb24gb24gb2JqZWN0cyBpbiBw cmV2aW91cyBDb25zb2xlTWVzc2FnZSBhcmd1bWVudCBsaXN0cy4KKworICAgICAgICAqIGluc3Bl Y3Rvci9JbmplY3RlZFNjcmlwdFNvdXJjZS5qczoKKyAgICAgICAgKEluamVjdGVkU2NyaXB0LnBy b3RvdHlwZS5fcHJvcGVydHlEZXNjcmlwdG9ycyk6CisgICAgICAgIEJhaWwgaWYgdGhlIG9iamVj dCBpcyBhIFByb3h5LgorCisgICAgICAgIChJbmplY3RlZFNjcmlwdC5wcm90b3R5cGUuX2Rlc2Ny aWJlKToKKyAgICAgICAgUHJvdmlkZSBhIGZyaWVuZGxpZXIgbmFtZSwgIlByb3h5IiBpbnN0ZWFk IG9mICJQcm94eU9iamVjdCIuCisgICAgICAgIAorICAgICAgICAoSW5qZWN0ZWRTY3JpcHQuUmVt b3RlT2JqZWN0KToKKyAgICAgICAgV2hlbiBnZW5lcmF0aW5nIGEgcHJldmlldyBmb3IgYSBQcm94 eSBvYmplY3QsIGdlbmVyYXRlIGl0IGZyb20gdGhlIGZpbmFsIHRhcmdldAorICAgICAgICBhbmQg bWFyayBpdCBhcyBsb3NzeSBzbyB0aGF0IHRoZSBvYmplY3QgY2FuIGFsd2F5cyBiZSBleHBhbmRl ZCB0byBnZXQgdGhlIGludGVybmFsCisgICAgICAgIHRhcmdldC9oYW5kbGVyIHByb3BlcnRpZXMu CisKKyAgICAgICAgKiBpbnNwZWN0b3IvSlNJbmplY3RlZFNjcmlwdEhvc3QuaDoKKyAgICAgICAg KiBpbnNwZWN0b3IvSlNJbmplY3RlZFNjcmlwdEhvc3QuY3BwOgorICAgICAgICAoSW5zcGVjdG9y OjpKU0luamVjdGVkU2NyaXB0SG9zdDo6c3VidHlwZSk6CisgICAgICAgIE5ldyBzdWJ0eXBlIGZv ciBQcm94eSBvYmplY3RzLgorCisgICAgICAgIChJbnNwZWN0b3I6OkpTSW5qZWN0ZWRTY3JpcHRI b3N0Ojpwcm94eVRhcmdldFZhbHVlKToKKyAgICAgICAgUmVzb2x2ZSB0aGUgZmluYWwgdGFyZ2V0 IHZhbHVlIGZvciBhIFByb3h5LgorCisgICAgICAgICogaW5zcGVjdG9yL0pTSW5qZWN0ZWRTY3Jp cHRIb3N0UHJvdG90eXBlLmNwcDoKKyAgICAgICAgKEluc3BlY3Rvcjo6SlNJbmplY3RlZFNjcmlw dEhvc3RQcm90b3R5cGU6OmZpbmlzaENyZWF0aW9uKToKKyAgICAgICAgKEluc3BlY3Rvcjo6anNJ bmplY3RlZFNjcmlwdEhvc3RQcm90b3R5cGVGdW5jdGlvblByb3h5VGFyZ2V0VmFsdWUpOgorICAg ICAgICBBZGQgdGhlIG5ldyBtZXRob2QuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvU2NyaXB0QXJn dW1lbnRzLmNwcDoKKyAgICAgICAgKEluc3BlY3Rvcjo6U2NyaXB0QXJndW1lbnRzOjpnZXRGaXJz dEFyZ3VtZW50QXNTdHJpbmcpOgorICAgICAgICBBdm9pZCB0cmlnZ2VyaW5nIFByb3h5IHRyYXBz IG9uIGEgUHJveHkgb2JqZWN0IHdoZW4gZ2V0dGluZyBhIHF1aWNrCisgICAgICAgIHN0cmluZyBk ZXNjcmlwdGlvbiBmb3IgQ29uc29sZU1lc3NhZ2VzLgorCisgICAgICAgICogaW5zcGVjdG9yL3By b3RvY29sL1J1bnRpbWUuanNvbjoKKyAgICAgICAgQWRkIG5ldyAicHJveHkiIHN1YnR5cGUuCisK IDIwMTYtMTAtMTEgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAg ICAgICBFbWl0IERlYnVnSG9va3MgdW5pZm9ybWx5IHdpdGggcGF1c2UgbG9jYXRpb25zIGluc3Rl YWQgb2YgaGF2aW5nIHNlcGFyYXRlIHBhdXNlIGxvY2F0aW9ucyBhbmQgb3BfZGVidWcgZW1pdHMK ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9iaW5kaW5ncy9TY3JpcHRWYWx1ZS5j cHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYmluZGluZ3MvU2NyaXB0VmFsdWUuY3BwCmluZGV4 IDAyZGUxMTIuLjA4YWYyYjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9iaW5k aW5ncy9TY3JpcHRWYWx1ZS5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2JpbmRpbmdz L1NjcmlwdFZhbHVlLmNwcApAQCAtMTM1LDcgKzEzNSw3IEBAIGJvb2wgU2NyaXB0VmFsdWU6Omlz RXF1YWwoRXhlY1N0YXRlKiBzY3JpcHRTdGF0ZSwgY29uc3QgU2NyaXB0VmFsdWUmIGFub3RoZXJW YWx1CiB7CiAgICAgaWYgKGhhc05vVmFsdWUoKSkKICAgICAgICAgcmV0dXJuIGFub3RoZXJWYWx1 ZS5oYXNOb1ZhbHVlKCk7Ci0gICAgcmV0dXJuIEpTVmFsdWVJc0VxdWFsKHRvUmVmKHNjcmlwdFN0 YXRlKSwgdG9SZWYoc2NyaXB0U3RhdGUsIGpzVmFsdWUoKSksIHRvUmVmKHNjcmlwdFN0YXRlLCBh bm90aGVyVmFsdWUuanNWYWx1ZSgpKSwgbnVsbHB0cik7CisgICAgcmV0dXJuIEpTVmFsdWVJc1N0 cmljdEVxdWFsKHRvUmVmKHNjcmlwdFN0YXRlKSwgdG9SZWYoc2NyaXB0U3RhdGUsIGpzVmFsdWUo KSksIHRvUmVmKHNjcmlwdFN0YXRlLCBhbm90aGVyVmFsdWUuanNWYWx1ZSgpKSk7CiB9CiAKIGJv b2wgU2NyaXB0VmFsdWU6OmlzTnVsbCgpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0U291cmNlLmpzIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdFNvdXJjZS5qcwppbmRleCBiYjcxNTM3 Li42Y2JhYzgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0lu amVjdGVkU2NyaXB0U291cmNlLmpzCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0 b3IvSW5qZWN0ZWRTY3JpcHRTb3VyY2UuanMKQEAgLTU3NCw2ICs1NzQsOSBAQCBJbmplY3RlZFNj cmlwdC5wcm90b3R5cGUgPSB7CiAKICAgICBfcHJvcGVydHlEZXNjcmlwdG9yczogZnVuY3Rpb24o b2JqZWN0LCBjb2xsZWN0aW9uTW9kZSwgbmF0aXZlR2V0dGVyc0FzVmFsdWVzKQogICAgIHsKKyAg ICAgICAgaWYgKEluamVjdGVkU2NyaXB0SG9zdC5zdWJ0eXBlKG9iamVjdCkgPT09ICJwcm94eSIp CisgICAgICAgICAgICByZXR1cm4gW107CisKICAgICAgICAgdmFyIGRlc2NyaXB0b3JzID0gW107 CiAgICAgICAgIHZhciBuYW1lUHJvY2Vzc2VkID0gbmV3IFNldDsKIApAQCAtNzMyLDggKzczNSw3 IEBAIEluamVjdGVkU2NyaXB0LnByb3RvdHlwZSA9IHsKICAgICAgICAgdHJ5IHsKICAgICAgICAg ICAgIGlmICh0eXBlb2Ygb2JqLnNwbGljZSA9PT0gImZ1bmN0aW9uIiAmJiBpc0Zpbml0ZShvYmou bGVuZ3RoKSkKICAgICAgICAgICAgICAgICByZXR1cm4gImFycmF5IjsKLSAgICAgICAgfSBjYXRj aCAoZSkgewotICAgICAgICB9CisgICAgICAgIH0gY2F0Y2ggKGUpIHt9CiAKICAgICAgICAgcmV0 dXJuIG51bGw7CiAgICAgfSwKQEAgLTc5MSw2ICs3OTMsOSBAQCBJbmplY3RlZFNjcmlwdC5wcm90 b3R5cGUgPSB7CiAgICAgICAgIGlmIChzdWJ0eXBlID09PSAiZXJyb3IiKQogICAgICAgICAgICAg cmV0dXJuIHRvU3RyaW5nKG9iaik7CiAKKyAgICAgICAgaWYgKHN1YnR5cGUgPT09ICJwcm94eSIp CisgICAgICAgICAgICByZXR1cm4gIlByb3h5IjsKKwogICAgICAgICBpZiAoc3VidHlwZSA9PT0g Im5vZGUiKQogICAgICAgICAgICAgcmV0dXJuIHRoaXMuX25vZGVQcmV2aWV3KG9iaik7CiAKQEAg LTk1OCw4ICs5NjMsMTMgQEAgSW5qZWN0ZWRTY3JpcHQuUmVtb3RlT2JqZWN0ID0gZnVuY3Rpb24o b2JqZWN0LCBvYmplY3RHcm91cE5hbWUsIGZvcmNlVmFsdWVUeXBlLAogICAgICAgICB0aGlzLmNs YXNzTmFtZSA9IG9iamVjdC5uYW1lOwogICAgIH0KIAotICAgIGlmIChnZW5lcmF0ZVByZXZpZXcg JiYgdGhpcy50eXBlID09PSAib2JqZWN0IikKLSAgICAgICAgdGhpcy5wcmV2aWV3ID0gdGhpcy5f Z2VuZXJhdGVQcmV2aWV3KG9iamVjdCwgdW5kZWZpbmVkLCBjb2x1bW5OYW1lcyk7CisgICAgaWYg KGdlbmVyYXRlUHJldmlldyAmJiB0aGlzLnR5cGUgPT09ICJvYmplY3QiKSB7CisgICAgICAgIGlm IChzdWJ0eXBlID09PSAicHJveHkiKSB7CisgICAgICAgICAgICB0aGlzLnByZXZpZXcgPSB0aGlz Ll9nZW5lcmF0ZVByZXZpZXcoSW5qZWN0ZWRTY3JpcHRIb3N0LnByb3h5VGFyZ2V0VmFsdWUob2Jq ZWN0KSk7CisgICAgICAgICAgICB0aGlzLnByZXZpZXcubG9zc2xlc3MgPSBmYWxzZTsKKyAgICAg ICAgfSBlbHNlCisgICAgICAgICAgICB0aGlzLnByZXZpZXcgPSB0aGlzLl9nZW5lcmF0ZVByZXZp ZXcob2JqZWN0LCB1bmRlZmluZWQsIGNvbHVtbk5hbWVzKTsKKyAgICB9CiB9OwogCiBJbmplY3Rl ZFNjcmlwdC5SZW1vdGVPYmplY3QuY3JlYXRlT2JqZWN0UHJldmlld0ZvclZhbHVlID0gZnVuY3Rp b24odmFsdWUsIGdlbmVyYXRlUHJldmlldykKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9pbnNwZWN0b3IvSlNJbmplY3RlZFNjcmlwdEhvc3QuY3BwIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL2luc3BlY3Rvci9KU0luamVjdGVkU2NyaXB0SG9zdC5jcHAKaW5kZXggMmFjMGU5My4u NDk3MWVhOSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9KU0lu amVjdGVkU2NyaXB0SG9zdC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rv ci9KU0luamVjdGVkU2NyaXB0SG9zdC5jcHAKQEAgLTE2Nyw2ICsxNjcsOCBAQCBKU1ZhbHVlIEpT SW5qZWN0ZWRTY3JpcHRIb3N0OjpzdWJ0eXBlKEV4ZWNTdGF0ZSogZXhlYykKICAgICAgICAgcmV0 dXJuIGpzTm9udHJpdmlhbFN0cmluZyhleGVjLCBBU0NJSUxpdGVyYWwoImRhdGUiKSk7CiAgICAg aWYgKHZhbHVlLmluaGVyaXRzKFJlZ0V4cE9iamVjdDo6aW5mbygpKSkKICAgICAgICAgcmV0dXJu IGpzTm9udHJpdmlhbFN0cmluZyhleGVjLCBBU0NJSUxpdGVyYWwoInJlZ2V4cCIpKTsKKyAgICBp ZiAodmFsdWUuaW5oZXJpdHMoUHJveHlPYmplY3Q6OmluZm8oKSkpCisgICAgICAgIHJldHVybiBq c05vbnRyaXZpYWxTdHJpbmcoZXhlYywgQVNDSUlMaXRlcmFsKCJwcm94eSIpKTsKIAogICAgIGlm ICh2YWx1ZS5pbmhlcml0cyhKU01hcDo6aW5mbygpKSkKICAgICAgICAgcmV0dXJuIGpzTm9udHJp dmlhbFN0cmluZyhleGVjLCBBU0NJSUxpdGVyYWwoIm1hcCIpKTsKQEAgLTM3Nyw2ICszNzksMjMg QEAgSlNWYWx1ZSBKU0luamVjdGVkU2NyaXB0SG9zdDo6Z2V0SW50ZXJuYWxQcm9wZXJ0aWVzKEV4 ZWNTdGF0ZSogZXhlYykKICAgICByZXR1cm4ganNVbmRlZmluZWQoKTsKIH0KIAorSlNWYWx1ZSBK U0luamVjdGVkU2NyaXB0SG9zdDo6cHJveHlUYXJnZXRWYWx1ZShFeGVjU3RhdGUgKmV4ZWMpCit7 CisgICAgaWYgKGV4ZWMtPmFyZ3VtZW50Q291bnQoKSA8IDEpCisgICAgICAgIHJldHVybiBqc1Vu ZGVmaW5lZCgpOworCisgICAgSlNWYWx1ZSB2YWx1ZSA9IGV4ZWMtPnVuY2hlY2tlZEFyZ3VtZW50 KDApOworICAgIFByb3h5T2JqZWN0KiBwcm94eSA9IGpzRHluYW1pY0Nhc3Q8UHJveHlPYmplY3Qq Pih2YWx1ZSk7CisgICAgaWYgKCFwcm94eSkKKyAgICAgICAgcmV0dXJuIGpzVW5kZWZpbmVkKCk7 CisKKyAgICBKU09iamVjdCogdGFyZ2V0ID0gcHJveHktPnRhcmdldCgpOworICAgIHdoaWxlIChQ cm94eU9iamVjdCogcHJveHkgPSBqc0R5bmFtaWNDYXN0PFByb3h5T2JqZWN0Kj4odGFyZ2V0KSkK KyAgICAgICAgdGFyZ2V0ID0gcHJveHktPnRhcmdldCgpOworCisgICAgcmV0dXJuIHRhcmdldDsK K30KKwogSlNWYWx1ZSBKU0luamVjdGVkU2NyaXB0SG9zdDo6d2Vha01hcFNpemUoRXhlY1N0YXRl KiBleGVjKQogewogICAgIGlmIChleGVjLT5hcmd1bWVudENvdW50KCkgPCAxKQpkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9KU0luamVjdGVkU2NyaXB0SG9zdC5o IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9KU0luamVjdGVkU2NyaXB0SG9zdC5o CmluZGV4IDk5ZWZiZjguLjFiZDRkNzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9pbnNwZWN0b3IvSlNJbmplY3RlZFNjcmlwdEhvc3QuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvaW5zcGVjdG9yL0pTSW5qZWN0ZWRTY3JpcHRIb3N0LmgKQEAgLTY1LDYgKzY1LDcgQEAg cHVibGljOgogICAgIEpTQzo6SlNWYWx1ZSBzdWJ0eXBlKEpTQzo6RXhlY1N0YXRlKik7CiAgICAg SlNDOjpKU1ZhbHVlIGZ1bmN0aW9uRGV0YWlscyhKU0M6OkV4ZWNTdGF0ZSopOwogICAgIEpTQzo6 SlNWYWx1ZSBnZXRJbnRlcm5hbFByb3BlcnRpZXMoSlNDOjpFeGVjU3RhdGUqKTsKKyAgICBKU0M6 OkpTVmFsdWUgcHJveHlUYXJnZXRWYWx1ZShKU0M6OkV4ZWNTdGF0ZSopOwogICAgIEpTQzo6SlNW YWx1ZSB3ZWFrTWFwU2l6ZShKU0M6OkV4ZWNTdGF0ZSopOwogICAgIEpTQzo6SlNWYWx1ZSB3ZWFr TWFwRW50cmllcyhKU0M6OkV4ZWNTdGF0ZSopOwogICAgIEpTQzo6SlNWYWx1ZSB3ZWFrU2V0U2l6 ZShKU0M6OkV4ZWNTdGF0ZSopOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2lu c3BlY3Rvci9KU0luamVjdGVkU2NyaXB0SG9zdFByb3RvdHlwZS5jcHAgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvaW5zcGVjdG9yL0pTSW5qZWN0ZWRTY3JpcHRIb3N0UHJvdG90eXBlLmNwcAppbmRl eCBmN2YyMmZiLi41ZGE3ZTAwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5z cGVjdG9yL0pTSW5qZWN0ZWRTY3JpcHRIb3N0UHJvdG90eXBlLmNwcAorKysgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvaW5zcGVjdG9yL0pTSW5qZWN0ZWRTY3JpcHRIb3N0UHJvdG90eXBlLmNwcApA QCAtNDMsNiArNDMsNyBAQCBzdGF0aWMgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBqc0lu amVjdGVkU2NyaXB0SG9zdFByb3RvdHlwZUZ1bmN0aW9uRnVuY3Rpbwogc3RhdGljIEVuY29kZWRK U1ZhbHVlIEpTQ19IT1NUX0NBTEwganNJbmplY3RlZFNjcmlwdEhvc3RQcm90b3R5cGVGdW5jdGlv bkdldEludGVybmFsUHJvcGVydGllcyhFeGVjU3RhdGUqKTsKIHN0YXRpYyBFbmNvZGVkSlNWYWx1 ZSBKU0NfSE9TVF9DQUxMIGpzSW5qZWN0ZWRTY3JpcHRIb3N0UHJvdG90eXBlRnVuY3Rpb25JbnRl cm5hbENvbnN0cnVjdG9yTmFtZShFeGVjU3RhdGUqKTsKIHN0YXRpYyBFbmNvZGVkSlNWYWx1ZSBK U0NfSE9TVF9DQUxMIGpzSW5qZWN0ZWRTY3JpcHRIb3N0UHJvdG90eXBlRnVuY3Rpb25Jc0hUTUxB bGxDb2xsZWN0aW9uKEV4ZWNTdGF0ZSopOworc3RhdGljIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NU X0NBTEwganNJbmplY3RlZFNjcmlwdEhvc3RQcm90b3R5cGVGdW5jdGlvblByb3h5VGFyZ2V0VmFs dWUoRXhlY1N0YXRlKik7CiBzdGF0aWMgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBqc0lu amVjdGVkU2NyaXB0SG9zdFByb3RvdHlwZUZ1bmN0aW9uV2Vha01hcFNpemUoRXhlY1N0YXRlKik7 CiBzdGF0aWMgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBqc0luamVjdGVkU2NyaXB0SG9z dFByb3RvdHlwZUZ1bmN0aW9uV2Vha01hcEVudHJpZXMoRXhlY1N0YXRlKik7CiBzdGF0aWMgRW5j b2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBqc0luamVjdGVkU2NyaXB0SG9zdFByb3RvdHlwZUZ1 bmN0aW9uV2Vha1NldFNpemUoRXhlY1N0YXRlKik7CkBAIC02NSw2ICs2Niw3IEBAIHZvaWQgSlNJ bmplY3RlZFNjcmlwdEhvc3RQcm90b3R5cGU6OmZpbmlzaENyZWF0aW9uKFZNJiB2bSwgSlNHbG9i YWxPYmplY3QqIGdsb2JhCiAgICAgSlNDX05BVElWRV9GVU5DVElPTl9XSVRIT1VUX1RSQU5TSVRJ T04oImdldEludGVybmFsUHJvcGVydGllcyIsIGpzSW5qZWN0ZWRTY3JpcHRIb3N0UHJvdG90eXBl RnVuY3Rpb25HZXRJbnRlcm5hbFByb3BlcnRpZXMsIERvbnRFbnVtLCAxKTsKICAgICBKU0NfTkFU SVZFX0ZVTkNUSU9OX1dJVEhPVVRfVFJBTlNJVElPTigiaW50ZXJuYWxDb25zdHJ1Y3Rvck5hbWUi LCBqc0luamVjdGVkU2NyaXB0SG9zdFByb3RvdHlwZUZ1bmN0aW9uSW50ZXJuYWxDb25zdHJ1Y3Rv ck5hbWUsIERvbnRFbnVtLCAxKTsKICAgICBKU0NfTkFUSVZFX0ZVTkNUSU9OX1dJVEhPVVRfVFJB TlNJVElPTigiaXNIVE1MQWxsQ29sbGVjdGlvbiIsIGpzSW5qZWN0ZWRTY3JpcHRIb3N0UHJvdG90 eXBlRnVuY3Rpb25Jc0hUTUxBbGxDb2xsZWN0aW9uLCBEb250RW51bSwgMSk7CisgICAgSlNDX05B VElWRV9GVU5DVElPTl9XSVRIT1VUX1RSQU5TSVRJT04oInByb3h5VGFyZ2V0VmFsdWUiLCBqc0lu amVjdGVkU2NyaXB0SG9zdFByb3RvdHlwZUZ1bmN0aW9uUHJveHlUYXJnZXRWYWx1ZSwgRG9udEVu dW0sIDEpOwogICAgIEpTQ19OQVRJVkVfRlVOQ1RJT05fV0lUSE9VVF9UUkFOU0lUSU9OKCJ3ZWFr TWFwU2l6ZSIsIGpzSW5qZWN0ZWRTY3JpcHRIb3N0UHJvdG90eXBlRnVuY3Rpb25XZWFrTWFwU2l6 ZSwgRG9udEVudW0sIDEpOwogICAgIEpTQ19OQVRJVkVfRlVOQ1RJT05fV0lUSE9VVF9UUkFOU0lU SU9OKCJ3ZWFrTWFwRW50cmllcyIsIGpzSW5qZWN0ZWRTY3JpcHRIb3N0UHJvdG90eXBlRnVuY3Rp b25XZWFrTWFwRW50cmllcywgRG9udEVudW0sIDEpOwogICAgIEpTQ19OQVRJVkVfRlVOQ1RJT05f V0lUSE9VVF9UUkFOU0lUSU9OKCJ3ZWFrU2V0U2l6ZSIsIGpzSW5qZWN0ZWRTY3JpcHRIb3N0UHJv dG90eXBlRnVuY3Rpb25XZWFrU2V0U2l6ZSwgRG9udEVudW0sIDEpOwpAQCAtMTE0LDYgKzExNiwx OSBAQCBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGpzSW5qZWN0ZWRTY3JpcHRIb3N0UHJv dG90eXBlRnVuY3Rpb25Jc0hUTUxBbGxDb2xsZQogICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUo Y2FzdGVkVGhpcy0+aXNIVE1MQWxsQ29sbGVjdGlvbihleGVjKSk7CiB9CiAKK0VuY29kZWRKU1Zh bHVlIEpTQ19IT1NUX0NBTEwganNJbmplY3RlZFNjcmlwdEhvc3RQcm90b3R5cGVGdW5jdGlvblBy b3h5VGFyZ2V0VmFsdWUoRXhlY1N0YXRlKiBleGVjKQoreworICAgIFZNJiB2bSA9IGV4ZWMtPnZt KCk7CisgICAgYXV0byBzY29wZSA9IERFQ0xBUkVfVEhST1dfU0NPUEUodm0pOworCisgICAgSlNW YWx1ZSB0aGlzVmFsdWUgPSBleGVjLT50aGlzVmFsdWUoKTsKKyAgICBKU0luamVjdGVkU2NyaXB0 SG9zdCogY2FzdGVkVGhpcyA9IGpzRHluYW1pY0Nhc3Q8SlNJbmplY3RlZFNjcmlwdEhvc3QqPih0 aGlzVmFsdWUpOworICAgIGlmICghY2FzdGVkVGhpcykKKyAgICAgICAgcmV0dXJuIHRocm93Vk1U eXBlRXJyb3IoZXhlYywgc2NvcGUpOworCisgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShjYXN0 ZWRUaGlzLT5wcm94eVRhcmdldFZhbHVlKGV4ZWMpKTsKK30KKwogRW5jb2RlZEpTVmFsdWUgSlND X0hPU1RfQ0FMTCBqc0luamVjdGVkU2NyaXB0SG9zdFByb3RvdHlwZUZ1bmN0aW9uV2Vha01hcFNp emUoRXhlY1N0YXRlKiBleGVjKQogewogICAgIFZNJiB2bSA9IGV4ZWMtPnZtKCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL1NjcmlwdEFyZ3VtZW50cy5jcHAg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL1NjcmlwdEFyZ3VtZW50cy5jcHAKaW5k ZXggMWJlYjMzMS4uNmFjNmM0ZSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2lu c3BlY3Rvci9TY3JpcHRBcmd1bWVudHMuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9p bnNwZWN0b3IvU2NyaXB0QXJndW1lbnRzLmNwcApAQCAtMzMsNiArMzMsNyBAQAogI2luY2x1ZGUg IlNjcmlwdEFyZ3VtZW50cy5oIgogCiAjaW5jbHVkZSAiSlNDSW5saW5lcy5oIgorI2luY2x1ZGUg IlByb3h5T2JqZWN0LmgiCiAjaW5jbHVkZSAiU2NyaXB0VmFsdWUuaCIKIAogbmFtZXNwYWNlIElu c3BlY3RvciB7CkBAIC04Niw2ICs4NywxMiBAQCBib29sIFNjcmlwdEFyZ3VtZW50czo6Z2V0Rmly c3RBcmd1bWVudEFzU3RyaW5nKFN0cmluZyYgcmVzdWx0KQogICAgICAgICByZXR1cm4gZmFsc2U7 CiAgICAgfQogCisgICAgSlNDOjpKU1ZhbHVlIHZhbHVlID0gYXJndW1lbnRBdCgwKS5qc1ZhbHVl KCk7CisgICAgaWYgKEpTQzo6anNEeW5hbWljQ2FzdDxKU0M6OlByb3h5T2JqZWN0Kj4odmFsdWUp KSB7CisgICAgICAgIHJlc3VsdCA9IEFTQ0lJTGl0ZXJhbCgiW29iamVjdCBQcm94eV0iKTsKKyAg ICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorCiAgICAgcmVzdWx0ID0gYXJndW1lbnRBdCgwKS50 b1N0cmluZyhnbG9iYWxTdGF0ZSgpKTsKICAgICByZXR1cm4gdHJ1ZTsKIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcHJvdG9jb2wvUnVudGltZS5qc29uIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9wcm90b2NvbC9SdW50aW1lLmpzb24KaW5k ZXggMDZkNjVjMWYuLjhmY2ZhOWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9p bnNwZWN0b3IvcHJvdG9jb2wvUnVudGltZS5qc29uCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9pbnNwZWN0b3IvcHJvdG9jb2wvUnVudGltZS5qc29uCkBAIC0xMyw3ICsxMyw3IEBACiAgICAg ICAgICAgICAiZGVzY3JpcHRpb24iOiAiTWlycm9yIG9iamVjdCByZWZlcmVuY2luZyBvcmlnaW5h bCBKYXZhU2NyaXB0IG9iamVjdC4iLAogICAgICAgICAgICAgInByb3BlcnRpZXMiOiBbCiAgICAg ICAgICAgICAgICAgeyAibmFtZSI6ICJ0eXBlIiwgInR5cGUiOiAic3RyaW5nIiwgImVudW0iOiBb Im9iamVjdCIsICJmdW5jdGlvbiIsICJ1bmRlZmluZWQiLCAic3RyaW5nIiwgIm51bWJlciIsICJi b29sZWFuIiwgInN5bWJvbCJdLCAiZGVzY3JpcHRpb24iOiAiT2JqZWN0IHR5cGUuIiB9LAotICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAic3VidHlwZSIsICJ0eXBlIjogInN0cmluZyIsICJvcHRp b25hbCI6IHRydWUsICJlbnVtIjogWyJhcnJheSIsICJudWxsIiwgIm5vZGUiLCAicmVnZXhwIiwg ImRhdGUiLCAiZXJyb3IiLCAibWFwIiwgInNldCIsICJ3ZWFrbWFwIiwgIndlYWtzZXQiLCAiaXRl cmF0b3IiLCAiY2xhc3MiXSwgImRlc2NyaXB0aW9uIjogIk9iamVjdCBzdWJ0eXBlIGhpbnQuIFNw ZWNpZmllZCBmb3IgPGNvZGU+b2JqZWN0PC9jb2RlPiA8Y29kZT5mdW5jdGlvbjwvY29kZT4gKGZv ciBjbGFzcykgdHlwZSB2YWx1ZXMgb25seS4iIH0sCisgICAgICAgICAgICAgICAgeyAibmFtZSI6 ICJzdWJ0eXBlIiwgInR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImVudW0iOiBb ImFycmF5IiwgIm51bGwiLCAibm9kZSIsICJyZWdleHAiLCAiZGF0ZSIsICJlcnJvciIsICJtYXAi LCAic2V0IiwgIndlYWttYXAiLCAid2Vha3NldCIsICJpdGVyYXRvciIsICJjbGFzcyIsICJwcm94 eSJdLCAiZGVzY3JpcHRpb24iOiAiT2JqZWN0IHN1YnR5cGUgaGludC4gU3BlY2lmaWVkIGZvciA8 Y29kZT5vYmplY3Q8L2NvZGU+IDxjb2RlPmZ1bmN0aW9uPC9jb2RlPiAoZm9yIGNsYXNzKSB0eXBl IHZhbHVlcyBvbmx5LiIgfSwKICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImNsYXNzTmFtZSIs ICJ0eXBlIjogInN0cmluZyIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJPYmpl Y3QgY2xhc3MgKGNvbnN0cnVjdG9yKSBuYW1lLiBTcGVjaWZpZWQgZm9yIDxjb2RlPm9iamVjdDwv Y29kZT4gdHlwZSB2YWx1ZXMgb25seS4iIH0sCiAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ2 YWx1ZSIsICJ0eXBlIjogImFueSIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJS ZW1vdGUgb2JqZWN0IHZhbHVlIChpbiBjYXNlIG9mIHByaW1pdGl2ZSB2YWx1ZXMgb3IgSlNPTiB2 YWx1ZXMgaWYgaXQgd2FzIHJlcXVlc3RlZCkuIiB9LAogICAgICAgICAgICAgICAgIHsgIm5hbWUi OiAiZGVzY3JpcHRpb24iLCAidHlwZSI6ICJzdHJpbmciLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVz Y3JpcHRpb24iOiAiU3RyaW5nIHJlcHJlc2VudGF0aW9uIG9mIHRoZSBvYmplY3QuIiB9LApAQCAt MjksNyArMjksNyBAQAogICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIk9iamVjdCBjb250YWlu aW5nIGFiYnJldmlhdGVkIHJlbW90ZSBvYmplY3QgdmFsdWUuIiwKICAgICAgICAgICAgICJwcm9w ZXJ0aWVzIjogWwogICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidHlwZSIsICJ0eXBlIjogInN0 cmluZyIsICJlbnVtIjogWyJvYmplY3QiLCAiZnVuY3Rpb24iLCAidW5kZWZpbmVkIiwgInN0cmlu ZyIsICJudW1iZXIiLCAiYm9vbGVhbiIsICJzeW1ib2wiXSwgImRlc2NyaXB0aW9uIjogIk9iamVj dCB0eXBlLiIgfSwKLSAgICAgICAgICAgICAgICB7ICJuYW1lIjogInN1YnR5cGUiLCAidHlwZSI6 ICJzdHJpbmciLCAib3B0aW9uYWwiOiB0cnVlLCAiZW51bSI6IFsiYXJyYXkiLCAibnVsbCIsICJu b2RlIiwgInJlZ2V4cCIsICJkYXRlIiwgImVycm9yIiwgIm1hcCIsICJzZXQiLCAid2Vha21hcCIs ICJ3ZWFrc2V0IiwgIml0ZXJhdG9yIiwgImNsYXNzIl0sICJkZXNjcmlwdGlvbiI6ICJPYmplY3Qg c3VidHlwZSBoaW50LiBTcGVjaWZpZWQgZm9yIDxjb2RlPm9iamVjdDwvY29kZT4gdHlwZSB2YWx1 ZXMgb25seS4iIH0sCisgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzdWJ0eXBlIiwgInR5cGUi OiAic3RyaW5nIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImVudW0iOiBbImFycmF5IiwgIm51bGwiLCAi bm9kZSIsICJyZWdleHAiLCAiZGF0ZSIsICJlcnJvciIsICJtYXAiLCAic2V0IiwgIndlYWttYXAi LCAid2Vha3NldCIsICJpdGVyYXRvciIsICJjbGFzcyIsICJwcm94eSJdLCAiZGVzY3JpcHRpb24i OiAiT2JqZWN0IHN1YnR5cGUgaGludC4gU3BlY2lmaWVkIGZvciA8Y29kZT5vYmplY3Q8L2NvZGU+ IHR5cGUgdmFsdWVzIG9ubHkuIiB9LAogICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiZGVzY3Jp cHRpb24iLCAidHlwZSI6ICJzdHJpbmciLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24i OiAiU3RyaW5nIHJlcHJlc2VudGF0aW9uIG9mIHRoZSBvYmplY3QuIiB9LAogICAgICAgICAgICAg ICAgIHsgIm5hbWUiOiAibG9zc2xlc3MiLCAidHlwZSI6ICJib29sZWFuIiwgImRlc2NyaXB0aW9u IjogIkRldGVybWluZXMgd2hldGhlciBwcmV2aWV3IGlzIGxvc3NsZXNzIChjb250YWlucyBhbGwg aW5mb3JtYXRpb24gb2YgdGhlIG9yaWdpbmFsIG9iamVjdCkuIiB9LAogICAgICAgICAgICAgICAg IHsgIm5hbWUiOiAib3ZlcmZsb3ciLCAidHlwZSI6ICJib29sZWFuIiwgIm9wdGlvbmFsIjogdHJ1 ZSwgImRlc2NyaXB0aW9uIjogIlRydWUgaWZmIHNvbWUgb2YgdGhlIHByb3BlcnRpZXMgb2YgdGhl IG9yaWdpbmFsIGRpZCBub3QgZml0LiIgfSwKQEAgLTQ0LDcgKzQ0LDcgQEAKICAgICAgICAgICAg ICJwcm9wZXJ0aWVzIjogWwogICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibmFtZSIsICJ0eXBl IjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJQcm9wZXJ0eSBuYW1lLiIgfSwKICAgICAgICAg ICAgICAgICB7ICJuYW1lIjogInR5cGUiLCAidHlwZSI6ICJzdHJpbmciLCAiZW51bSI6IFsib2Jq ZWN0IiwgImZ1bmN0aW9uIiwgInVuZGVmaW5lZCIsICJzdHJpbmciLCAibnVtYmVyIiwgImJvb2xl YW4iLCAic3ltYm9sIiwgImFjY2Vzc29yIl0sICJkZXNjcmlwdGlvbiI6ICJPYmplY3QgdHlwZS4i IH0sCi0gICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzdWJ0eXBlIiwgInR5cGUiOiAic3RyaW5n IiwgIm9wdGlvbmFsIjogdHJ1ZSwgImVudW0iOiBbImFycmF5IiwgIm51bGwiLCAibm9kZSIsICJy ZWdleHAiLCAiZGF0ZSIsICJlcnJvciIsICJtYXAiLCAic2V0IiwgIndlYWttYXAiLCAid2Vha3Nl dCIsICJpdGVyYXRvciIsICJjbGFzcyJdLCAiZGVzY3JpcHRpb24iOiAiT2JqZWN0IHN1YnR5cGUg aGludC4gU3BlY2lmaWVkIGZvciA8Y29kZT5vYmplY3Q8L2NvZGU+IHR5cGUgdmFsdWVzIG9ubHku IiB9LAorICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic3VidHlwZSIsICJ0eXBlIjogInN0cmlu ZyIsICJvcHRpb25hbCI6IHRydWUsICJlbnVtIjogWyJhcnJheSIsICJudWxsIiwgIm5vZGUiLCAi cmVnZXhwIiwgImRhdGUiLCAiZXJyb3IiLCAibWFwIiwgInNldCIsICJ3ZWFrbWFwIiwgIndlYWtz ZXQiLCAiaXRlcmF0b3IiLCAiY2xhc3MiLCAicHJveHkiXSwgImRlc2NyaXB0aW9uIjogIk9iamVj dCBzdWJ0eXBlIGhpbnQuIFNwZWNpZmllZCBmb3IgPGNvZGU+b2JqZWN0PC9jb2RlPiB0eXBlIHZh bHVlcyBvbmx5LiIgfSwKICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInZhbHVlIiwgInR5cGUi OiAic3RyaW5nIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIlVzZXItZnJpZW5k bHkgcHJvcGVydHkgdmFsdWUgc3RyaW5nLiIgfSwKICAgICAgICAgICAgICAgICB7ICJuYW1lIjog InZhbHVlUHJldmlldyIsICIkcmVmIjogIk9iamVjdFByZXZpZXciLCAib3B0aW9uYWwiOiB0cnVl LCAiZGVzY3JpcHRpb24iOiAiTmVzdGVkIHZhbHVlIHByZXZpZXcuIiB9LAogICAgICAgICAgICAg ICAgIHsgIm5hbWUiOiAiaW50ZXJuYWwiLCAidHlwZSI6ICJib29sZWFuIiwgIm9wdGlvbmFsIjog dHJ1ZSwgImRlc2NyaXB0aW9uIjogIlRydWUgaWYgdGhpcyBpcyBhbiBpbnRlcm5hbCBwcm9wZXJ0 eS4iIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGVkMDI4YzMuLmVjMDM3YzcgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE2LTEwLTEyICBKb3NlcGgg UGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rvcjog SW1wcm92ZSBzdXBwb3J0IGZvciBsb2dnaW5nIFByb3h5IG9iamVjdHMgaW4gY29uc29sZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYzMzIzCisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS8yODQzMjU1Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ29uc29sZU1lc3Nh Z2VWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlVmlldy5wcm90 b3R5cGUuX2Zvcm1hdFBhcmFtZXRlcik6CisgICAgICAgIFRyZWF0IGEgUHJveHkgbGlrZSBhbnkg b3RoZXIgb2JqZWN0LgorCiAyMDE2LTEwLTExICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0Bh cHBsZS5jb20+CiAKICAgICAgICAgRW1pdCBEZWJ1Z0hvb2tzIHVuaWZvcm1seSB3aXRoIHBhdXNl IGxvY2F0aW9ucyBpbnN0ZWFkIG9mIGhhdmluZyBzZXBhcmF0ZSBwYXVzZSBsb2NhdGlvbnMgYW5k IG9wX2RlYnVnIGVtaXRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9Db25zb2xlTWVzc2FnZVZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9Db25zb2xlTWVzc2FnZVZpZXcuanMKaW5kZXggZjAxZGMx Yi4uNjViZjUxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvQ29uc29sZU1lc3NhZ2VWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnNvbGVNZXNzYWdlVmlldy5qcwpAQCAtNTM2LDYgKzUz Niw3IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZVZpZXcgPSBjbGFzcyBDb25zb2xlTWVz c2FnZVZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuCiAgICAgICAgICAgICAid2Vha3NldCI6IHRo aXMuX2Zvcm1hdFBhcmFtZXRlckFzT2JqZWN0LAogICAgICAgICAgICAgIml0ZXJhdG9yIjogdGhp cy5fZm9ybWF0UGFyYW1ldGVyQXNPYmplY3QsCiAgICAgICAgICAgICAiY2xhc3MiOiB0aGlzLl9m b3JtYXRQYXJhbWV0ZXJBc09iamVjdCwKKyAgICAgICAgICAgICJwcm94eSI6IHRoaXMuX2Zvcm1h dFBhcmFtZXRlckFzT2JqZWN0LAogICAgICAgICAgICAgImFycmF5IjogdGhpcy5fZm9ybWF0UGFy YW1ldGVyQXNBcnJheSwKICAgICAgICAgICAgICJub2RlIjogdGhpcy5fZm9ybWF0UGFyYW1ldGVy QXNOb2RlLAogICAgICAgICAgICAgInN0cmluZyI6IHRoaXMuX2Zvcm1hdFBhcmFtZXRlckFzU3Ry aW5nLAo= 291372 2016-10-12 11:25:58 -0700 2016-10-12 11:48:17 -0700 [PATCH] Proposed Fix proxy-2.patch text/plain 27844 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkNTE5MzEwLi42OWRiNjAxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTYtMTAt MTIgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIg SW5zcGVjdG9yOiBJbXByb3ZlIHN1cHBvcnQgZm9yIGxvZ2dpbmcgUHJveHkgb2JqZWN0cyBpbiBj b25zb2xlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NjMzMjMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI4NDMyNTUzPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2NvbnNvbGUvY29u c29sZS1sb2ctcHJveHktZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBpbnNwZWN0b3Iv Y29uc29sZS9jb25zb2xlLWxvZy1wcm94eS5odG1sOiBBZGRlZC4KKyAgICAgICAgQWRkIGEgdGVz dCBzcGVjaWZpYyB0byBjb25zb2xlIGxvZ3Mgb2YgUHJveHkgb2JqZWN0cyB0byBlbnN1cmUgdGhl IGdldAorICAgICAgICB0cmFwIGlzIG5vdCB1c2VkIGluIGRpZmZlcmVudCBjYXNlcy4KKworICAg ICAgICAqIGluc3BlY3Rvci9tb2RlbC9yZW1vdGUtb2JqZWN0LWV4cGVjdGVkLnR4dDoKKyAgICAg ICAgKiBpbnNwZWN0b3IvbW9kZWwvcmVtb3RlLW9iamVjdC5odG1sOgorICAgICAgICAqIHBsYXRm b3JtL21hYy9pbnNwZWN0b3IvbW9kZWwvcmVtb3RlLW9iamVjdC1leHBlY3RlZC50eHQ6CisgICAg ICAgIFVwZGF0ZSByZXN1bHRzIGZvciBQcm94eSBvYmplY3RzIGFuZCBpbmNsdWRlIGEgdGVzdCBm b3IgYSBtdWx0aS1sZXZlbAorICAgICAgICBQcm94eSBvYmplY3QsIHdoaWNoIHNob3VsZCBwcmV2 aWV3IHRoZSB0YXJnZXQuCisKIDIwMTYtMTAtMTEgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJv QGFwcGxlLmNvbT4KIAogICAgICAgICBFbWl0IERlYnVnSG9va3MgdW5pZm9ybWx5IHdpdGggcGF1 c2UgbG9jYXRpb25zIGluc3RlYWQgb2YgaGF2aW5nIHNlcGFyYXRlIHBhdXNlIGxvY2F0aW9ucyBh bmQgb3BfZGVidWcgZW1pdHMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25z b2xlL2NvbnNvbGUtbG9nLXByb3h5LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rv ci9jb25zb2xlL2NvbnNvbGUtbG9nLXByb3h5LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwLi40OTdhYThlCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL2NvbnNvbGUvY29uc29sZS1sb2ctcHJveHktZXhwZWN0ZWQudHh0CkBAIC0w LDAgKzEsMTQgQEAKK0NPTlNPTEUgTUVTU0FHRTogbGluZSAxNjogW29iamVjdCBQcm94eV0KK0NP TlNPTEUgTUVTU0FHRTogbGluZSAzMDogMAorQ09OU09MRSBNRVNTQUdFOiBsaW5lIDMxOiBbb2Jq ZWN0IFByb3h5XQorQ09OU09MRSBNRVNTQUdFOiBsaW5lIDMyOiAxCitUZXN0cyBmb3IgdGhlIGNv bnNvbGUubG9nIHdpdGggUHJveHkgb2JqZWN0cy4KKworCis9PSBSdW5uaW5nIHRlc3Qgc3VpdGU6 IGNvbnNvbGUubG9nLnByb3h5CistLSBSdW5uaW5nIHRlc3QgY2FzZTogQmFzaWNQcm94eUxvZwor UEFTUzogTG9nZ2luZyBQcm94eSBvYmplY3RzIHNob3VsZCBub3QgaGF2ZSB0cmlnZ2VyZWQgZ2V0 IHRyYXAuCisKKy0tIFJ1bm5pbmcgdGVzdCBjYXNlOiBBdm9pZFRyYXBXaGVuQ2hlY2tpbmdDb25z b2xlUmVwZWF0CitQQVNTOiBMb2dnaW5nIFByb3h5IG9iamVjdHMgYW5kIHByaW1pdGl2ZXMgc2hv dWxkIG5vdCBoYXZlIHRyaWdnZXJlZCBnZXQgdHJhcC4KKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL2NvbnNvbGUvY29uc29sZS1sb2ctcHJveHkuaHRtbCBiL0xheW91dFRlc3Rz L2luc3BlY3Rvci9jb25zb2xlL2NvbnNvbGUtbG9nLXByb3h5Lmh0bWwKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMC4uZTcwOWQ4YgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl c3RzL2luc3BlY3Rvci9jb25zb2xlL2NvbnNvbGUtbG9nLXByb3h5Lmh0bWwKQEAgLTAsMCArMSw3 NCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdCBzcmM9Ii4uLy4u L2h0dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291cmNlcy9pbnNwZWN0b3ItdGVzdC5qcyI+PC9zY3Jp cHQ+Cis8c2NyaXB0PgorZnVuY3Rpb24gdHJpZ2dlclByb3h5Q29uc29sZUxvZygpIHsKKyAgICB3 aW5kb3cuYWNjZXNzZWRIYW5kbGVyR2V0ID0gZmFsc2U7CisKKyAgICBsZXQgcHJveHkgPSBuZXcg UHJveHkoe2ZvbzogMX0sIHsKKyAgICAgICAgZ2V0KHRhcmdldCwgbmFtZSwgcmVjZWl2ZXIpIHsK KyAgICAgICAgICAgIHdpbmRvdy5hY2Nlc3NlZEhhbmRsZXJHZXQgPSB0cnVlOworICAgICAgICAg ICAgcmV0dXJuIHRhcmdldFtuYW1lXTsKKyAgICAgICAgfQorICAgIH0pOworCisgICAgY29uc29s ZS5sb2cocHJveHkpOworfQorCitmdW5jdGlvbiB0cmlnZ2VyUHJveHlBbmRQcmltaXRpdmVDb25z b2xlTG9nKCkgeworICAgIHdpbmRvdy5hY2Nlc3NlZEhhbmRsZXJHZXQgPSBmYWxzZTsKKworICAg IGxldCBwcm94eSA9IG5ldyBQcm94eSh7YmFyOiAyfSwgeworICAgICAgICBnZXQodGFyZ2V0LCBu YW1lLCByZWNlaXZlcikgeworICAgICAgICAgICAgd2luZG93LmFjY2Vzc2VkSGFuZGxlckdldCA9 IHRydWU7CisgICAgICAgICAgICBjb25zb2xlLmxvZygxKTsKKyAgICAgICAgICAgIHJldHVybiB0 YXJnZXRbbmFtZV07CisgICAgICAgIH0KKyAgICB9KTsKKworICAgIGNvbnNvbGUubG9nKDApOwor ICAgIGNvbnNvbGUubG9nKHByb3h5KTsKKyAgICBjb25zb2xlLmxvZygxKTsKK30KKworZnVuY3Rp b24gdGVzdCgpCit7CisgICAgbGV0IHN1aXRlID0gSW5zcGVjdG9yVGVzdC5jcmVhdGVBc3luY1N1 aXRlKCJjb25zb2xlLmxvZy5wcm94eSIpOworCisgICAgc3VpdGUuYWRkVGVzdENhc2UoeworICAg ICAgICBuYW1lOiAiQmFzaWNQcm94eUxvZyIsCisgICAgICAgIGRlc2NyaXB0aW9uOiAiY29uc29s ZS5sb2cgb2YgYSBQcm94eSBvYmplY3Qgc2hvdWxkIG5vdCB0cmlnZ2VyIHByb3h5IGdldCB0cmFw LiIsCisgICAgICAgIHRlc3QocmVzb2x2ZSwgcmVqZWN0KSB7CisgICAgICAgICAgICBJbnNwZWN0 b3JUZXN0LmV2YWx1YXRlSW5QYWdlKCJ0cmlnZ2VyUHJveHlDb25zb2xlTG9nKCkiLCAoKSA9PiB7 CisgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5ldmFsdWF0ZUluUGFnZSgid2luZG93LmFj Y2Vzc2VkSGFuZGxlckdldCIsIChlcnJvciwgcmVzdWx0KSA9PiB7CisgICAgICAgICAgICAgICAg ICAgIGxldCB2YWx1ZSA9IFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QuZnJvbVBheWxvYWQocmVz dWx0KS52YWx1ZTsKKyAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RFcXVh bCh2YWx1ZSwgZmFsc2UsICJMb2dnaW5nIFByb3h5IG9iamVjdHMgc2hvdWxkIG5vdCBoYXZlIHRy aWdnZXJlZCBnZXQgdHJhcC4iKTsKKyAgICAgICAgICAgICAgICAgICAgcmVzb2x2ZSgpOworICAg ICAgICAgICAgICAgIH0pOworICAgICAgICAgICAgfSk7CisgICAgICAgIH0KKyAgICB9KTsKKwor ICAgIHN1aXRlLmFkZFRlc3RDYXNlKHsKKyAgICAgICAgbmFtZTogIkF2b2lkVHJhcFdoZW5DaGVj a2luZ0NvbnNvbGVSZXBlYXQiLAorICAgICAgICBkZXNjcmlwdGlvbjogImNvbnNvbGUubG9nIHJl cGVhdCBjaGVja2luZyBzaG91bGQgbm90IHRyaWdnZXIgcHJveHkgZ2V0IHRyYXAuIiwKKyAgICAg ICAgdGVzdChyZXNvbHZlLCByZWplY3QpIHsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXZh bHVhdGVJblBhZ2UoInRyaWdnZXJQcm94eUFuZFByaW1pdGl2ZUNvbnNvbGVMb2coKSIsICgpID0+ IHsKKyAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV2YWx1YXRlSW5QYWdlKCJ3aW5kb3cu YWNjZXNzZWRIYW5kbGVyR2V0IiwgKGVycm9yLCByZXN1bHQpID0+IHsKKyAgICAgICAgICAgICAg ICAgICAgbGV0IHZhbHVlID0gV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdC5mcm9tUGF5bG9hZChy ZXN1bHQpLnZhbHVlOworICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEVx dWFsKHZhbHVlLCBmYWxzZSwgIkxvZ2dpbmcgUHJveHkgb2JqZWN0cyBhbmQgcHJpbWl0aXZlcyBz aG91bGQgbm90IGhhdmUgdHJpZ2dlcmVkIGdldCB0cmFwLiIpOworICAgICAgICAgICAgICAgICAg ICByZXNvbHZlKCk7CisgICAgICAgICAgICAgICAgfSk7CisgICAgICAgICAgICB9KTsKKyAgICAg ICAgfQorICAgIH0pOworCisgICAgc3VpdGUucnVuVGVzdENhc2VzQW5kRmluaXNoKCk7Cit9Cis8 L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IG9ubG9hZD0icnVuVGVzdCgpIj4KKzxwPlRlc3RzIGZv ciB0aGUgY29uc29sZS5sb2cgd2l0aCBQcm94eSBvYmplY3RzLjwvcD4KKzwvYm9keT4KKzwvaHRt bD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9tb2RlbC9yZW1vdGUtb2JqZWN0 LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9tb2RlbC9yZW1vdGUtb2JqZWN0 LWV4cGVjdGVkLnR4dAppbmRleCBkYWVjNGYwLi42MDAwNjhiIDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9pbnNwZWN0b3IvbW9kZWwvcmVtb3RlLW9iamVjdC1leHBlY3RlZC50eHQKKysrIGIvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL21vZGVsL3JlbW90ZS1vYmplY3QtZXhwZWN0ZWQudHh0CkBAIC00 NjU5LDY0ICs0NjU5LDYwIEBAIEVYUFJFU1NJT046IFByb21pc2UucmVzb2x2ZSh7cmVzdWx0OjF9 KQogRVhQUkVTU0lPTjogbmV3IFByb3h5KHt4OjEsIHk6MX0sIHtoYW5kbGVyOiB0cnVlfSkKIHsK ICAgIl90eXBlIjogIm9iamVjdCIsCisgICJfc3VidHlwZSI6ICJwcm94eSIsCiAgICJfb2JqZWN0 SWQiOiAiPGZpbHRlcmVkPiIsCi0gICJfZGVzY3JpcHRpb24iOiAiUHJveHlPYmplY3QiLAorICAi X2Rlc2NyaXB0aW9uIjogIlByb3h5IiwKICAgIl9wcmV2aWV3IjogewogICAgICJfbGlzdGVuZXJz IjogbnVsbCwKICAgICAiX3R5cGUiOiAib2JqZWN0IiwKLSAgICAiX2Rlc2NyaXB0aW9uIjogIlBy b3h5T2JqZWN0IiwKLSAgICAiX2xvc3NsZXNzIjogdHJ1ZSwKKyAgICAiX3N1YnR5cGUiOiAicHJv eHkiLAorICAgICJfZGVzY3JpcHRpb24iOiAiUHJveHkiLAorICAgICJfbG9zc2xlc3MiOiBmYWxz ZSwKICAgICAiX292ZXJmbG93IjogZmFsc2UsCiAgICAgIl9wcm9wZXJ0aWVzIjogWwogICAgICAg ewogICAgICAgICAiX2xpc3RlbmVycyI6IG51bGwsCi0gICAgICAgICJfbmFtZSI6ICJ0YXJnZXQi LAotICAgICAgICAiX3R5cGUiOiAib2JqZWN0IiwKLSAgICAgICAgIl92YWx1ZVByZXZpZXciOiB7 Ci0gICAgICAgICAgIl9saXN0ZW5lcnMiOiBudWxsLAotICAgICAgICAgICJfdHlwZSI6ICJvYmpl Y3QiLAotICAgICAgICAgICJfZGVzY3JpcHRpb24iOiAiT2JqZWN0IiwKLSAgICAgICAgICAiX2xv c3NsZXNzIjogdHJ1ZSwKLSAgICAgICAgICAiX292ZXJmbG93IjogZmFsc2UsCi0gICAgICAgICAg Il9wcm9wZXJ0aWVzIjogWwotICAgICAgICAgICAgewotICAgICAgICAgICAgICAiX2xpc3RlbmVy cyI6IG51bGwsCi0gICAgICAgICAgICAgICJfbmFtZSI6ICJ4IiwKLSAgICAgICAgICAgICAgIl90 eXBlIjogIm51bWJlciIsCi0gICAgICAgICAgICAgICJfdmFsdWUiOiAiMSIKLSAgICAgICAgICAg IH0sCi0gICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICJfbGlzdGVuZXJzIjogbnVsbCwKLSAg ICAgICAgICAgICAgIl9uYW1lIjogInkiLAotICAgICAgICAgICAgICAiX3R5cGUiOiAibnVtYmVy IiwKLSAgICAgICAgICAgICAgIl92YWx1ZSI6ICIxIgotICAgICAgICAgICAgfQotICAgICAgICAg IF0sCi0gICAgICAgICAgIl9lbnRyaWVzIjogbnVsbAotICAgICAgICB9LAotICAgICAgICAiX2lu dGVybmFsIjogdHJ1ZQorICAgICAgICAiX25hbWUiOiAieCIsCisgICAgICAgICJfdHlwZSI6ICJu dW1iZXIiLAorICAgICAgICAiX3ZhbHVlIjogIjEiCiAgICAgICB9LAogICAgICAgewogICAgICAg ICAiX2xpc3RlbmVycyI6IG51bGwsCi0gICAgICAgICJfbmFtZSI6ICJoYW5kbGVyIiwKLSAgICAg ICAgIl90eXBlIjogIm9iamVjdCIsCi0gICAgICAgICJfdmFsdWVQcmV2aWV3IjogewotICAgICAg ICAgICJfbGlzdGVuZXJzIjogbnVsbCwKLSAgICAgICAgICAiX3R5cGUiOiAib2JqZWN0IiwKLSAg ICAgICAgICAiX2Rlc2NyaXB0aW9uIjogIk9iamVjdCIsCi0gICAgICAgICAgIl9sb3NzbGVzcyI6 IHRydWUsCi0gICAgICAgICAgIl9vdmVyZmxvdyI6IGZhbHNlLAotICAgICAgICAgICJfcHJvcGVy dGllcyI6IFsKLSAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgIl9saXN0ZW5lcnMiOiBudWxs LAotICAgICAgICAgICAgICAiX25hbWUiOiAiaGFuZGxlciIsCi0gICAgICAgICAgICAgICJfdHlw ZSI6ICJib29sZWFuIiwKLSAgICAgICAgICAgICAgIl92YWx1ZSI6ICJ0cnVlIgotICAgICAgICAg ICAgfQotICAgICAgICAgIF0sCi0gICAgICAgICAgIl9lbnRyaWVzIjogbnVsbAotICAgICAgICB9 LAotICAgICAgICAiX2ludGVybmFsIjogdHJ1ZQorICAgICAgICAiX25hbWUiOiAieSIsCisgICAg ICAgICJfdHlwZSI6ICJudW1iZXIiLAorICAgICAgICAiX3ZhbHVlIjogIjEiCisgICAgICB9Cisg ICAgXSwKKyAgICAiX2VudHJpZXMiOiBudWxsCisgIH0KK30KKworLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KK0VYUFJFU1NJT046IG5ldyBQcm94 eShuZXcgUHJveHkoe2ZvbzoxLCBiYXI6MX0sIHt9KSwge30pCit7CisgICJfdHlwZSI6ICJvYmpl Y3QiLAorICAiX3N1YnR5cGUiOiAicHJveHkiLAorICAiX29iamVjdElkIjogIjxmaWx0ZXJlZD4i LAorICAiX2Rlc2NyaXB0aW9uIjogIlByb3h5IiwKKyAgIl9wcmV2aWV3IjogeworICAgICJfbGlz dGVuZXJzIjogbnVsbCwKKyAgICAiX3R5cGUiOiAib2JqZWN0IiwKKyAgICAiX3N1YnR5cGUiOiAi cHJveHkiLAorICAgICJfZGVzY3JpcHRpb24iOiAiUHJveHkiLAorICAgICJfbG9zc2xlc3MiOiBm YWxzZSwKKyAgICAiX292ZXJmbG93IjogZmFsc2UsCisgICAgIl9wcm9wZXJ0aWVzIjogWworICAg ICAgeworICAgICAgICAiX2xpc3RlbmVycyI6IG51bGwsCisgICAgICAgICJfbmFtZSI6ICJmb28i LAorICAgICAgICAiX3R5cGUiOiAibnVtYmVyIiwKKyAgICAgICAgIl92YWx1ZSI6ICIxIgorICAg ICAgfSwKKyAgICAgIHsKKyAgICAgICAgIl9saXN0ZW5lcnMiOiBudWxsLAorICAgICAgICAiX25h bWUiOiAiYmFyIiwKKyAgICAgICAgIl90eXBlIjogIm51bWJlciIsCisgICAgICAgICJfdmFsdWUi OiAiMSIKICAgICAgIH0KICAgICBdLAogICAgICJfZW50cmllcyI6IG51bGwKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2luc3BlY3Rvci9tb2RlbC9yZW1vdGUtb2JqZWN0Lmh0bWwgYi9MYXlvdXRU ZXN0cy9pbnNwZWN0b3IvbW9kZWwvcmVtb3RlLW9iamVjdC5odG1sCmluZGV4IDEzYWU1YTMuLmU1 ZmVkNDAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9tb2RlbC9yZW1vdGUtb2Jq ZWN0Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL21vZGVsL3JlbW90ZS1vYmplY3Qu aHRtbApAQCAtMTcwLDYgKzE3MCw3IEBAIGZ1bmN0aW9uIHRlc3QoKQogCiAgICAgICAgIC8vIFBy b3h5CiAgICAgICAgIHtleHByZXNzaW9uOiAibmV3IFByb3h5KHt4OjEsIHk6MX0sIHtoYW5kbGVy OiB0cnVlfSkifSwKKyAgICAgICAge2V4cHJlc3Npb246ICJuZXcgUHJveHkobmV3IFByb3h5KHtm b286MSwgYmFyOjF9LCB7fSksIHt9KSJ9LAogCiAgICAgLy8gQ2xhc3NlcwogCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvaW5zcGVjdG9yL21vZGVsL3JlbW90ZS1vYmplY3Qt ZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2luc3BlY3Rvci9tb2RlbC9y ZW1vdGUtb2JqZWN0LWV4cGVjdGVkLnR4dAppbmRleCAzZjQ0YmY3Li5iMTVkZjIyIDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvaW5zcGVjdG9yL21vZGVsL3JlbW90ZS1vYmpl Y3QtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9pbnNwZWN0b3Iv bW9kZWwvcmVtb3RlLW9iamVjdC1leHBlY3RlZC50eHQKQEAgLTQ2NjAsNjcgKzQ2NjAsMTkgQEAg RVhQUkVTU0lPTjogUHJvbWlzZS5yZXNvbHZlKHtyZXN1bHQ6MX0pCiBFWFBSRVNTSU9OOiBuZXcg UHJveHkoe3g6MSwgeToxfSwge2hhbmRsZXI6IHRydWV9KQogewogICAiX3R5cGUiOiAib2JqZWN0 IiwKKyAgIl9zdWJ0eXBlIjogInByb3h5IiwKICAgIl9vYmplY3RJZCI6ICI8ZmlsdGVyZWQ+IiwK LSAgIl9kZXNjcmlwdGlvbiI6ICJQcm94eU9iamVjdCIsCisgICJfZGVzY3JpcHRpb24iOiAiUHJv eHkiLAogICAiX3ByZXZpZXciOiB7CiAgICAgIl9saXN0ZW5lcnMiOiBudWxsLAogICAgICJfdHlw ZSI6ICJvYmplY3QiLAotICAgICJfZGVzY3JpcHRpb24iOiAiUHJveHlPYmplY3QiLAotICAgICJf bG9zc2xlc3MiOiB0cnVlLAorICAgICJfc3VidHlwZSI6ICJwcm94eSIsCisgICAgIl9kZXNjcmlw dGlvbiI6ICJQcm94eSIsCisgICAgIl9sb3NzbGVzcyI6IGZhbHNlLAogICAgICJfb3ZlcmZsb3ci OiBmYWxzZSwKICAgICAiX3Byb3BlcnRpZXMiOiBbCiAgICAgICB7CiAgICAgICAgICJfbGlzdGVu ZXJzIjogbnVsbCwKLSAgICAgICAgIl9uYW1lIjogInRhcmdldCIsCi0gICAgICAgICJfdHlwZSI6 ICJvYmplY3QiLAotICAgICAgICAiX3ZhbHVlUHJldmlldyI6IHsKLSAgICAgICAgICAiX2xpc3Rl bmVycyI6IG51bGwsCi0gICAgICAgICAgIl90eXBlIjogIm9iamVjdCIsCi0gICAgICAgICAgIl9k ZXNjcmlwdGlvbiI6ICJPYmplY3QiLAotICAgICAgICAgICJfbG9zc2xlc3MiOiB0cnVlLAotICAg ICAgICAgICJfb3ZlcmZsb3ciOiBmYWxzZSwKLSAgICAgICAgICAiX3Byb3BlcnRpZXMiOiBbCi0g ICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICJfbGlzdGVuZXJzIjogbnVsbCwKLSAgICAgICAg ICAgICAgIl9uYW1lIjogIngiLAotICAgICAgICAgICAgICAiX3R5cGUiOiAibnVtYmVyIiwKLSAg ICAgICAgICAgICAgIl92YWx1ZSI6ICIxIgotICAgICAgICAgICAgfSwKLSAgICAgICAgICAgIHsK LSAgICAgICAgICAgICAgIl9saXN0ZW5lcnMiOiBudWxsLAotICAgICAgICAgICAgICAiX25hbWUi OiAieSIsCi0gICAgICAgICAgICAgICJfdHlwZSI6ICJudW1iZXIiLAotICAgICAgICAgICAgICAi X3ZhbHVlIjogIjEiCi0gICAgICAgICAgICB9Ci0gICAgICAgICAgXSwKLSAgICAgICAgICAiX2Vu dHJpZXMiOiBudWxsCi0gICAgICAgIH0sCi0gICAgICAgICJfaW50ZXJuYWwiOiB0cnVlCi0gICAg ICB9LAotICAgICAgewotICAgICAgICAiX2xpc3RlbmVycyI6IG51bGwsCi0gICAgICAgICJfbmFt ZSI6ICJoYW5kbGVyIiwKLSAgICAgICAgIl90eXBlIjogIm9iamVjdCIsCi0gICAgICAgICJfdmFs dWVQcmV2aWV3IjogewotICAgICAgICAgICJfbGlzdGVuZXJzIjogbnVsbCwKLSAgICAgICAgICAi X3R5cGUiOiAib2JqZWN0IiwKLSAgICAgICAgICAiX2Rlc2NyaXB0aW9uIjogIk9iamVjdCIsCi0g ICAgICAgICAgIl9sb3NzbGVzcyI6IHRydWUsCi0gICAgICAgICAgIl9vdmVyZmxvdyI6IGZhbHNl LAotICAgICAgICAgICJfcHJvcGVydGllcyI6IFsKLSAgICAgICAgICAgIHsKLSAgICAgICAgICAg ICAgIl9saXN0ZW5lcnMiOiBudWxsLAotICAgICAgICAgICAgICAiX25hbWUiOiAiaGFuZGxlciIs Ci0gICAgICAgICAgICAgICJfdHlwZSI6ICJib29sZWFuIiwKLSAgICAgICAgICAgICAgIl92YWx1 ZSI6ICJ0cnVlIgotICAgICAgICAgICAgfQotICAgICAgICAgIF0sCi0gICAgICAgICAgIl9lbnRy aWVzIjogbnVsbAotICAgICAgICB9LAotICAgICAgICAiX2ludGVybmFsIjogdHJ1ZQotICAgICAg fSwKLSAgICAgIHsKLSAgICAgICAgIl9saXN0ZW5lcnMiOiBudWxsLAogICAgICAgICAiX25hbWUi OiAieCIsCiAgICAgICAgICJfdHlwZSI6ICJudW1iZXIiLAogICAgICAgICAiX3ZhbHVlIjogIjEi CkBAIC00NzM3LDYgKzQ2ODksMzggQEAgRVhQUkVTU0lPTjogbmV3IFByb3h5KHt4OjEsIHk6MX0s IHtoYW5kbGVyOiB0cnVlfSkKIH0KIAogLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0KK0VYUFJFU1NJT046IG5ldyBQcm94eShuZXcgUHJveHkoe2Zv bzoxLCBiYXI6MX0sIHt9KSwge30pCit7CisgICJfdHlwZSI6ICJvYmplY3QiLAorICAiX3N1YnR5 cGUiOiAicHJveHkiLAorICAiX29iamVjdElkIjogIjxmaWx0ZXJlZD4iLAorICAiX2Rlc2NyaXB0 aW9uIjogIlByb3h5IiwKKyAgIl9wcmV2aWV3IjogeworICAgICJfbGlzdGVuZXJzIjogbnVsbCwK KyAgICAiX3R5cGUiOiAib2JqZWN0IiwKKyAgICAiX3N1YnR5cGUiOiAicHJveHkiLAorICAgICJf ZGVzY3JpcHRpb24iOiAiUHJveHkiLAorICAgICJfbG9zc2xlc3MiOiBmYWxzZSwKKyAgICAiX292 ZXJmbG93IjogZmFsc2UsCisgICAgIl9wcm9wZXJ0aWVzIjogWworICAgICAgeworICAgICAgICAi X2xpc3RlbmVycyI6IG51bGwsCisgICAgICAgICJfbmFtZSI6ICJmb28iLAorICAgICAgICAiX3R5 cGUiOiAibnVtYmVyIiwKKyAgICAgICAgIl92YWx1ZSI6ICIxIgorICAgICAgfSwKKyAgICAgIHsK KyAgICAgICAgIl9saXN0ZW5lcnMiOiBudWxsLAorICAgICAgICAiX25hbWUiOiAiYmFyIiwKKyAg ICAgICAgIl90eXBlIjogIm51bWJlciIsCisgICAgICAgICJfdmFsdWUiOiAiMSIKKyAgICAgIH0K KyAgICBdLAorICAgICJfZW50cmllcyI6IG51bGwKKyAgfQorfQorCistLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogRVhQUkVTU0lPTjogUGVyc29u ID0gY2xhc3MgUGVyc29uIHsgY29uc3RydWN0b3IobmFtZSl7fSBnZXQgZnVsbE5hbWUoKXt9IG1l dGhvZE5hbWUocDEsIHAyKXt9IH07IFBlcnNvbgogewogICAiX3R5cGUiOiAiZnVuY3Rpb24iLApk aWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9DaGFuZ2VMb2cKaW5kZXggYmNiYWZmMS4uZTBlYjYyZSAxMDA2NDQKLS0tIGEv U291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTEgQEAKKzIwMTYtMTAtMTIgIEpvc2VwaCBQZWNvcmFy byAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBJbXByb3Zl IHN1cHBvcnQgZm9yIGxvZ2dpbmcgUHJveHkgb2JqZWN0cyBpbiBjb25zb2xlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjMzMjMKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzI4NDMyNTUzPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFRoaXMgaXMgYmFzZWQgb2ZmIG9mIHNpbWlsaWFyIHBhdGNoZXMgaW4g QmxpbmsgZm9yIFByb3h5IGhhbmRsaW5nLgorCisgICAgICAgICogYmluZGluZ3MvU2NyaXB0VmFs dWUuY3BwOgorICAgICAgICAoRGVwcmVjYXRlZDo6U2NyaXB0VmFsdWU6OmlzRXF1YWwpOgorICAg ICAgICBVc2Ugc3RyaWN0IGVxdWFsaXR5LiBUaGlzIGlzIHRoZSBpbnRlbnQsIGFuZCBpdCBwcmV2 ZW50cyB0aGUgcG9zc2liaWxpdHkgb2YgdHJpZ2dlcmluZworICAgICAgICBwcmltaXRpdmUgY29u dmVyc2lvbiBvbiBvYmplY3RzIGluIHByZXZpb3VzIENvbnNvbGVNZXNzYWdlIGFyZ3VtZW50IGxp c3RzLgorCisgICAgICAgICogaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0U291cmNlLmpzOgorICAg ICAgICAoSW5qZWN0ZWRTY3JpcHQucHJvdG90eXBlLl9wcm9wZXJ0eURlc2NyaXB0b3JzKToKKyAg ICAgICAgQmFpbCBpZiB0aGUgb2JqZWN0IGlzIGEgUHJveHkuCisKKyAgICAgICAgKEluamVjdGVk U2NyaXB0LnByb3RvdHlwZS5fZGVzY3JpYmUpOgorICAgICAgICBQcm92aWRlIGEgZnJpZW5kbGll ciBuYW1lLCAiUHJveHkiIGluc3RlYWQgb2YgIlByb3h5T2JqZWN0Ii4KKyAgICAgICAgCisgICAg ICAgIChJbmplY3RlZFNjcmlwdC5SZW1vdGVPYmplY3QpOgorICAgICAgICBXaGVuIGdlbmVyYXRp bmcgYSBwcmV2aWV3IGZvciBhIFByb3h5IG9iamVjdCwgZ2VuZXJhdGUgaXQgZnJvbSB0aGUgZmlu YWwgdGFyZ2V0CisgICAgICAgIGFuZCBtYXJrIGl0IGFzIGxvc3N5IHNvIHRoYXQgdGhlIG9iamVj dCBjYW4gYWx3YXlzIGJlIGV4cGFuZGVkIHRvIGdldCB0aGUgaW50ZXJuYWwKKyAgICAgICAgdGFy Z2V0L2hhbmRsZXIgcHJvcGVydGllcy4KKworICAgICAgICAqIGluc3BlY3Rvci9KU0luamVjdGVk U2NyaXB0SG9zdC5oOgorICAgICAgICAqIGluc3BlY3Rvci9KU0luamVjdGVkU2NyaXB0SG9zdC5j cHA6CisgICAgICAgIChJbnNwZWN0b3I6OkpTSW5qZWN0ZWRTY3JpcHRIb3N0OjpzdWJ0eXBlKToK KyAgICAgICAgTmV3IHN1YnR5cGUgZm9yIFByb3h5IG9iamVjdHMuCisKKyAgICAgICAgKEluc3Bl Y3Rvcjo6SlNJbmplY3RlZFNjcmlwdEhvc3Q6OnByb3h5VGFyZ2V0VmFsdWUpOgorICAgICAgICBS ZXNvbHZlIHRoZSBmaW5hbCB0YXJnZXQgdmFsdWUgZm9yIGEgUHJveHkuCisKKyAgICAgICAgKiBp bnNwZWN0b3IvSlNJbmplY3RlZFNjcmlwdEhvc3RQcm90b3R5cGUuY3BwOgorICAgICAgICAoSW5z cGVjdG9yOjpKU0luamVjdGVkU2NyaXB0SG9zdFByb3RvdHlwZTo6ZmluaXNoQ3JlYXRpb24pOgor ICAgICAgICAoSW5zcGVjdG9yOjpqc0luamVjdGVkU2NyaXB0SG9zdFByb3RvdHlwZUZ1bmN0aW9u UHJveHlUYXJnZXRWYWx1ZSk6CisgICAgICAgIEFkZCB0aGUgbmV3IG1ldGhvZC4KKworICAgICAg ICAqIGluc3BlY3Rvci9TY3JpcHRBcmd1bWVudHMuY3BwOgorICAgICAgICAoSW5zcGVjdG9yOjpT Y3JpcHRBcmd1bWVudHM6OmdldEZpcnN0QXJndW1lbnRBc1N0cmluZyk6CisgICAgICAgIEF2b2lk IHRyaWdnZXJpbmcgUHJveHkgdHJhcHMgb24gYSBQcm94eSBvYmplY3Qgd2hlbiBnZXR0aW5nIGEg cXVpY2sKKyAgICAgICAgc3RyaW5nIGRlc2NyaXB0aW9uIGZvciBDb25zb2xlTWVzc2FnZXMuCisK KyAgICAgICAgKiBpbnNwZWN0b3IvcHJvdG9jb2wvUnVudGltZS5qc29uOgorICAgICAgICBBZGQg bmV3ICJwcm94eSIgc3VidHlwZS4KKwogMjAxNi0xMC0xMSAgSm9zZXBoIFBlY29yYXJvICA8cGVj b3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAgIEVtaXQgRGVidWdIb29rcyB1bmlmb3JtbHkgd2l0 aCBwYXVzZSBsb2NhdGlvbnMgaW5zdGVhZCBvZiBoYXZpbmcgc2VwYXJhdGUgcGF1c2UgbG9jYXRp b25zIGFuZCBvcF9kZWJ1ZyBlbWl0cwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L2JpbmRpbmdzL1NjcmlwdFZhbHVlLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9iaW5kaW5n cy9TY3JpcHRWYWx1ZS5jcHAKaW5kZXggMDJkZTExMi4uMDhhZjJiMSAxMDA2NDQKLS0tIGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL2JpbmRpbmdzL1NjcmlwdFZhbHVlLmNwcAorKysgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvYmluZGluZ3MvU2NyaXB0VmFsdWUuY3BwCkBAIC0xMzUsNyArMTM1LDcg QEAgYm9vbCBTY3JpcHRWYWx1ZTo6aXNFcXVhbChFeGVjU3RhdGUqIHNjcmlwdFN0YXRlLCBjb25z dCBTY3JpcHRWYWx1ZSYgYW5vdGhlclZhbHUKIHsKICAgICBpZiAoaGFzTm9WYWx1ZSgpKQogICAg ICAgICByZXR1cm4gYW5vdGhlclZhbHVlLmhhc05vVmFsdWUoKTsKLSAgICByZXR1cm4gSlNWYWx1 ZUlzRXF1YWwodG9SZWYoc2NyaXB0U3RhdGUpLCB0b1JlZihzY3JpcHRTdGF0ZSwganNWYWx1ZSgp KSwgdG9SZWYoc2NyaXB0U3RhdGUsIGFub3RoZXJWYWx1ZS5qc1ZhbHVlKCkpLCBudWxscHRyKTsK KyAgICByZXR1cm4gSlNWYWx1ZUlzU3RyaWN0RXF1YWwodG9SZWYoc2NyaXB0U3RhdGUpLCB0b1Jl ZihzY3JpcHRTdGF0ZSwganNWYWx1ZSgpKSwgdG9SZWYoc2NyaXB0U3RhdGUsIGFub3RoZXJWYWx1 ZS5qc1ZhbHVlKCkpKTsKIH0KIAogYm9vbCBTY3JpcHRWYWx1ZTo6aXNOdWxsKCkgY29uc3QKZGlm ZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRT b3VyY2UuanMgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0 U291cmNlLmpzCmluZGV4IGJiNzE1MzcuLjZjYmFjODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRTb3VyY2UuanMKKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdFNvdXJjZS5qcwpAQCAtNTc0 LDYgKzU3NCw5IEBAIEluamVjdGVkU2NyaXB0LnByb3RvdHlwZSA9IHsKIAogICAgIF9wcm9wZXJ0 eURlc2NyaXB0b3JzOiBmdW5jdGlvbihvYmplY3QsIGNvbGxlY3Rpb25Nb2RlLCBuYXRpdmVHZXR0 ZXJzQXNWYWx1ZXMpCiAgICAgeworICAgICAgICBpZiAoSW5qZWN0ZWRTY3JpcHRIb3N0LnN1YnR5 cGUob2JqZWN0KSA9PT0gInByb3h5IikKKyAgICAgICAgICAgIHJldHVybiBbXTsKKwogICAgICAg ICB2YXIgZGVzY3JpcHRvcnMgPSBbXTsKICAgICAgICAgdmFyIG5hbWVQcm9jZXNzZWQgPSBuZXcg U2V0OwogCkBAIC03MzIsOCArNzM1LDcgQEAgSW5qZWN0ZWRTY3JpcHQucHJvdG90eXBlID0gewog ICAgICAgICB0cnkgewogICAgICAgICAgICAgaWYgKHR5cGVvZiBvYmouc3BsaWNlID09PSAiZnVu Y3Rpb24iICYmIGlzRmluaXRlKG9iai5sZW5ndGgpKQogICAgICAgICAgICAgICAgIHJldHVybiAi YXJyYXkiOwotICAgICAgICB9IGNhdGNoIChlKSB7Ci0gICAgICAgIH0KKyAgICAgICAgfSBjYXRj aCAoZSkge30KIAogICAgICAgICByZXR1cm4gbnVsbDsKICAgICB9LApAQCAtNzkxLDYgKzc5Myw5 IEBAIEluamVjdGVkU2NyaXB0LnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKHN1YnR5cGUgPT09 ICJlcnJvciIpCiAgICAgICAgICAgICByZXR1cm4gdG9TdHJpbmcob2JqKTsKIAorICAgICAgICBp ZiAoc3VidHlwZSA9PT0gInByb3h5IikKKyAgICAgICAgICAgIHJldHVybiAiUHJveHkiOworCiAg ICAgICAgIGlmIChzdWJ0eXBlID09PSAibm9kZSIpCiAgICAgICAgICAgICByZXR1cm4gdGhpcy5f bm9kZVByZXZpZXcob2JqKTsKIApAQCAtOTU4LDggKzk2MywxMyBAQCBJbmplY3RlZFNjcmlwdC5S ZW1vdGVPYmplY3QgPSBmdW5jdGlvbihvYmplY3QsIG9iamVjdEdyb3VwTmFtZSwgZm9yY2VWYWx1 ZVR5cGUsCiAgICAgICAgIHRoaXMuY2xhc3NOYW1lID0gb2JqZWN0Lm5hbWU7CiAgICAgfQogCi0g ICAgaWYgKGdlbmVyYXRlUHJldmlldyAmJiB0aGlzLnR5cGUgPT09ICJvYmplY3QiKQotICAgICAg ICB0aGlzLnByZXZpZXcgPSB0aGlzLl9nZW5lcmF0ZVByZXZpZXcob2JqZWN0LCB1bmRlZmluZWQs IGNvbHVtbk5hbWVzKTsKKyAgICBpZiAoZ2VuZXJhdGVQcmV2aWV3ICYmIHRoaXMudHlwZSA9PT0g Im9iamVjdCIpIHsKKyAgICAgICAgaWYgKHN1YnR5cGUgPT09ICJwcm94eSIpIHsKKyAgICAgICAg ICAgIHRoaXMucHJldmlldyA9IHRoaXMuX2dlbmVyYXRlUHJldmlldyhJbmplY3RlZFNjcmlwdEhv c3QucHJveHlUYXJnZXRWYWx1ZShvYmplY3QpKTsKKyAgICAgICAgICAgIHRoaXMucHJldmlldy5s b3NzbGVzcyA9IGZhbHNlOworICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgIHRoaXMucHJldmll dyA9IHRoaXMuX2dlbmVyYXRlUHJldmlldyhvYmplY3QsIHVuZGVmaW5lZCwgY29sdW1uTmFtZXMp OworICAgIH0KIH07CiAKIEluamVjdGVkU2NyaXB0LlJlbW90ZU9iamVjdC5jcmVhdGVPYmplY3RQ cmV2aWV3Rm9yVmFsdWUgPSBmdW5jdGlvbih2YWx1ZSwgZ2VuZXJhdGVQcmV2aWV3KQpkaWZmIC0t Z2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9KU0luamVjdGVkU2NyaXB0SG9z dC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0pTSW5qZWN0ZWRTY3JpcHRI b3N0LmNwcAppbmRleCAyYWMwZTkzLi40OTcxZWE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvaW5zcGVjdG9yL0pTSW5qZWN0ZWRTY3JpcHRIb3N0LmNwcAorKysgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0pTSW5qZWN0ZWRTY3JpcHRIb3N0LmNwcApAQCAtMTY3 LDYgKzE2Nyw4IEBAIEpTVmFsdWUgSlNJbmplY3RlZFNjcmlwdEhvc3Q6OnN1YnR5cGUoRXhlY1N0 YXRlKiBleGVjKQogICAgICAgICByZXR1cm4ganNOb250cml2aWFsU3RyaW5nKGV4ZWMsIEFTQ0lJ TGl0ZXJhbCgiZGF0ZSIpKTsKICAgICBpZiAodmFsdWUuaW5oZXJpdHMoUmVnRXhwT2JqZWN0Ojpp bmZvKCkpKQogICAgICAgICByZXR1cm4ganNOb250cml2aWFsU3RyaW5nKGV4ZWMsIEFTQ0lJTGl0 ZXJhbCgicmVnZXhwIikpOworICAgIGlmICh2YWx1ZS5pbmhlcml0cyhQcm94eU9iamVjdDo6aW5m bygpKSkKKyAgICAgICAgcmV0dXJuIGpzTm9udHJpdmlhbFN0cmluZyhleGVjLCBBU0NJSUxpdGVy YWwoInByb3h5IikpOwogCiAgICAgaWYgKHZhbHVlLmluaGVyaXRzKEpTTWFwOjppbmZvKCkpKQog ICAgICAgICByZXR1cm4ganNOb250cml2aWFsU3RyaW5nKGV4ZWMsIEFTQ0lJTGl0ZXJhbCgibWFw IikpOwpAQCAtMzc3LDYgKzM3OSwyMyBAQCBKU1ZhbHVlIEpTSW5qZWN0ZWRTY3JpcHRIb3N0Ojpn ZXRJbnRlcm5hbFByb3BlcnRpZXMoRXhlY1N0YXRlKiBleGVjKQogICAgIHJldHVybiBqc1VuZGVm aW5lZCgpOwogfQogCitKU1ZhbHVlIEpTSW5qZWN0ZWRTY3JpcHRIb3N0Ojpwcm94eVRhcmdldFZh bHVlKEV4ZWNTdGF0ZSAqZXhlYykKK3sKKyAgICBpZiAoZXhlYy0+YXJndW1lbnRDb3VudCgpIDwg MSkKKyAgICAgICAgcmV0dXJuIGpzVW5kZWZpbmVkKCk7CisKKyAgICBKU1ZhbHVlIHZhbHVlID0g ZXhlYy0+dW5jaGVja2VkQXJndW1lbnQoMCk7CisgICAgUHJveHlPYmplY3QqIHByb3h5ID0ganNE eW5hbWljQ2FzdDxQcm94eU9iamVjdCo+KHZhbHVlKTsKKyAgICBpZiAoIXByb3h5KQorICAgICAg ICByZXR1cm4ganNVbmRlZmluZWQoKTsKKworICAgIEpTT2JqZWN0KiB0YXJnZXQgPSBwcm94eS0+ dGFyZ2V0KCk7CisgICAgd2hpbGUgKFByb3h5T2JqZWN0KiBwcm94eSA9IGpzRHluYW1pY0Nhc3Q8 UHJveHlPYmplY3QqPih0YXJnZXQpKQorICAgICAgICB0YXJnZXQgPSBwcm94eS0+dGFyZ2V0KCk7 CisKKyAgICByZXR1cm4gdGFyZ2V0OworfQorCiBKU1ZhbHVlIEpTSW5qZWN0ZWRTY3JpcHRIb3N0 Ojp3ZWFrTWFwU2l6ZShFeGVjU3RhdGUqIGV4ZWMpCiB7CiAgICAgaWYgKGV4ZWMtPmFyZ3VtZW50 Q291bnQoKSA8IDEpCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9y L0pTSW5qZWN0ZWRTY3JpcHRIb3N0LmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9y L0pTSW5qZWN0ZWRTY3JpcHRIb3N0LmgKaW5kZXggOTllZmJmOC4uMWJkNGQ3NyAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9KU0luamVjdGVkU2NyaXB0SG9zdC5o CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSlNJbmplY3RlZFNjcmlwdEhv c3QuaApAQCAtNjUsNiArNjUsNyBAQCBwdWJsaWM6CiAgICAgSlNDOjpKU1ZhbHVlIHN1YnR5cGUo SlNDOjpFeGVjU3RhdGUqKTsKICAgICBKU0M6OkpTVmFsdWUgZnVuY3Rpb25EZXRhaWxzKEpTQzo6 RXhlY1N0YXRlKik7CiAgICAgSlNDOjpKU1ZhbHVlIGdldEludGVybmFsUHJvcGVydGllcyhKU0M6 OkV4ZWNTdGF0ZSopOworICAgIEpTQzo6SlNWYWx1ZSBwcm94eVRhcmdldFZhbHVlKEpTQzo6RXhl Y1N0YXRlKik7CiAgICAgSlNDOjpKU1ZhbHVlIHdlYWtNYXBTaXplKEpTQzo6RXhlY1N0YXRlKik7 CiAgICAgSlNDOjpKU1ZhbHVlIHdlYWtNYXBFbnRyaWVzKEpTQzo6RXhlY1N0YXRlKik7CiAgICAg SlNDOjpKU1ZhbHVlIHdlYWtTZXRTaXplKEpTQzo6RXhlY1N0YXRlKik7CmRpZmYgLS1naXQgYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0pTSW5qZWN0ZWRTY3JpcHRIb3N0UHJvdG90 eXBlLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSlNJbmplY3RlZFNjcmlw dEhvc3RQcm90b3R5cGUuY3BwCmluZGV4IGY3ZjIyZmIuLjVkYTdlMDAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSlNJbmplY3RlZFNjcmlwdEhvc3RQcm90b3R5 cGUuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSlNJbmplY3RlZFNj cmlwdEhvc3RQcm90b3R5cGUuY3BwCkBAIC00Myw2ICs0Myw3IEBAIHN0YXRpYyBFbmNvZGVkSlNW YWx1ZSBKU0NfSE9TVF9DQUxMIGpzSW5qZWN0ZWRTY3JpcHRIb3N0UHJvdG90eXBlRnVuY3Rpb25G dW5jdGlvCiBzdGF0aWMgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBqc0luamVjdGVkU2Ny aXB0SG9zdFByb3RvdHlwZUZ1bmN0aW9uR2V0SW50ZXJuYWxQcm9wZXJ0aWVzKEV4ZWNTdGF0ZSop Owogc3RhdGljIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwganNJbmplY3RlZFNjcmlwdEhv c3RQcm90b3R5cGVGdW5jdGlvbkludGVybmFsQ29uc3RydWN0b3JOYW1lKEV4ZWNTdGF0ZSopOwog c3RhdGljIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwganNJbmplY3RlZFNjcmlwdEhvc3RQ cm90b3R5cGVGdW5jdGlvbklzSFRNTEFsbENvbGxlY3Rpb24oRXhlY1N0YXRlKik7CitzdGF0aWMg RW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBqc0luamVjdGVkU2NyaXB0SG9zdFByb3RvdHlw ZUZ1bmN0aW9uUHJveHlUYXJnZXRWYWx1ZShFeGVjU3RhdGUqKTsKIHN0YXRpYyBFbmNvZGVkSlNW YWx1ZSBKU0NfSE9TVF9DQUxMIGpzSW5qZWN0ZWRTY3JpcHRIb3N0UHJvdG90eXBlRnVuY3Rpb25X ZWFrTWFwU2l6ZShFeGVjU3RhdGUqKTsKIHN0YXRpYyBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9D QUxMIGpzSW5qZWN0ZWRTY3JpcHRIb3N0UHJvdG90eXBlRnVuY3Rpb25XZWFrTWFwRW50cmllcyhF eGVjU3RhdGUqKTsKIHN0YXRpYyBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGpzSW5qZWN0 ZWRTY3JpcHRIb3N0UHJvdG90eXBlRnVuY3Rpb25XZWFrU2V0U2l6ZShFeGVjU3RhdGUqKTsKQEAg LTY1LDYgKzY2LDcgQEAgdm9pZCBKU0luamVjdGVkU2NyaXB0SG9zdFByb3RvdHlwZTo6ZmluaXNo Q3JlYXRpb24oVk0mIHZtLCBKU0dsb2JhbE9iamVjdCogZ2xvYmEKICAgICBKU0NfTkFUSVZFX0ZV TkNUSU9OX1dJVEhPVVRfVFJBTlNJVElPTigiZ2V0SW50ZXJuYWxQcm9wZXJ0aWVzIiwganNJbmpl Y3RlZFNjcmlwdEhvc3RQcm90b3R5cGVGdW5jdGlvbkdldEludGVybmFsUHJvcGVydGllcywgRG9u dEVudW0sIDEpOwogICAgIEpTQ19OQVRJVkVfRlVOQ1RJT05fV0lUSE9VVF9UUkFOU0lUSU9OKCJp bnRlcm5hbENvbnN0cnVjdG9yTmFtZSIsIGpzSW5qZWN0ZWRTY3JpcHRIb3N0UHJvdG90eXBlRnVu Y3Rpb25JbnRlcm5hbENvbnN0cnVjdG9yTmFtZSwgRG9udEVudW0sIDEpOwogICAgIEpTQ19OQVRJ VkVfRlVOQ1RJT05fV0lUSE9VVF9UUkFOU0lUSU9OKCJpc0hUTUxBbGxDb2xsZWN0aW9uIiwganNJ bmplY3RlZFNjcmlwdEhvc3RQcm90b3R5cGVGdW5jdGlvbklzSFRNTEFsbENvbGxlY3Rpb24sIERv bnRFbnVtLCAxKTsKKyAgICBKU0NfTkFUSVZFX0ZVTkNUSU9OX1dJVEhPVVRfVFJBTlNJVElPTigi cHJveHlUYXJnZXRWYWx1ZSIsIGpzSW5qZWN0ZWRTY3JpcHRIb3N0UHJvdG90eXBlRnVuY3Rpb25Q cm94eVRhcmdldFZhbHVlLCBEb250RW51bSwgMSk7CiAgICAgSlNDX05BVElWRV9GVU5DVElPTl9X SVRIT1VUX1RSQU5TSVRJT04oIndlYWtNYXBTaXplIiwganNJbmplY3RlZFNjcmlwdEhvc3RQcm90 b3R5cGVGdW5jdGlvbldlYWtNYXBTaXplLCBEb250RW51bSwgMSk7CiAgICAgSlNDX05BVElWRV9G VU5DVElPTl9XSVRIT1VUX1RSQU5TSVRJT04oIndlYWtNYXBFbnRyaWVzIiwganNJbmplY3RlZFNj cmlwdEhvc3RQcm90b3R5cGVGdW5jdGlvbldlYWtNYXBFbnRyaWVzLCBEb250RW51bSwgMSk7CiAg ICAgSlNDX05BVElWRV9GVU5DVElPTl9XSVRIT1VUX1RSQU5TSVRJT04oIndlYWtTZXRTaXplIiwg anNJbmplY3RlZFNjcmlwdEhvc3RQcm90b3R5cGVGdW5jdGlvbldlYWtTZXRTaXplLCBEb250RW51 bSwgMSk7CkBAIC0xMTQsNiArMTE2LDE5IEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwg anNJbmplY3RlZFNjcmlwdEhvc3RQcm90b3R5cGVGdW5jdGlvbklzSFRNTEFsbENvbGxlCiAgICAg cmV0dXJuIEpTVmFsdWU6OmVuY29kZShjYXN0ZWRUaGlzLT5pc0hUTUxBbGxDb2xsZWN0aW9uKGV4 ZWMpKTsKIH0KIAorRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBqc0luamVjdGVkU2NyaXB0 SG9zdFByb3RvdHlwZUZ1bmN0aW9uUHJveHlUYXJnZXRWYWx1ZShFeGVjU3RhdGUqIGV4ZWMpCit7 CisgICAgVk0mIHZtID0gZXhlYy0+dm0oKTsKKyAgICBhdXRvIHNjb3BlID0gREVDTEFSRV9USFJP V19TQ09QRSh2bSk7CisKKyAgICBKU1ZhbHVlIHRoaXNWYWx1ZSA9IGV4ZWMtPnRoaXNWYWx1ZSgp OworICAgIEpTSW5qZWN0ZWRTY3JpcHRIb3N0KiBjYXN0ZWRUaGlzID0ganNEeW5hbWljQ2FzdDxK U0luamVjdGVkU2NyaXB0SG9zdCo+KHRoaXNWYWx1ZSk7CisgICAgaWYgKCFjYXN0ZWRUaGlzKQor ICAgICAgICByZXR1cm4gdGhyb3dWTVR5cGVFcnJvcihleGVjLCBzY29wZSk7CisKKyAgICByZXR1 cm4gSlNWYWx1ZTo6ZW5jb2RlKGNhc3RlZFRoaXMtPnByb3h5VGFyZ2V0VmFsdWUoZXhlYykpOwor fQorCiBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGpzSW5qZWN0ZWRTY3JpcHRIb3N0UHJv dG90eXBlRnVuY3Rpb25XZWFrTWFwU2l6ZShFeGVjU3RhdGUqIGV4ZWMpCiB7CiAgICAgVk0mIHZt ID0gZXhlYy0+dm0oKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0 b3IvU2NyaXB0QXJndW1lbnRzLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Iv U2NyaXB0QXJndW1lbnRzLmNwcAppbmRleCAxYmViMzMxLi42YWM2YzRlIDEwMDY0NAotLS0gYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL1NjcmlwdEFyZ3VtZW50cy5jcHAKKysrIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9TY3JpcHRBcmd1bWVudHMuY3BwCkBAIC0z Myw2ICszMyw3IEBACiAjaW5jbHVkZSAiU2NyaXB0QXJndW1lbnRzLmgiCiAKICNpbmNsdWRlICJK U0NJbmxpbmVzLmgiCisjaW5jbHVkZSAiUHJveHlPYmplY3QuaCIKICNpbmNsdWRlICJTY3JpcHRW YWx1ZS5oIgogCiBuYW1lc3BhY2UgSW5zcGVjdG9yIHsKQEAgLTg2LDYgKzg3LDEyIEBAIGJvb2wg U2NyaXB0QXJndW1lbnRzOjpnZXRGaXJzdEFyZ3VtZW50QXNTdHJpbmcoU3RyaW5nJiByZXN1bHQp CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKKyAgICBKU0M6OkpTVmFsdWUgdmFsdWUg PSBhcmd1bWVudEF0KDApLmpzVmFsdWUoKTsKKyAgICBpZiAoSlNDOjpqc0R5bmFtaWNDYXN0PEpT Qzo6UHJveHlPYmplY3QqPih2YWx1ZSkpIHsKKyAgICAgICAgcmVzdWx0ID0gQVNDSUlMaXRlcmFs KCJbb2JqZWN0IFByb3h5XSIpOworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisKICAgICBy ZXN1bHQgPSBhcmd1bWVudEF0KDApLnRvU3RyaW5nKGdsb2JhbFN0YXRlKCkpOwogICAgIHJldHVy biB0cnVlOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9w cm90b2NvbC9SdW50aW1lLmpzb24gYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3By b3RvY29sL1J1bnRpbWUuanNvbgppbmRleCAwNmQ2NWMxZi4uOGZjZmE5ZSAxMDA2NDQKLS0tIGEv U291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9wcm90b2NvbC9SdW50aW1lLmpzb24KKysr IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9wcm90b2NvbC9SdW50aW1lLmpzb24K QEAgLTEzLDcgKzEzLDcgQEAKICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJNaXJyb3Igb2Jq ZWN0IHJlZmVyZW5jaW5nIG9yaWdpbmFsIEphdmFTY3JpcHQgb2JqZWN0LiIsCiAgICAgICAgICAg ICAicHJvcGVydGllcyI6IFsKICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInR5cGUiLCAidHlw ZSI6ICJzdHJpbmciLCAiZW51bSI6IFsib2JqZWN0IiwgImZ1bmN0aW9uIiwgInVuZGVmaW5lZCIs ICJzdHJpbmciLCAibnVtYmVyIiwgImJvb2xlYW4iLCAic3ltYm9sIl0sICJkZXNjcmlwdGlvbiI6 ICJPYmplY3QgdHlwZS4iIH0sCi0gICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzdWJ0eXBlIiwg InR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImVudW0iOiBbImFycmF5IiwgIm51 bGwiLCAibm9kZSIsICJyZWdleHAiLCAiZGF0ZSIsICJlcnJvciIsICJtYXAiLCAic2V0IiwgIndl YWttYXAiLCAid2Vha3NldCIsICJpdGVyYXRvciIsICJjbGFzcyJdLCAiZGVzY3JpcHRpb24iOiAi T2JqZWN0IHN1YnR5cGUgaGludC4gU3BlY2lmaWVkIGZvciA8Y29kZT5vYmplY3Q8L2NvZGU+IDxj b2RlPmZ1bmN0aW9uPC9jb2RlPiAoZm9yIGNsYXNzKSB0eXBlIHZhbHVlcyBvbmx5LiIgfSwKKyAg ICAgICAgICAgICAgICB7ICJuYW1lIjogInN1YnR5cGUiLCAidHlwZSI6ICJzdHJpbmciLCAib3B0 aW9uYWwiOiB0cnVlLCAiZW51bSI6IFsiYXJyYXkiLCAibnVsbCIsICJub2RlIiwgInJlZ2V4cCIs ICJkYXRlIiwgImVycm9yIiwgIm1hcCIsICJzZXQiLCAid2Vha21hcCIsICJ3ZWFrc2V0IiwgIml0 ZXJhdG9yIiwgImNsYXNzIiwgInByb3h5Il0sICJkZXNjcmlwdGlvbiI6ICJPYmplY3Qgc3VidHlw ZSBoaW50LiBTcGVjaWZpZWQgZm9yIDxjb2RlPm9iamVjdDwvY29kZT4gPGNvZGU+ZnVuY3Rpb248 L2NvZGU+IChmb3IgY2xhc3MpIHR5cGUgdmFsdWVzIG9ubHkuIiB9LAogICAgICAgICAgICAgICAg IHsgIm5hbWUiOiAiY2xhc3NOYW1lIiwgInR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFsIjogdHJ1 ZSwgImRlc2NyaXB0aW9uIjogIk9iamVjdCBjbGFzcyAoY29uc3RydWN0b3IpIG5hbWUuIFNwZWNp ZmllZCBmb3IgPGNvZGU+b2JqZWN0PC9jb2RlPiB0eXBlIHZhbHVlcyBvbmx5LiIgfSwKICAgICAg ICAgICAgICAgICB7ICJuYW1lIjogInZhbHVlIiwgInR5cGUiOiAiYW55IiwgIm9wdGlvbmFsIjog dHJ1ZSwgImRlc2NyaXB0aW9uIjogIlJlbW90ZSBvYmplY3QgdmFsdWUgKGluIGNhc2Ugb2YgcHJp bWl0aXZlIHZhbHVlcyBvciBKU09OIHZhbHVlcyBpZiBpdCB3YXMgcmVxdWVzdGVkKS4iIH0sCiAg ICAgICAgICAgICAgICAgeyAibmFtZSI6ICJkZXNjcmlwdGlvbiIsICJ0eXBlIjogInN0cmluZyIs ICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJTdHJpbmcgcmVwcmVzZW50YXRpb24g b2YgdGhlIG9iamVjdC4iIH0sCkBAIC0yOSw3ICsyOSw3IEBACiAgICAgICAgICAgICAiZGVzY3Jp cHRpb24iOiAiT2JqZWN0IGNvbnRhaW5pbmcgYWJicmV2aWF0ZWQgcmVtb3RlIG9iamVjdCB2YWx1 ZS4iLAogICAgICAgICAgICAgInByb3BlcnRpZXMiOiBbCiAgICAgICAgICAgICAgICAgeyAibmFt ZSI6ICJ0eXBlIiwgInR5cGUiOiAic3RyaW5nIiwgImVudW0iOiBbIm9iamVjdCIsICJmdW5jdGlv biIsICJ1bmRlZmluZWQiLCAic3RyaW5nIiwgIm51bWJlciIsICJib29sZWFuIiwgInN5bWJvbCJd LCAiZGVzY3JpcHRpb24iOiAiT2JqZWN0IHR5cGUuIiB9LAotICAgICAgICAgICAgICAgIHsgIm5h bWUiOiAic3VidHlwZSIsICJ0eXBlIjogInN0cmluZyIsICJvcHRpb25hbCI6IHRydWUsICJlbnVt IjogWyJhcnJheSIsICJudWxsIiwgIm5vZGUiLCAicmVnZXhwIiwgImRhdGUiLCAiZXJyb3IiLCAi bWFwIiwgInNldCIsICJ3ZWFrbWFwIiwgIndlYWtzZXQiLCAiaXRlcmF0b3IiLCAiY2xhc3MiXSwg ImRlc2NyaXB0aW9uIjogIk9iamVjdCBzdWJ0eXBlIGhpbnQuIFNwZWNpZmllZCBmb3IgPGNvZGU+ b2JqZWN0PC9jb2RlPiB0eXBlIHZhbHVlcyBvbmx5LiIgfSwKKyAgICAgICAgICAgICAgICB7ICJu YW1lIjogInN1YnR5cGUiLCAidHlwZSI6ICJzdHJpbmciLCAib3B0aW9uYWwiOiB0cnVlLCAiZW51 bSI6IFsiYXJyYXkiLCAibnVsbCIsICJub2RlIiwgInJlZ2V4cCIsICJkYXRlIiwgImVycm9yIiwg Im1hcCIsICJzZXQiLCAid2Vha21hcCIsICJ3ZWFrc2V0IiwgIml0ZXJhdG9yIiwgImNsYXNzIiwg InByb3h5Il0sICJkZXNjcmlwdGlvbiI6ICJPYmplY3Qgc3VidHlwZSBoaW50LiBTcGVjaWZpZWQg Zm9yIDxjb2RlPm9iamVjdDwvY29kZT4gdHlwZSB2YWx1ZXMgb25seS4iIH0sCiAgICAgICAgICAg ICAgICAgeyAibmFtZSI6ICJkZXNjcmlwdGlvbiIsICJ0eXBlIjogInN0cmluZyIsICJvcHRpb25h bCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJTdHJpbmcgcmVwcmVzZW50YXRpb24gb2YgdGhlIG9i amVjdC4iIH0sCiAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJsb3NzbGVzcyIsICJ0eXBlIjog ImJvb2xlYW4iLCAiZGVzY3JpcHRpb24iOiAiRGV0ZXJtaW5lcyB3aGV0aGVyIHByZXZpZXcgaXMg bG9zc2xlc3MgKGNvbnRhaW5zIGFsbCBpbmZvcm1hdGlvbiBvZiB0aGUgb3JpZ2luYWwgb2JqZWN0 KS4iIH0sCiAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJvdmVyZmxvdyIsICJ0eXBlIjogImJv b2xlYW4iLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiVHJ1ZSBpZmYgc29tZSBv ZiB0aGUgcHJvcGVydGllcyBvZiB0aGUgb3JpZ2luYWwgZGlkIG5vdCBmaXQuIiB9LApAQCAtNDQs NyArNDQsNyBAQAogICAgICAgICAgICAgInByb3BlcnRpZXMiOiBbCiAgICAgICAgICAgICAgICAg eyAibmFtZSI6ICJuYW1lIiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIlByb3Bl cnR5IG5hbWUuIiB9LAogICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidHlwZSIsICJ0eXBlIjog InN0cmluZyIsICJlbnVtIjogWyJvYmplY3QiLCAiZnVuY3Rpb24iLCAidW5kZWZpbmVkIiwgInN0 cmluZyIsICJudW1iZXIiLCAiYm9vbGVhbiIsICJzeW1ib2wiLCAiYWNjZXNzb3IiXSwgImRlc2Ny aXB0aW9uIjogIk9iamVjdCB0eXBlLiIgfSwKLSAgICAgICAgICAgICAgICB7ICJuYW1lIjogInN1 YnR5cGUiLCAidHlwZSI6ICJzdHJpbmciLCAib3B0aW9uYWwiOiB0cnVlLCAiZW51bSI6IFsiYXJy YXkiLCAibnVsbCIsICJub2RlIiwgInJlZ2V4cCIsICJkYXRlIiwgImVycm9yIiwgIm1hcCIsICJz ZXQiLCAid2Vha21hcCIsICJ3ZWFrc2V0IiwgIml0ZXJhdG9yIiwgImNsYXNzIl0sICJkZXNjcmlw dGlvbiI6ICJPYmplY3Qgc3VidHlwZSBoaW50LiBTcGVjaWZpZWQgZm9yIDxjb2RlPm9iamVjdDwv Y29kZT4gdHlwZSB2YWx1ZXMgb25seS4iIH0sCisgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJz dWJ0eXBlIiwgInR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImVudW0iOiBbImFy cmF5IiwgIm51bGwiLCAibm9kZSIsICJyZWdleHAiLCAiZGF0ZSIsICJlcnJvciIsICJtYXAiLCAi c2V0IiwgIndlYWttYXAiLCAid2Vha3NldCIsICJpdGVyYXRvciIsICJjbGFzcyIsICJwcm94eSJd LCAiZGVzY3JpcHRpb24iOiAiT2JqZWN0IHN1YnR5cGUgaGludC4gU3BlY2lmaWVkIGZvciA8Y29k ZT5vYmplY3Q8L2NvZGU+IHR5cGUgdmFsdWVzIG9ubHkuIiB9LAogICAgICAgICAgICAgICAgIHsg Im5hbWUiOiAidmFsdWUiLCAidHlwZSI6ICJzdHJpbmciLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVz Y3JpcHRpb24iOiAiVXNlci1mcmllbmRseSBwcm9wZXJ0eSB2YWx1ZSBzdHJpbmcuIiB9LAogICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAidmFsdWVQcmV2aWV3IiwgIiRyZWYiOiAiT2JqZWN0UHJl dmlldyIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJOZXN0ZWQgdmFsdWUgcHJl dmlldy4iIH0sCiAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJpbnRlcm5hbCIsICJ0eXBlIjog ImJvb2xlYW4iLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiVHJ1ZSBpZiB0aGlz IGlzIGFuIGludGVybmFsIHByb3BlcnR5LiIgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKaW5kZXgg ZWQwMjhjMy4uZWMwMzdjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTYtMTAtMTIgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBJbXByb3ZlIHN1cHBvcnQgZm9yIGxvZ2dpbmcgUHJveHkg b2JqZWN0cyBpbiBjb25zb2xlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNjMzMjMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI4NDMyNTUzPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVy ZmFjZS9WaWV3cy9Db25zb2xlTWVzc2FnZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu Q29uc29sZU1lc3NhZ2VWaWV3LnByb3RvdHlwZS5fZm9ybWF0UGFyYW1ldGVyKToKKyAgICAgICAg VHJlYXQgYSBQcm94eSBsaWtlIGFueSBvdGhlciBvYmplY3QuCisKIDIwMTYtMTAtMTEgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBFbWl0IERlYnVnSG9v a3MgdW5pZm9ybWx5IHdpdGggcGF1c2UgbG9jYXRpb25zIGluc3RlYWQgb2YgaGF2aW5nIHNlcGFy YXRlIHBhdXNlIGxvY2F0aW9ucyBhbmQgb3BfZGVidWcgZW1pdHMKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnNvbGVNZXNzYWdlVmlldy5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnNvbGVNZXNz YWdlVmlldy5qcwppbmRleCBmMDFkYzFiLi42NWJmNTFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db25zb2xlTWVzc2FnZVZpZXcuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29uc29sZU1lc3Nh Z2VWaWV3LmpzCkBAIC01MzYsNiArNTM2LDcgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdl VmlldyA9IGNsYXNzIENvbnNvbGVNZXNzYWdlVmlldyBleHRlbmRzIFdlYkluc3BlY3Rvci4KICAg ICAgICAgICAgICJ3ZWFrc2V0IjogdGhpcy5fZm9ybWF0UGFyYW1ldGVyQXNPYmplY3QsCiAgICAg ICAgICAgICAiaXRlcmF0b3IiOiB0aGlzLl9mb3JtYXRQYXJhbWV0ZXJBc09iamVjdCwKICAgICAg ICAgICAgICJjbGFzcyI6IHRoaXMuX2Zvcm1hdFBhcmFtZXRlckFzT2JqZWN0LAorICAgICAgICAg ICAgInByb3h5IjogdGhpcy5fZm9ybWF0UGFyYW1ldGVyQXNPYmplY3QsCiAgICAgICAgICAgICAi YXJyYXkiOiB0aGlzLl9mb3JtYXRQYXJhbWV0ZXJBc0FycmF5LAogICAgICAgICAgICAgIm5vZGUi OiB0aGlzLl9mb3JtYXRQYXJhbWV0ZXJBc05vZGUsCiAgICAgICAgICAgICAic3RyaW5nIjogdGhp cy5fZm9ybWF0UGFyYW1ldGVyQXNTdHJpbmcsCg==