59319 2011-04-25 04:08:39 -0700 Web Inspector: few protocol improvements. 2011-04-25 11:07:21 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman abarth apavlov bweinstein eric joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 391737 0 pfeldman 2011-04-25 04:08:39 -0700 - Page domain is documented - setUserAgentOverride is moved to the Network agent - setSearchingForNode -> setInspectModeEnabled - highlightDOMNode -> highlightNode - reloadPage -> reload - openInNewWindow -> open with optional parameter 391738 1 90913 pfeldman 2011-04-25 04:14:25 -0700 Created attachment 90913 Patch 391741 2 pfeldman 2011-04-25 04:25:51 -0700 Committed r84772: <http://trac.webkit.org/changeset/84772> 391840 3 webkit.review.bot 2011-04-25 11:07:21 -0700 http://trac.webkit.org/changeset/84772 might have broken SnowLeopard Intel Release (WebKit2 Tests) 90913 2011-04-25 04:14:25 -0700 2011-04-25 04:24:00 -0700 Patch bug-59319-20110425151423.patch text/plain 26641 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODQ3NjkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAwYWZmMjAxMGFjNDliMjMzYTg5YWI4 N2FkOGNlNWVlZjBjM2NlZWQ5Li4wYjc2NzdhNTMxYmE0NTE1OTVkMTgzZmI3Y2ZiNTk0ZTI1MDM5 OTVmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDQtMjUgIFBhdmVsIEZlbGRtYW4gIDxw ZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGZldyBwcm90b2NvbCBpbXByb3ZlbWVudHMuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01OTMxOQorCisg ICAgICAgICogaHR0cC90ZXN0cy9pbnNwZWN0b3IvaW5zcGVjdG9yLXRlc3QuanM6CisgICAgICAg IChpbml0aWFsaXplX0luc3BlY3RvclRlc3QuSW5zcGVjdG9yVGVzdC5yZWxvYWRQYWdlKToKKwog MjAxMS0wNC0yNCAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBVbnJldmlld2VkLCBleHBlY3RhdGlvbnMgY2hhbmdlLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvaW5zcGVjdG9yLXRlc3QuanMgYi9MYXlvdXRUZXN0cy9o dHRwL3Rlc3RzL2luc3BlY3Rvci9pbnNwZWN0b3ItdGVzdC5qcwppbmRleCAyNzk1ZWY2ZTc3ZWM0 ZjdmOGU5YjM1YzZhMTZkMmZlM2JjY2E1NGQzLi45ZDAxNmYzOWQ0OGJmM2YyMTgyOGI0M2ZmMzFj NzY1NzhjZTE0YWMzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rv ci9pbnNwZWN0b3ItdGVzdC5qcworKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rv ci9pbnNwZWN0b3ItdGVzdC5qcwpAQCAtMTU2LDcgKzE1Niw3IEBAIEluc3BlY3RvclRlc3QucmVs b2FkUGFnZSA9IGZ1bmN0aW9uKGNhbGxiYWNrKQogCiAgICAgaWYgKFdlYkluc3BlY3Rvci5wYW5l bHMubmV0d29yaykKICAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5uZXR3b3JrLl9yZXNldCgp OwotICAgIFBhZ2VBZ2VudC5yZWxvYWRQYWdlKGZhbHNlKTsKKyAgICBQYWdlQWdlbnQucmVsb2Fk KGZhbHNlKTsKIH0KIAogSW5zcGVjdG9yVGVzdC5wYWdlUmVsb2FkZWQgPSBmdW5jdGlvbigpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cKaW5kZXggZGZiNmU3NGZlMjE3ZWQwZmYzMDA3YTBiMGMzNWFkOGVhY2MwMWQ0Ni4uNjcw YWE3NzhkOTJhNjAwNjFhYjI1ZTE4MWRmNjAwMzM0ZTRhMjZjZCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDUwIEBACisyMDExLTA0LTI1ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIg SW5zcGVjdG9yOiBmZXcgcHJvdG9jb2wgaW1wcm92ZW1lbnRzLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTkzMTkKKworICAgICAgICAtIFBhZ2UgZG9t YWluIGlzIGRvY3VtZW50ZWQKKyAgICAgICAgLSBzZXRVc2VyQWdlbnRPdmVycmlkZSBpcyBtb3Zl ZCB0byB0aGUgTmV0d29yayBhZ2VudAorICAgICAgICAtIHNldFNlYXJjaGluZ0Zvck5vZGUgLT4g c2V0SW5zcGVjdE1vZGVFbmFibGVkCisgICAgICAgIC0gaGlnaGxpZ2h0RE9NTm9kZSAtPiBoaWdo bGlnaHROb2RlCisgICAgICAgIC0gcmVsb2FkUGFnZSAtPiByZWxvYWQKKyAgICAgICAgLSBvcGVu SW5OZXdXaW5kb3cgLT4gb3BlbiB3aXRoIG9wdGlvbmFsIHBhcmFtZXRlcgorCisgICAgICAgICog aW5zcGVjdG9yL0luc3BlY3Rvci5qc29uOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JE T01BZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6c2V0SW5z cGVjdE1vZGVFbmFibGVkKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRPTUFnZW50Ojpo aWdobGlnaHROb2RlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuaDoK KyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRPTUFnZW50OjpoaWRlTm9kZUhpZ2hsaWdodCk6 CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmFwcGx5VXNlckFnZW50T3Zl cnJpZGVJbXBsKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclBhZ2VBZ2VudDo6Y2xlYXJGcm9udGVuZCk6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JQYWdlQWdlbnQ6OnJlbG9hZCk6CisgICAgICAgIChX ZWJDb3JlOjpJbnNwZWN0b3JQYWdlQWdlbnQ6Om9wZW4pOgorICAgICAgICAqIGluc3BlY3Rvci9J bnNwZWN0b3JQYWdlQWdlbnQuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3Vy Y2VBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JSZXNvdXJjZUFnZW50Ojpj bGVhckZyb250ZW5kKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclJlc291cmNlQWdlbnQ6 OmFwcGx5VXNlckFnZW50T3ZlcnJpZGUpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yUmVz b3VyY2VBZ2VudDo6c2V0VXNlckFnZW50T3ZlcnJpZGUpOgorICAgICAgICAqIGluc3BlY3Rvci9J bnNwZWN0b3JSZXNvdXJjZUFnZW50Lmg6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9B dWRpdHNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5BdWRpdHNQYW5lbC5wcm90b3R5 cGUuX3JlbG9hZFJlc291cmNlcyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVt ZW50c1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwucHJvdG90 eXBlLnNldFNlYXJjaGluZ0Zvck5vZGUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv RXh0ZW5zaW9uU2VydmVyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkV4dGVuc2lvblNlcnZl ci5wcm90b3R5cGUuX29uUmVsb2FkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL05l dHdvcmtQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrRGF0YUdyaWROb2Rl LnByb3RvdHlwZS5fb3BlbkluTmV3VGFiKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L1Jlc291cmNlc1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZyYW1lUmVzb3VyY2VU cmVlRWxlbWVudC5wcm90b3R5cGUub25kYmxjbGljayk6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9pbnNwZWN0b3IuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuaGlnaGxpZ2h0RE9N Tm9kZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iub3BlblJlc291cmNlKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5kb2N1bWVudEtleURvd24pOgorCiAyMDExLTA0LTI1ICBKb24gTGVlICA8am9u bGVlQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBNYWNpZWogU3RhY2hvd2lhay4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbiBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgppbmRleCA3ZTNjNTRlMjVkYmVl YmFkNjAyOGUwMzA2ZDNkYTVlOTc5ZTAzODRlLi45NjNmMjFmZGM1NDNhZDA2ZWEwNzA0Y2YwODFi N2E4YTVlN2E5ZjEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yLmpzb24KKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCkBA IC01OCw0OCArNTgsNTAgQEAKICAgICB9LAogICAgIHsKICAgICAgICAgImRvbWFpbiI6ICJQYWdl IiwKKyAgICAgICAgImRlc2NyaXB0aW9uIjogIkFjdGlvbnMgYW5kIGV2ZW50cyByZWxhdGVkIHRv IHRoZSBpbnNwZWN0ZWQgcGFnZSBiZWxvbmcgdG8gdGhlIHBhZ2UgZG9tYWluLiIsCiAgICAgICAg ICJ0eXBlcyI6IFtdLAogICAgICAgICAiY29tbWFuZHMiOiBbCiAgICAgICAgICAgICB7CiAgICAg ICAgICAgICAgICAgIm5hbWUiOiAiYWRkU2NyaXB0VG9FdmFsdWF0ZU9uTG9hZCIsCiAgICAgICAg ICAgICAgICAgInBhcmFtZXRlcnMiOiBbCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAi c2NyaXB0U291cmNlIiwgInR5cGUiOiAic3RyaW5nIiB9Ci0gICAgICAgICAgICAgICAgXQorICAg ICAgICAgICAgICAgIF0sCisgICAgICAgICAgICAgICAgImhpZGRlbiI6IHRydWUKICAgICAgICAg ICAgIH0sCiAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgIm5hbWUiOiAicmVtb3ZlQWxs U2NyaXB0c1RvRXZhbHVhdGVPbkxvYWQiCisgICAgICAgICAgICAgICAgIm5hbWUiOiAicmVtb3Zl QWxsU2NyaXB0c1RvRXZhbHVhdGVPbkxvYWQiLAorICAgICAgICAgICAgICAgICJoaWRkZW4iOiB0 cnVlCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICJuYW1l IjogInJlbG9hZFBhZ2UiLAorICAgICAgICAgICAgICAgICJuYW1lIjogInJlbG9hZCIsCiAgICAg ICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUi OiAiaWdub3JlQ2FjaGUiLCAidHlwZSI6ICJib29sZWFuIiwgIm9wdGlvbmFsIjogdHJ1ZSB9Ci0g ICAgICAgICAgICAgICAgXQotICAgICAgICAgICAgfSwKLSAgICAgICAgICAgIHsKLSAgICAgICAg ICAgICAgICAibmFtZSI6ICJvcGVuSW5JbnNwZWN0ZWRXaW5kb3ciLAotICAgICAgICAgICAgICAg ICJwYXJhbWV0ZXJzIjogWwotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInVybCIsICJ0 eXBlIjogInN0cmluZyIgfQotICAgICAgICAgICAgICAgIF0KKyAgICAgICAgICAgICAgICBdLAor ICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJSZWxvYWRzIGdpdmVuIHBhZ2Ugb3B0aW9u YWxseSBpZ25vcmluZyB0aGUgY2FjaGUuIgogICAgICAgICAgICAgfSwKICAgICAgICAgICAgIHsK LSAgICAgICAgICAgICAgICAibmFtZSI6ICJzZXRVc2VyQWdlbnRPdmVycmlkZSIsCisgICAgICAg ICAgICAgICAgIm5hbWUiOiAib3BlbiIsCiAgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBb Ci0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidXNlckFnZW50IiwgInR5cGUiOiAic3Ry aW5nIiB9Ci0gICAgICAgICAgICAgICAgXQorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjog InVybCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJVUkwgdG8gb3Blbi4iIH0s CisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibmV3V2luZG93IiwgIm9wdGlvbmFsIjog dHJ1ZSwgInR5cGUiOiAiYm9vbGVhbiIsICJkZXNjcmlwdGlvbiI6ICJJZiBUcnVlLCBvcGVucyBn aXZlbiBVUkwgaW4gYSBuZXcgd2luZG93IG9yIHRhYi4iIH0KKyAgICAgICAgICAgICAgICBdLAor ICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJPcGVucyBnaXZlbiBVUkwgZWl0aGVyIGlu IHRoZSBpbnNwZWN0ZWQgcGFnZSBvciBpbiBhIG5ldyB0YWIgLyB3aW5kb3cuIgogICAgICAgICAg ICAgfSwKICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAibmFtZSI6ICJnZXRDb29raWVz IiwKICAgICAgICAgICAgICAgICAicmV0dXJucyI6IFsKLSAgICAgICAgICAgICAgICAgICAgeyAi bmFtZSI6ICJjb29raWVzIiwgInR5cGUiOiAiYXJyYXkiLCAiaXRlbXMiOiB7ICIkcmVmIjogIkNv b2tpZSJ9IH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiY29va2llc1N0cmluZyIs ICJ0eXBlIjogInN0cmluZyIgfQotICAgICAgICAgICAgICAgIF0KKyAgICAgICAgICAgICAgICAg ICAgeyAibmFtZSI6ICJjb29raWVzIiwgInR5cGUiOiAiYXJyYXkiLCAiaXRlbXMiOiB7ICIkcmVm IjogIkNvb2tpZSJ9LCAiZGVzY3JpcHRpb24iOiAiQXJyYXkgb2YgY29va2llIG9iamVjdHMuIiB9 LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImNvb2tpZXNTdHJpbmciLCAidHlwZSI6 ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiZG9jdW1lbnQuY29va2llIHN0cmluZyByZXByZXNl bnRhdGlvbiBvZiB0aGUgY29va2llcy4iIH0KKyAgICAgICAgICAgICAgICBdLAorICAgICAgICAg ICAgICAgICJkZXNjcmlwdGlvbiI6ICJSZXR1cm5zIGFsbCBicm93c2VyIGNvb2tpZXMuIERlcGVu ZGluZyBvbiB0aGUgYmFja2VuZCBzdXBwb3J0LCB3aWxsIGVpdGhlciByZXR1cm4gZGV0YWlsZWQg Y29va2llIGluZm9ybWF0aW9uIGluIHRoZSA8Y29kZT5jb29raWU8L2NvZGU+IGZpZWxkIG9yIHN0 cmluZyBjb29raWUgcmVwcmVzZW50YXRpb24gdXNpbmcgPGNvZGU+Y29va2llU3RyaW5nPC9jb2Rl Pi4iCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICJuYW1l IjogImRlbGV0ZUNvb2tpZSIsCiAgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCi0gICAg ICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiY29va2llTmFtZSIsICJ0eXBlIjogInN0cmluZyIg fSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJkb21haW4iLCAidHlwZSI6ICJzdHJp bmciIH0KLSAgICAgICAgICAgICAgICBdCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAi Y29va2llTmFtZSIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJOYW1lIG9mIHRo ZSBjb29raWUgdG8gcmVtb3ZlLiIgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJk b21haW4iLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiRG9tYWluIG9mIHRoZSBj b29raWUgdG8gcmVtb3ZlLiIgfQorICAgICAgICAgICAgICAgIF0sCisgICAgICAgICAgICAgICAg ImRlc2NyaXB0aW9uIjogIkRlbGV0ZXMgYnJvd3NlciBjb29raWUgd2l0aCBnaXZlbiBuYW1lIGZv ciB0aGUgZ2l2ZW4gZG9tYWluLiIKICAgICAgICAgICAgIH0KICAgICAgICAgXSwKICAgICAgICAg ImV2ZW50cyI6IFsKQEAgLTQxNSwxNSArNDE3LDIyIEBACiAgICAgICAgICAgICAgICAgIm5hbWUi OiAiZ2V0UmVzb3VyY2VDb250ZW50IiwKICAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAi UmV0dXJucyBjb250ZW50IG9mIHRoZSBnaXZlbiByZXNvdXJjZS4iLAogICAgICAgICAgICAgICAg ICJwYXJhbWV0ZXJzIjogWwotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImZyYW1lSWQi LCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiRnJhbWUgaWQgdG8gZ2V0IHJlc291 cmNlIGZvci4iICB9LAotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInVybCIsICJ0eXBl IjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJVUkwgb2YgdGhlIHJlc291cmNlIHRvIGdldCBj b250ZW50IGZvci4iICB9LAotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImJhc2U2NEVu Y29kZSIsICJ0eXBlIjogImJvb2xlYW4iLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24i OiAiUmVxdWVzdHMgdGhhdCByZXNvdXJjZSBjb250ZW50IGlzIHNlcnZlZCBhcyBiYXNlNjQuIiAg fQorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImZyYW1lSWQiLCAidHlwZSI6ICJzdHJp bmciLCAiZGVzY3JpcHRpb24iOiAiRnJhbWUgaWQgdG8gZ2V0IHJlc291cmNlIGZvci4iIH0sCisg ICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidXJsIiwgInR5cGUiOiAic3RyaW5nIiwgImRl c2NyaXB0aW9uIjogIlVSTCBvZiB0aGUgcmVzb3VyY2UgdG8gZ2V0IGNvbnRlbnQgZm9yLiIgfSwK KyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJiYXNlNjRFbmNvZGUiLCAidHlwZSI6ICJi b29sZWFuIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIlJlcXVlc3RzIHRoYXQg cmVzb3VyY2UgY29udGVudCBpcyBzZXJ2ZWQgYXMgYmFzZTY0LiIgfQogICAgICAgICAgICAgICAg IF0sCiAgICAgICAgICAgICAgICAgInJldHVybnMiOiBbCiAgICAgICAgICAgICAgICAgICAgIHsg Im5hbWUiOiAiY29udGVudCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJSZXNv dXJjZSBjb250ZW50LiIgfQogICAgICAgICAgICAgICAgIF0KICAgICAgICAgICAgIH0sCiAgICAg ICAgICAgICB7CisgICAgICAgICAgICAgICAgIm5hbWUiOiAic2V0VXNlckFnZW50T3ZlcnJpZGUi LAorICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJBbGxvd3Mgb3ZlcnJpZGluZyB1c2Vy IGFnZW50IHdpdGggdGhlIGdpdmVuIHN0cmluZy4iLAorICAgICAgICAgICAgICAgICJwYXJhbWV0 ZXJzIjogWworICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInVzZXJBZ2VudCIsICJ0eXBl IjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJVc2VyIGFnZW50IHRvIHVzZS4iIH0KKyAgICAg ICAgICAgICAgICBdCisgICAgICAgICAgICB9LAorICAgICAgICAgICAgewogICAgICAgICAgICAg ICAgICJuYW1lIjogInNldEV4dHJhSGVhZGVycyIsCiAgICAgICAgICAgICAgICAgImRlc2NyaXB0 aW9uIjogIkFsbG93cyBzZW5kaW5nIGV4dHJhIEhUVFAgaGVhZGVycyB3aXRoIHRoZSByZXF1ZXN0 cyBmcm9tIHRoaXMgcGFnZS4iLAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwpAQCAt ODg4LDI5ICs4OTcsMzQgQEAKICAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiUmVxdWVz dHMgdGhhdCB0aGUgbm9kZSBpcyBzZW50IHRvIHRoZSBjYWxsZXIgZ2l2ZW4gdGhlIEphdmFTY3Jp cHQgbm9kZSBvYmplY3QgcmVmZXJlbmNlLiIKICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICB7 Ci0gICAgICAgICAgICAgICAgIm5hbWUiOiAic2V0U2VhcmNoaW5nRm9yTm9kZSIsCisgICAgICAg ICAgICAgICAgIm5hbWUiOiAic2V0SW5zcGVjdE1vZGVFbmFibGVkIiwKICAgICAgICAgICAgICAg ICAicGFyYW1ldGVycyI6IFsKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJlbmFibGVk IiwgInR5cGUiOiAiYm9vbGVhbiIgfQotICAgICAgICAgICAgICAgIF0KKyAgICAgICAgICAgICAg ICAgICAgeyAibmFtZSI6ICJlbmFibGVkIiwgInR5cGUiOiAiYm9vbGVhbiIsICJkZXNjcmlwdGlv biI6ICJUcnVlIHRvIGVuYWJsZSBpbnNwZWN0aW9uIG1vZGUsIGZhbHNlIHRvIGRpc2FibGUgaXQu IiB9CisgICAgICAgICAgICAgICAgXSwKKyAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAi RW50ZXJzIHRoZSAnaW5zcGVjdCcgbW9kZS4gSW4gdGhpcyBtb2RlLCBlbGVtZW50cyB0aGF0IHVz ZXIgaXMgaG92ZXJpbmcgb3ZlciBhcmUgaGlnaGxpZ2h0ZWQuIEJhY2tlbmQgdGhlbiBnZW5lcmF0 ZXMgJ2luc3BlY3QnIGNvbW1hbmQgdXBvbiBlbGVtZW50IHNlbGVjdGlvbi4iCiAgICAgICAgICAg ICB9LAogICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICJuYW1lIjogImhpZ2hsaWdodERP TU5vZGUiLAorICAgICAgICAgICAgICAgICJuYW1lIjogImhpZ2hsaWdodE5vZGUiLAogICAgICAg ICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjog Im5vZGVJZCIsICJ0eXBlIjogImludGVnZXIiIH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5h bWUiOiAibm9kZUlkIiwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJJZGVudGlm aWVyIG9mIHRoZSBub2RlIHRvIGhpZ2hsaWdodCIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAi bmFtZSI6ICJtb2RlIiwgInR5cGUiOiAic3RyaW5nIiwgImVudW0iOiBbImFsbCIsICJjb250ZW50 IiwgInBhZGRpbmciLCAiYm9yZGVyIiwgIm1hcmdpbiJdLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVz Y3JpcHRpb24iOiAiVGhlIGJveCBtb2RlbCBjb21wb25lbnQocykgdG8gaGlnaGxpZ2h0IChkZWZh dWx0OiBcImFsbFwiKS4iIH0sCi0gICAgICAgICAgICAgICAgXQorICAgICAgICAgICAgICAgIF0s CisgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgRE9NIG5vZGUgd2l0 aCBnaXZlbiBpZC4iCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgewotICAgICAgICAgICAg ICAgICJuYW1lIjogImhpZGVET01Ob2RlSGlnaGxpZ2h0IgorICAgICAgICAgICAgICAgICJuYW1l IjogImhpZGVOb2RlSGlnaGxpZ2h0IiwKKyAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAi SGlkZXMgRE9NIG5vZGUgaGlnaGxpZ2h0LiIKICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICB7 CiAgICAgICAgICAgICAgICAgIm5hbWUiOiAiaGlnaGxpZ2h0RnJhbWUiLAogICAgICAgICAgICAg ICAgICJwYXJhbWV0ZXJzIjogWwotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImZyYW1l SWQiLCAidHlwZSI6ICJzdHJpbmciIH0KLSAgICAgICAgICAgICAgICBdCisgICAgICAgICAgICAg ICAgICAgIHsgIm5hbWUiOiAiZnJhbWVJZCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlv biI6ICJJZGVudGlmaWVyIG9mIHRoZSBmcmFtZSB0byBoaWdobGlnaHQiIH0KKyAgICAgICAgICAg ICAgICBdLAorICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJIaWdobGlnaHRzIG93bmVy IGVsZW1lbnQgb2YgdGhlIGZyYW1lIHdpdGggZ2l2ZW4gaWQuIgogICAgICAgICAgICAgfSwKICAg ICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAibmFtZSI6ICJoaWRlRnJhbWVIaWdobGlnaHQi CisgICAgICAgICAgICAgICAgIm5hbWUiOiAiaGlkZUZyYW1lSGlnaGxpZ2h0IiwKKyAgICAgICAg ICAgICAgICAiZGVzY3JpcHRpb24iOiAiSGlkZXMgZnJhbWUgb3duZXIgaGlnaGxpZ2h0LiIKICAg ICAgICAgICAgIH0sCiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgIm5hbWUiOiAicHVz aE5vZGVCeVBhdGhUb0Zyb250ZW5kIiwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yRE9NQWdlbnQuY3BwCmluZGV4IDRhOWQyNDMzNDdjZGU1MzM1OTEyNmNiYmJkM2E3MDUy ZDFlZTljN2QuLmJmODllYjZhMTFjMjBmYzAxZTg0M2YwNmNhYmVmODdiOTdhNTAwMjYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcApAQCAtOTQx LDcgKzk0MSw3IEBAIHZvaWQgSW5zcGVjdG9yRE9NQWdlbnQ6OnNldFNlYXJjaGluZ0Zvck5vZGUo Ym9vbCBlbmFibGVkKQogICAgIH0KIH0KIAotdm9pZCBJbnNwZWN0b3JET01BZ2VudDo6c2V0U2Vh cmNoaW5nRm9yTm9kZShFcnJvclN0cmluZyosIGJvb2wgZW5hYmxlZCkKK3ZvaWQgSW5zcGVjdG9y RE9NQWdlbnQ6OnNldEluc3BlY3RNb2RlRW5hYmxlZChFcnJvclN0cmluZyosIGJvb2wgZW5hYmxl ZCkKIHsKICAgICBzZXRTZWFyY2hpbmdGb3JOb2RlKGVuYWJsZWQpOwogfQpAQCAtOTU0LDcgKzk1 NCw3IEBAIHZvaWQgSW5zcGVjdG9yRE9NQWdlbnQ6OmhpZ2hsaWdodChFcnJvclN0cmluZyosIE5v ZGUqIG5vZGUsIGNvbnN0IFN0cmluZyYgbW9kZSkKICAgICBtX2NsaWVudC0+aGlnaGxpZ2h0KG5v ZGUpOwogfQogCi12b2lkIEluc3BlY3RvckRPTUFnZW50OjpoaWdobGlnaHRET01Ob2RlKEVycm9y U3RyaW5nKiBlcnJvciwgaW50IG5vZGVJZCwgU3RyaW5nKiBtb2RlKQordm9pZCBJbnNwZWN0b3JE T01BZ2VudDo6aGlnaGxpZ2h0Tm9kZShFcnJvclN0cmluZyogZXJyb3IsIGludCBub2RlSWQsIFN0 cmluZyogbW9kZSkKIHsKICAgICBpZiAoTm9kZSogbm9kZSA9IG5vZGVGb3JJZChub2RlSWQpKQog ICAgICAgICBoaWdobGlnaHQoZXJyb3IsIG5vZGUsIG1vZGUgJiYgIW1vZGUtPmlzRW1wdHkoKSA/ ICptb2RlIDogImFsbCIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvckRPTUFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9N QWdlbnQuaAppbmRleCBkODk4OWFiYTg1NTUyODgxMjk3NjBkYWQ5ZTE2YzlmYTVkOWE5ZDQ0Li4y ODQ5NDkwZWI4Y2ZmMGFhNWVjYjJiNjYzM2RjOWU2M2FjNDkyYzVmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuaApAQCAtMTI2LDEyICsxMjYsMTIgQEAg cHVibGljOgogICAgIHZvaWQgcGVyZm9ybVNlYXJjaChFcnJvclN0cmluZyosIGNvbnN0IFN0cmlu ZyYgd2hpdGVzcGFjZVRyaW1tZWRRdWVyeSwgY29uc3QgYm9vbCogY29uc3QgcnVuU3luY2hyb25v dXNseSk7CiAgICAgdm9pZCBjYW5jZWxTZWFyY2goRXJyb3JTdHJpbmcqKTsKICAgICB2b2lkIHJl c29sdmVOb2RlKEVycm9yU3RyaW5nKiwgaW50IG5vZGVJZCwgUmVmUHRyPEluc3BlY3Rvck9iamVj dD4qIHJlc3VsdCk7Ci0gICAgdm9pZCBzZXRTZWFyY2hpbmdGb3JOb2RlKEVycm9yU3RyaW5nKiwg Ym9vbCBlbmFibGVkKTsKKyAgICB2b2lkIHNldEluc3BlY3RNb2RlRW5hYmxlZChFcnJvclN0cmlu ZyosIGJvb2wgZW5hYmxlZCk7CiAgICAgdm9pZCBwdXNoTm9kZVRvRnJvbnRlbmQoRXJyb3JTdHJp bmcqLCBjb25zdCBTdHJpbmcmIG9iamVjdElkLCBpbnQqIG5vZGVJZCk7CiAgICAgdm9pZCBwdXNo Tm9kZUJ5UGF0aFRvRnJvbnRlbmQoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIHBhdGgsIGlu dCogbm9kZUlkKTsKICAgICB2b2lkIGhpZGVIaWdobGlnaHQoRXJyb3JTdHJpbmcqKTsKLSAgICB2 b2lkIGhpZ2hsaWdodERPTU5vZGUoRXJyb3JTdHJpbmcqLCBpbnQgbm9kZUlkLCBTdHJpbmcqIG1v ZGUpOwotICAgIHZvaWQgaGlkZURPTU5vZGVIaWdobGlnaHQoRXJyb3JTdHJpbmcqIGVycm9yKSB7 IGhpZGVIaWdobGlnaHQoZXJyb3IpOyB9CisgICAgdm9pZCBoaWdobGlnaHROb2RlKEVycm9yU3Ry aW5nKiwgaW50IG5vZGVJZCwgU3RyaW5nKiBtb2RlKTsKKyAgICB2b2lkIGhpZGVOb2RlSGlnaGxp Z2h0KEVycm9yU3RyaW5nKiBlcnJvcikgeyBoaWRlSGlnaGxpZ2h0KGVycm9yKTsgfQogICAgIHZv aWQgaGlnaGxpZ2h0RnJhbWUoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIGZyYW1lSWQpOwog ICAgIHZvaWQgaGlkZUZyYW1lSGlnaGxpZ2h0KEVycm9yU3RyaW5nKiBlcnJvcikgeyBoaWRlSGln aGxpZ2h0KGVycm9yKTsgfQogICAgIE5vZGUqIGhpZ2hsaWdodGVkTm9kZSgpIGNvbnN0IHsgcmV0 dXJuIG1faGlnaGxpZ2h0ZWROb2RlLmdldCgpOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwCmluZGV4IDk5ODY2NzdjM2Ey M2U4OTA3ODBjZGZiMGZjMjlhOTQyOGJiNjdkNTMuLmRjNGU1YWNjYzM2OWQ0NmFmOWU2M2YyYWJm OWNkMjU0NDU0ZTY0N2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwCkBAIC0zOTAsOCArMzkwLDggQEAgdm9pZCBJbnNw ZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZFJlY2FsY3VsYXRlU3R5bGVJbXBsKGNvbnN0IEluc3Bl Y3Rvckluc3RydW1lbnQKIAogdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmFwcGx5VXNl ckFnZW50T3ZlcnJpZGVJbXBsKEluc3BlY3RvckFnZW50KiBpbnNwZWN0b3JBZ2VudCwgU3RyaW5n KiB1c2VyQWdlbnQpCiB7Ci0gICAgaWYgKEluc3BlY3RvclBhZ2VBZ2VudCogcGFnZUFnZW50ID0g cmV0cmlldmVQYWdlQWdlbnQoaW5zcGVjdG9yQWdlbnQpKQotICAgICAgICBwYWdlQWdlbnQtPmFw cGx5VXNlckFnZW50T3ZlcnJpZGUodXNlckFnZW50KTsKKyAgICBpZiAoSW5zcGVjdG9yUmVzb3Vy Y2VBZ2VudCogcmVzb3VyY2VBZ2VudCA9IHJldHJpZXZlUmVzb3VyY2VBZ2VudChpbnNwZWN0b3JB Z2VudCkpCisgICAgICAgIHJlc291cmNlQWdlbnQtPmFwcGx5VXNlckFnZW50T3ZlcnJpZGUodXNl ckFnZW50KTsKIH0KIAogdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OndpbGxTZW5kUmVx dWVzdEltcGwoSW5zcGVjdG9yQWdlbnQqIGluc3BlY3RvckFnZW50LCB1bnNpZ25lZCBsb25nIGlk ZW50aWZpZXIsIERvY3VtZW50TG9hZGVyKiBsb2FkZXIsIFJlc291cmNlUmVxdWVzdCYgcmVxdWVz dCwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVkaXJlY3RSZXNwb25zZSkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuY3BwIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5jcHAKaW5kZXggODYwODU0M2U4 ZjA4YjFkOWUxYTIwMTMyMDcwN2IxOGE1ZjEyMTI1ZS4uOGZmMmYxMDBhOGRhZGQ4NTI2NTE4M2Rl NGFmMTI1NWNmZmY1ODM3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvclBhZ2VBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvclBhZ2VBZ2VudC5jcHAKQEAgLTc5LDcgKzc5LDYgQEAgdm9pZCBJbnNwZWN0b3JQYWdlQWdl bnQ6OnNldEZyb250ZW5kKEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVuZCkKIHZvaWQgSW5zcGVj dG9yUGFnZUFnZW50OjpjbGVhckZyb250ZW5kKCkKIHsKICAgICBtX2luc3RydW1lbnRpbmdBZ2Vu dHMtPnNldEluc3BlY3RvclBhZ2VBZ2VudCgwKTsKLSAgICBtX3VzZXJBZ2VudE92ZXJyaWRlID0g IiI7CiAgICAgbV9mcm9udGVuZCA9IDA7CiB9CiAKQEAgLTkzLDM4ICs5MiwzMSBAQCB2b2lkIElu c3BlY3RvclBhZ2VBZ2VudDo6cmVtb3ZlQWxsU2NyaXB0c1RvRXZhbHVhdGVPbkxvYWQoRXJyb3JT dHJpbmcqKQogICAgIG1fc2NyaXB0c1RvRXZhbHVhdGVPbkxvYWQuY2xlYXIoKTsKIH0KIAotdm9p ZCBJbnNwZWN0b3JQYWdlQWdlbnQ6OnJlbG9hZFBhZ2UoRXJyb3JTdHJpbmcqLCBjb25zdCBib29s KiBjb25zdCBvcHRpb25hbElnbm9yZUNhY2hlKQordm9pZCBJbnNwZWN0b3JQYWdlQWdlbnQ6OnJl bG9hZChFcnJvclN0cmluZyosIGNvbnN0IGJvb2wqIGNvbnN0IG9wdGlvbmFsSWdub3JlQ2FjaGUp CiB7CiAgICAgbV9pbnNwZWN0ZWRQYWdlLT5tYWluRnJhbWUoKS0+bG9hZGVyKCktPnJlbG9hZChv cHRpb25hbElnbm9yZUNhY2hlID8gKm9wdGlvbmFsSWdub3JlQ2FjaGUgOiBmYWxzZSk7CiB9CiAK LXZvaWQgSW5zcGVjdG9yUGFnZUFnZW50OjpvcGVuSW5JbnNwZWN0ZWRXaW5kb3coRXJyb3JTdHJp bmcqLCBjb25zdCBTdHJpbmcmIHVybCkKK3ZvaWQgSW5zcGVjdG9yUGFnZUFnZW50OjpvcGVuKEVy cm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IGJvb2wqIGNvbnN0IGluTmV3V2lu ZG93KQogewogICAgIEZyYW1lKiBtYWluRnJhbWUgPSBtX2luc3BlY3RlZFBhZ2UtPm1haW5GcmFt ZSgpOworICAgIEZyYW1lKiBmcmFtZTsKKyAgICBpZiAoaW5OZXdXaW5kb3cgJiYgKmluTmV3V2lu ZG93KSB7CisgICAgICAgIEZyYW1lTG9hZFJlcXVlc3QgcmVxdWVzdChtYWluRnJhbWUtPmRvY3Vt ZW50KCktPnNlY3VyaXR5T3JpZ2luKCksIFJlc291cmNlUmVxdWVzdCgpLCAiX2JsYW5rIik7CiAK LSAgICBGcmFtZUxvYWRSZXF1ZXN0IHJlcXVlc3QobWFpbkZyYW1lLT5kb2N1bWVudCgpLT5zZWN1 cml0eU9yaWdpbigpLCBSZXNvdXJjZVJlcXVlc3QoKSwgIl9ibGFuayIpOworICAgICAgICBib29s IGNyZWF0ZWQ7CisgICAgICAgIFdpbmRvd0ZlYXR1cmVzIHdpbmRvd0ZlYXR1cmVzOworICAgICAg ICBmcmFtZSA9IFdlYkNvcmU6OmNyZWF0ZVdpbmRvdyhtYWluRnJhbWUsIG1haW5GcmFtZSwgcmVx dWVzdCwgd2luZG93RmVhdHVyZXMsIGNyZWF0ZWQpOworICAgICAgICBpZiAoIWZyYW1lKQorICAg ICAgICAgICAgcmV0dXJuOwogCi0gICAgYm9vbCBjcmVhdGVkOwotICAgIFdpbmRvd0ZlYXR1cmVz IHdpbmRvd0ZlYXR1cmVzOwotICAgIEZyYW1lKiBuZXdGcmFtZSA9IFdlYkNvcmU6OmNyZWF0ZVdp bmRvdyhtYWluRnJhbWUsIG1haW5GcmFtZSwgcmVxdWVzdCwgd2luZG93RmVhdHVyZXMsIGNyZWF0 ZWQpOwotICAgIGlmICghbmV3RnJhbWUpCi0gICAgICAgIHJldHVybjsKKyAgICAgICAgZnJhbWUt PmxvYWRlcigpLT5zZXRPcGVuZXIobWFpbkZyYW1lKTsKKyAgICAgICAgZnJhbWUtPnBhZ2UoKS0+ c2V0T3BlbmVkQnlET00oKTsKKyAgICB9IGVsc2UKKyAgICAgICAgZnJhbWUgPSBtYWluRnJhbWU7 CiAKICAgICBVc2VyR2VzdHVyZUluZGljYXRvciBpbmRpY2F0b3IoRGVmaW5pdGVseVByb2Nlc3Np bmdVc2VyR2VzdHVyZSk7Ci0gICAgbmV3RnJhbWUtPmxvYWRlcigpLT5zZXRPcGVuZXIobWFpbkZy YW1lKTsKLSAgICBuZXdGcmFtZS0+cGFnZSgpLT5zZXRPcGVuZWRCeURPTSgpOwotICAgIG5ld0Zy YW1lLT5sb2FkZXIoKS0+Y2hhbmdlTG9jYXRpb24obWFpbkZyYW1lLT5kb2N1bWVudCgpLT5zZWN1 cml0eU9yaWdpbigpLCBuZXdGcmFtZS0+bG9hZGVyKCktPmNvbXBsZXRlVVJMKHVybCksICIiLCBm YWxzZSwgZmFsc2UpOwotfQotCi12b2lkIEluc3BlY3RvclBhZ2VBZ2VudDo6c2V0VXNlckFnZW50 T3ZlcnJpZGUoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIHVzZXJBZ2VudCkKLXsKLSAgICBt X3VzZXJBZ2VudE92ZXJyaWRlID0gdXNlckFnZW50OwotfQotCi12b2lkIEluc3BlY3RvclBhZ2VB Z2VudDo6YXBwbHlVc2VyQWdlbnRPdmVycmlkZShTdHJpbmcqIHVzZXJBZ2VudCkgY29uc3QKLXsK LSAgICBpZiAoIW1fdXNlckFnZW50T3ZlcnJpZGUuaXNFbXB0eSgpKQotICAgICAgICAqdXNlckFn ZW50ID0gbV91c2VyQWdlbnRPdmVycmlkZTsKKyAgICBmcmFtZS0+bG9hZGVyKCktPmNoYW5nZUxv Y2F0aW9uKG1haW5GcmFtZS0+ZG9jdW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKSwgZnJhbWUtPmxv YWRlcigpLT5jb21wbGV0ZVVSTCh1cmwpLCAiIiwgZmFsc2UsIGZhbHNlKTsKIH0KIAogc3RhdGlj IFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBidWlsZE9iamVjdEZvckNvb2tpZShjb25zdCBD b29raWUmIGNvb2tpZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JQYWdlQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdl QWdlbnQuaAppbmRleCAyMzNhOTUzNDBkY2I1NTM3ZTk4YzdjMGM4NTE5ZmYxYTAwNjQ1MzE0Li5i OTVjYzE4NWJkY2RkMjJiMWFiNzgxOGI2ZDI3MDkyZjVkODA0YmQwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmgKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5oCkBAIC01OCw5ICs1OCw4IEBAIHB1 YmxpYzoKICAgICAvLyBQYWdlIEFQSSBmb3IgSW5zcGVjdG9yRnJvbnRlbmQKICAgICB2b2lkIGFk ZFNjcmlwdFRvRXZhbHVhdGVPbkxvYWQoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIHNvdXJj ZSk7CiAgICAgdm9pZCByZW1vdmVBbGxTY3JpcHRzVG9FdmFsdWF0ZU9uTG9hZChFcnJvclN0cmlu ZyopOwotICAgIHZvaWQgcmVsb2FkUGFnZShFcnJvclN0cmluZyosIGNvbnN0IGJvb2wqIGNvbnN0 IG9wdGlvbmFsSWdub3JlQ2FjaGUpOwotICAgIHZvaWQgb3BlbkluSW5zcGVjdGVkV2luZG93KEVy cm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiB1cmwpOwotICAgIHZvaWQgc2V0VXNlckFnZW50T3Zl cnJpZGUoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIHVzZXJBZ2VudCk7CisgICAgdm9pZCBy ZWxvYWQoRXJyb3JTdHJpbmcqLCBjb25zdCBib29sKiBjb25zdCBvcHRpb25hbElnbm9yZUNhY2hl KTsKKyAgICB2b2lkIG9wZW4oRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIHVybCwgY29uc3Qg Ym9vbCogY29uc3QgaW5OZXdXaW5kb3cpOwogICAgIHZvaWQgZ2V0Q29va2llcyhFcnJvclN0cmlu ZyosIFJlZlB0cjxJbnNwZWN0b3JBcnJheT4qIGNvb2tpZXMsIFdURjo6U3RyaW5nKiBjb29raWVz U3RyaW5nKTsKICAgICB2b2lkIGRlbGV0ZUNvb2tpZShFcnJvclN0cmluZyosIGNvbnN0IFN0cmlu ZyYgY29va2llTmFtZSwgY29uc3QgU3RyaW5nJiBkb21haW4pOwogCkBAIC04NCw3ICs4Myw2IEBA IHByaXZhdGU6CiAgICAgSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyKiBtX2luamVjdGVkU2NyaXB0TWFu YWdlcjsKICAgICBJbnNwZWN0b3JGcm9udGVuZCogbV9mcm9udGVuZDsKICAgICBWZWN0b3I8U3Ry aW5nPiBtX3NjcmlwdHNUb0V2YWx1YXRlT25Mb2FkOwotICAgIFN0cmluZyBtX3VzZXJBZ2VudE92 ZXJyaWRlOwogfTsKIAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yUmVzb3VyY2VBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yUmVzb3VyY2VBZ2VudC5jcHAKaW5kZXggZjIwMDcwMmVlZTk5YmM5YzBkMmM1MmVkNzRiYjBl YTQyZmU5MzUyNy4uNWJiZDM2MDEyMmQ0MWZhMDM0YzVmMTE1ZjU5ZTY5NDNhNTViNjk2YSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50 LmNwcApAQCAtMTA3LDYgKzEwNyw4IEBAIHZvaWQgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6Y2xl YXJGcm9udGVuZCgpCiAgICAgICAgIG1fZnJvbnRlbmQgPSBtX21vY2tGcm9udGVuZC5nZXQoKTsK ICAgICB9IGVsc2UKICAgICAgICAgbV9mcm9udGVuZCA9IDA7CisKKyAgICBtX3VzZXJBZ2VudE92 ZXJyaWRlID0gIiI7CiAgICAgZGlzYWJsZSgwKTsKIH0KIApAQCAtNDYyLDYgKzQ2NCwxMiBAQCB2 b2lkIEluc3BlY3RvclJlc291cmNlQWdlbnQ6OmZyYW1lRGV0YWNoZWRGcm9tUGFyZW50KEZyYW1l KiBmcmFtZSkKICAgICBtX2Zyb250ZW5kLT5mcmFtZURldGFjaGVkKHBvaW50ZXJBc0lkKGZyYW1l KSk7CiB9CiAKK3ZvaWQgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6YXBwbHlVc2VyQWdlbnRPdmVy cmlkZShTdHJpbmcqIHVzZXJBZ2VudCkKK3sKKyAgICBpZiAoIW1fdXNlckFnZW50T3ZlcnJpZGUu aXNFbXB0eSgpKQorICAgICAgICAqdXNlckFnZW50ID0gbV91c2VyQWdlbnRPdmVycmlkZTsKK30K KwogI2lmIEVOQUJMRShXRUJfU09DS0VUUykKIAogLy8gRklYTUU6IE1vcmUgdGhpcyBpbnRvIHRo ZSBmcm9udC1lbmQ/CkBAIC01NjMsNiArNTcxLDExIEBAIHZvaWQgSW5zcGVjdG9yUmVzb3VyY2VB Z2VudDo6Z2V0UmVzb3VyY2VDb250ZW50KEVycm9yU3RyaW5nKiBlcnJvclN0cmluZywgY29uc3QK ICAgICAgICAgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6cmVzb3VyY2VDb250ZW50KGVycm9yU3Ry aW5nLCBmcmFtZSwgS1VSTChQYXJzZWRVUkxTdHJpbmcsIHVybCksIGNvbnRlbnQpOwogfQogCit2 b2lkIEluc3BlY3RvclJlc291cmNlQWdlbnQ6OnNldFVzZXJBZ2VudE92ZXJyaWRlKEVycm9yU3Ry aW5nKiwgY29uc3QgU3RyaW5nJiB1c2VyQWdlbnQpCit7CisgICAgbV91c2VyQWdlbnRPdmVycmlk ZSA9IHVzZXJBZ2VudDsKK30KKwogdm9pZCBJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpzZXRFeHRy YUhlYWRlcnMoRXJyb3JTdHJpbmcqLCBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gaGVhZGVy cykKIHsKICAgICBtX3N0YXRlLT5zZXRPYmplY3QoUmVzb3VyY2VBZ2VudFN0YXRlOjpleHRyYVJl cXVlc3RIZWFkZXJzLCBoZWFkZXJzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5oCmluZGV4IGRmZjdlM2EzZmRjNjRhYjdlOWMwOGM0MzQ1 NzE3ZjNmY2JiZDRhZDEuLjdlMmYwN2M2NmMxZDMyNWNhZDQxNDFiOTc5ZjlhOTQyOGJlMjI4NWEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFn ZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdl bnQuaApAQCAtODYsNiArODYsNyBAQCBwdWJsaWM6CiAKICAgICBzdGF0aWMgdm9pZCByZXNvdXJj ZUNvbnRlbnQoRXJyb3JTdHJpbmcqLCBGcmFtZSosIGNvbnN0IEtVUkwmLCBTdHJpbmcqIHJlc3Vs dCk7CiAgICAgc3RhdGljIHZvaWQgcmVzb3VyY2VDb250ZW50QmFzZTY0KEVycm9yU3RyaW5nKiwg RnJhbWUqLCBjb25zdCBLVVJMJiwgU3RyaW5nKiByZXN1bHQpOworCiAgICAgc3RhdGljIFBhc3NS ZWZQdHI8U2hhcmVkQnVmZmVyPiByZXNvdXJjZURhdGEoRnJhbWUqLCBjb25zdCBLVVJMJiwgU3Ry aW5nKiB0ZXh0RW5jb2RpbmdOYW1lKTsKICAgICBzdGF0aWMgQ2FjaGVkUmVzb3VyY2UqIGNhY2hl ZFJlc291cmNlKEZyYW1lKiwgY29uc3QgS1VSTCYpOwogCkBAIC0xMDQsNiArMTA1LDcgQEAgcHVi bGljOgogICAgIHZvaWQgbG9hZEV2ZW50RmlyZWQoKTsKICAgICB2b2lkIGRpZENvbW1pdExvYWQo RG9jdW1lbnRMb2FkZXIqKTsKICAgICB2b2lkIGZyYW1lRGV0YWNoZWRGcm9tUGFyZW50KEZyYW1l Kik7CisgICAgdm9pZCBhcHBseVVzZXJBZ2VudE92ZXJyaWRlKFN0cmluZyogdXNlckFnZW50KTsK IAogI2lmIEVOQUJMRShXRUJfU09DS0VUUykKICAgICB2b2lkIGRpZENyZWF0ZVdlYlNvY2tldCh1 bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IEtVUkwmIHJlcXVlc3RVUkwpOwpAQCAtMTIw LDggKzEyMiwxMCBAQCBwdWJsaWM6CiAgICAgdm9pZCBkaXNhYmxlKEVycm9yU3RyaW5nKik7CiAg ICAgdm9pZCBnZXRDYWNoZWRSZXNvdXJjZXMoRXJyb3JTdHJpbmcqLCBSZWZQdHI8SW5zcGVjdG9y T2JqZWN0PiopOwogICAgIHZvaWQgZ2V0UmVzb3VyY2VDb250ZW50KEVycm9yU3RyaW5nKiwgY29u c3QgU3RyaW5nJiBmcmFtZUlkLCBjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgYm9vbCogY29uc3Qg YmFzZTY0RW5jb2RlLCBTdHJpbmcqIGNvbnRlbnQpOworICAgIHZvaWQgc2V0VXNlckFnZW50T3Zl cnJpZGUoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIHVzZXJBZ2VudCk7CiAgICAgdm9pZCBz ZXRFeHRyYUhlYWRlcnMoRXJyb3JTdHJpbmcqLCBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4p OwogCisKIHByaXZhdGU6CiAgICAgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudChJbnN0cnVtZW50aW5n QWdlbnRzKiwgUGFnZSosIEluc3BlY3RvclN0YXRlKik7CiAKQEAgLTEzNCw2ICsxMzgsNyBAQCBw cml2YXRlOgogICAgIEluc3BlY3RvckZyb250ZW5kOjpOZXR3b3JrKiBtX2Zyb250ZW5kOwogICAg IE93blB0cjxJbnNwZWN0b3JGcm9udGVuZDo6TmV0d29yaz4gbV9tb2NrRnJvbnRlbmQ7CiAgICAg T3duUHRyPEluc3BlY3RvckZyb250ZW5kUHJveHk+IG1faW5zcGVjdG9yRnJvbnRlbmRQcm94eTsK KyAgICBTdHJpbmcgbV91c2VyQWdlbnRPdmVycmlkZTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdl YkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQXVk aXRzUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0F1ZGl0c1Bh bmVsLmpzCmluZGV4IDdmNTZmNDE4NTk2ZGE0ZDBmNjIzN2IwOWYxZjAxODFiNGE1YjE3ZDAuLmRk YTU2N2I2ZTgzZjY4NGExYjFkMTE1YjkzNWEzY2Q1ZjIzZWMwYTggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQXVkaXRzUGFuZWwuanMKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BdWRpdHNQYW5lbC5qcwpAQCAtMTkyLDcgKzE5 Miw3IEBAIFdlYkluc3BlY3Rvci5BdWRpdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgX3JlbG9h ZFJlc291cmNlczogZnVuY3Rpb24oY2FsbGJhY2spCiAgICAgewogICAgICAgICB0aGlzLl9wYWdl UmVsb2FkQ2FsbGJhY2sgPSBjYWxsYmFjazsKLSAgICAgICAgUGFnZUFnZW50LnJlbG9hZFBhZ2Uo ZmFsc2UpOworICAgICAgICBQYWdlQWdlbnQucmVsb2FkKGZhbHNlKTsKICAgICB9LAogCiAgICAg X2RpZE1haW5SZXNvdXJjZUxvYWQ6IGZ1bmN0aW9uKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNQYW5lbC5qcwppbmRleCAzYzA1MjU4ZWYyNDRh YTQzNGVlYzRhMDllMmFhZDhmYWRlNWFmZDZkLi4xODI1ODRiOWJmNjY2MzJjNTZiZGI3ZTIwNjhi MTQ5NjE5YTMzNTIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0VsZW1lbnRzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9FbGVtZW50c1BhbmVsLmpzCkBAIC0xMTQwLDcgKzExNDAsNyBAQCBXZWJJbnNwZWN0b3Iu RWxlbWVudHNQYW5lbC5wcm90b3R5cGUgPSB7CiAKICAgICBzZXRTZWFyY2hpbmdGb3JOb2RlOiBm dW5jdGlvbihlbmFibGVkKQogICAgIHsKLSAgICAgICAgRE9NQWdlbnQuc2V0U2VhcmNoaW5nRm9y Tm9kZShlbmFibGVkLCB0aGlzLl9zZXRTZWFyY2hpbmdGb3JOb2RlLmJpbmQodGhpcywgZW5hYmxl ZCkpOworICAgICAgICBET01BZ2VudC5zZXRJbnNwZWN0TW9kZUVuYWJsZWQoZW5hYmxlZCwgdGhp cy5fc2V0U2VhcmNoaW5nRm9yTm9kZS5iaW5kKHRoaXMsIGVuYWJsZWQpKTsKICAgICB9LAogCiAg ICAgdG9nZ2xlU2VhcmNoaW5nRm9yTm9kZTogZnVuY3Rpb24oKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25TZXJ2ZXIuanMgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvblNlcnZlci5qcwppbmRleCAyYzk1 ZWYwYzMzYzNiNzA1YjhiZjhjYjlmNGI4YzViMzE0YjRmM2JlLi5jM2UyMmEyNGVmNWUyZjcwZmFh MjFhZTQxOTRlNDM4M2VmMzI5MDk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0V4dGVuc2lvblNlcnZlci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvblNlcnZlci5qcwpAQCAtMjU3LDcgKzI1Nyw3IEBAIFdl Ykluc3BlY3Rvci5FeHRlbnNpb25TZXJ2ZXIucHJvdG90eXBlID0gewogICAgICAgICBpZiAodHlw ZW9mIG1lc3NhZ2UudXNlckFnZW50ID09PSAic3RyaW5nIikKICAgICAgICAgICAgIFBhZ2VBZ2Vu dC5zZXRVc2VyQWdlbnRPdmVycmlkZShtZXNzYWdlLnVzZXJBZ2VudCk7CiAKLSAgICAgICAgUGFn ZUFnZW50LnJlbG9hZFBhZ2UoZmFsc2UpOworICAgICAgICBQYWdlQWdlbnQucmVsb2FkKGZhbHNl KTsKICAgICAgICAgcmV0dXJuIHRoaXMuX3N0YXR1cy5PSygpOwogICAgIH0sCiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanMKaW5kZXgg ZjMyYWViMzcwYzM3MGIxNjMzOGRjNmEwYTkwYjgzMjRhMzJhYjZjMC4uMjg0MDcyMWFhMTFiMmVk ZmI3NTc2NTBlOTE3MzYyYzIyZjNiNDU1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanMKQEAgLTE0MDUsNyArMTQwNSw3IEBAIFdl Ykluc3BlY3Rvci5OZXR3b3JrRGF0YUdyaWROb2RlLnByb3RvdHlwZSA9IHsKIAogICAgIF9vcGVu SW5OZXdUYWI6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIFBhZ2VBZ2VudC5vcGVuSW5JbnNw ZWN0ZWRXaW5kb3codGhpcy5fcmVzb3VyY2UudXJsKTsKKyAgICAgICAgUGFnZUFnZW50Lm9wZW4o dGhpcy5fcmVzb3VyY2UudXJsLCB0cnVlKTsKICAgICB9LAogCiAgICAgZ2V0IHNlbGVjdGFibGUo KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJj ZXNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2Vz UGFuZWwuanMKaW5kZXggOWJiZWYwZDM1MzJjOTk0NmNlNjE5NTZhYzI5NTVmZmNjMTA5MDg5OC4u MGE1MzQzZGRkNjA0MWMyZDFiMWYwZjNiNzU5YjJjODQwY2FmMjY2YyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCkBAIC0x MDcxLDcgKzEwNzEsNyBAQCBXZWJJbnNwZWN0b3IuRnJhbWVSZXNvdXJjZVRyZWVFbGVtZW50LnBy b3RvdHlwZSA9IHsKIAogICAgIG9uZGJsY2xpY2s6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKLSAg ICAgICAgUGFnZUFnZW50Lm9wZW5Jbkluc3BlY3RlZFdpbmRvdyh0aGlzLl9yZXNvdXJjZS51cmwp OworICAgICAgICBQYWdlQWdlbnQub3Blbih0aGlzLl9yZXNvdXJjZS51cmwsIHRydWUpOwogICAg IH0sCiAKICAgICBvbmF0dGFjaDogZnVuY3Rpb24oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwppbmRleCBiNzQ3NmIxZDczY2UzMDIyMmQwMzAy NGUyMjI4ZGFlNjU1ODFkOTg3Li43MDFmNGE4NmNiYjExYzdjYWQ2ZWExOGZiZGY4OTIyMTJhZDVi ZTRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3Bl Y3Rvci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rv ci5qcwpAQCAtMzE3LDkgKzMxNyw5IEBAIHZhciBXZWJJbnNwZWN0b3IgPSB7CiAKICAgICAgICAg dGhpcy5faGlnaGxpZ2h0ZWRET01Ob2RlSWQgPSBub2RlSWQ7CiAgICAgICAgIGlmIChub2RlSWQp Ci0gICAgICAgICAgICBET01BZ2VudC5oaWdobGlnaHRET01Ob2RlKG5vZGVJZCwgbW9kZSB8fCAi YWxsIik7CisgICAgICAgICAgICBET01BZ2VudC5oaWdobGlnaHROb2RlKG5vZGVJZCwgbW9kZSB8 fCAiYWxsIik7CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIERPTUFnZW50LmhpZGVET01Ob2Rl SGlnaGxpZ2h0KCk7CisgICAgICAgICAgICBET01BZ2VudC5oaWRlTm9kZUhpZ2hsaWdodCgpOwog ICAgIH0sCiAKICAgICBoaWdobGlnaHRET01Ob2RlRm9yVHdvU2Vjb25kczogZnVuY3Rpb24obm9k ZUlkKQpAQCAtNjYwLDcgKzY2MCw3IEBAIFdlYkluc3BlY3Rvci5vcGVuUmVzb3VyY2UgPSBmdW5j dGlvbihyZXNvdXJjZVVSTCwgaW5SZXNvdXJjZXNQYW5lbCkKICAgICAgICAgV2ViSW5zcGVjdG9y LnBhbmVscy5yZXNvdXJjZXMuc2hvd1Jlc291cmNlKHJlc291cmNlKTsKICAgICAgICAgV2ViSW5z cGVjdG9yLnNob3dQYW5lbCgicmVzb3VyY2VzIik7CiAgICAgfSBlbHNlCi0gICAgICAgIFBhZ2VB Z2VudC5vcGVuSW5JbnNwZWN0ZWRXaW5kb3cocmVzb3VyY2UgPyByZXNvdXJjZS51cmwgOiByZXNv dXJjZVVSTCk7CisgICAgICAgIFBhZ2VBZ2VudC5vcGVuKHJlc291cmNlID8gcmVzb3VyY2UudXJs IDogcmVzb3VyY2VVUkwsIHRydWUpOwogfQogCiBXZWJJbnNwZWN0b3IuX3JlZ2lzdGVyU2hvcnRj dXRzID0gZnVuY3Rpb24oKQpAQCAtNzg3LDEzICs3ODcsMTMgQEAgV2ViSW5zcGVjdG9yLmRvY3Vt ZW50S2V5RG93biA9IGZ1bmN0aW9uKGV2ZW50KQogCiAgICAgICAgIGNhc2UgIlUrMDA1MiI6IC8v IFIga2V5CiAgICAgICAgICAgICBpZiAoKGV2ZW50Lm1ldGFLZXkgJiYgaXNNYWMpIHx8IChldmVu dC5jdHJsS2V5ICYmICFpc01hYykpIHsKLSAgICAgICAgICAgICAgICBQYWdlQWdlbnQucmVsb2Fk UGFnZShldmVudC5zaGlmdEtleSk7CisgICAgICAgICAgICAgICAgUGFnZUFnZW50LnJlbG9hZChl dmVudC5zaGlmdEtleSk7CiAgICAgICAgICAgICAgICAgZXZlbnQucHJldmVudERlZmF1bHQoKTsK ICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlICJGNSI6CiAg ICAgICAgICAgICBpZiAoIWlzTWFjKQotICAgICAgICAgICAgICAgIFBhZ2VBZ2VudC5yZWxvYWRQ YWdlKGV2ZW50LmN0cmxLZXkgfHwgZXZlbnQuc2hpZnRLZXkpOworICAgICAgICAgICAgICAgIFBh Z2VBZ2VudC5yZWxvYWQoZXZlbnQuY3RybEtleSB8fCBldmVudC5zaGlmdEtleSk7CiAgICAgICAg ICAgICBicmVhazsKICAgICB9CiB9Cg==