195290 2019-03-04 12:10:55 -0800 ITMLKit Inspector: Data Bindings / Associated Data for nodes 2019-03-04 13:48:12 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck commit-queue ews-watchlist hi inspector-bugzilla-changes joepeck keith_miller mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1512285 0 joepeck 2019-03-04 12:10:55 -0800 ITMLKit Inspector: Data Bindings / Associated Data for nodes Introspection of ITMLKit data bindings in ITMLKit inspection. 1512299 1 joepeck 2019-03-04 12:26:35 -0800 <rdar://problem/48304019> 1512301 2 363542 joepeck 2019-03-04 12:27:00 -0800 Created attachment 363542 [PATCH] Proposed Fix 1512303 3 363542 joepeck 2019-03-04 12:27:43 -0800 Comment on attachment 363542 [PATCH] Proposed Fix Oops not the full patch. 1512304 4 363543 joepeck 2019-03-04 12:30:03 -0800 Created attachment 363543 [PATCH] Proposed Fix 1512307 5 ews-watchlist 2019-03-04 12:32:15 -0800 This patch modifies the inspector protocol. Please ensure that any frontend changes appropriately use feature checks for new protocol features. 1512338 6 363543 hi 2019-03-04 13:21:57 -0800 Comment on attachment 363543 [PATCH] Proposed Fix r=me 1512349 7 363543 commit-queue 2019-03-04 13:48:10 -0800 Comment on attachment 363543 [PATCH] Proposed Fix Clearing flags on attachment: 363543 Committed r242386: <https://trac.webkit.org/changeset/242386> 1512350 8 commit-queue 2019-03-04 13:48:12 -0800 All reviewed patches have been landed. Closing bug. 363542 2019-03-04 12:27:00 -0800 2019-03-04 12:27:43 -0800 [PATCH] Proposed Fix itml-1.patch text/plain 12091 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGRkNjYyYmI1ZDY4Li41NGM0ZDQyZjc1MSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTktMDMtMDQgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBJVE1MS2l0IEluc3Bl Y3RvcjogRGF0YSBCaW5kaW5ncyAvIEFzc29jaWF0ZWQgRGF0YSBmb3Igbm9kZXMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NTI5MAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTG9jYWxpemF0aW9ucy9l bi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorICAgICAgICBOZXcgdGl0bGUgYW5kIGVtcHR5 IG1lc3NhZ2Ugc3RyaW5ncy4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRE9NTm9k ZURldGFpbHNTaWRlYmFyUGFuZWwuY3NzOgorICAgICAgICAoLnNpZGViYXIgPiAucGFuZWwuZG9t LW5vZGUtZGV0YWlscyAuZGV0YWlscy1zZWN0aW9uLmRvbS1ub2RlLWFzc29jaWF0ZWQtZGF0YSA+ IC5jb250ZW50IC5yb3cpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRE9NTm9kZURl dGFpbHNTaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChXSS5ET01Ob2RlRGV0YWlsc1NpZGViYXJQ YW5lbC5wcm90b3R5cGUuaW5pdGlhbExheW91dCk6CisgICAgICAgIChXSS5ET01Ob2RlRGV0YWls c1NpZGViYXJQYW5lbC5wcm90b3R5cGUubGF5b3V0KToKKyAgICAgICAgKFdJLkRPTU5vZGVEZXRh aWxzU2lkZWJhclBhbmVsLnByb3RvdHlwZS5fcmVmcmVzaERhdGFCaW5kaW5ncyk6CisgICAgICAg IChXSS5ET01Ob2RlRGV0YWlsc1NpZGViYXJQYW5lbC5wcm90b3R5cGUuX3JlZnJlc2hBc3NvY2lh dGVkRGF0YSk6CisgICAgICAgIChXSS5ET01Ob2RlRGV0YWlsc1NpZGViYXJQYW5lbC5wcm90b3R5 cGUuX2F0dHJpYnV0ZXNDaGFuZ2VkKToKKyAgICAgICAgTmV3IE5vZGUgc2VjdGlvbnMgb25seSBl bmFibGVkIGZvciBJVE1MS2l0IGBXSS5zaGFyZWRBcHAuaGFzRXh0cmFEb21haW5zYC4KKworICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0VHJlZVZpZXcuanM6CisgICAgICAgIChX SS5PYmplY3RUcmVlVmlldyk6CisgICAgICAgIFByb3ZpZGUgYSB3YXksIGxpa2UgVHJlZUVsZW1l bnQvVmlldyB0byBhY2Nlc3MgdGhlIE9iamVjdFRyZWVWaWV3IGZyb20gYW4gZWxlbWVudC4KKwog MjAxOS0wMy0wMSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAg ICAgIFdlYiBJbnNwZWN0b3I6IENQVSBVc2FnZSBUaW1lbGluZSAtIFN0YXRpc3RpY3MgYW5kIFNv dXJjZXMgc2VjdGlvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6 YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IDFhNWVi MTI5N2Q4Li5lNDAwZDY2ZDNlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0xv Y2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCkBA IC0xMzAsNiArMTMwLDcgQEAgbG9jYWxpemVkU3RyaW5nc1siQXNzZXJ0aW9uIEZhaWxlZDogJXMi XSA9ICJBc3NlcnRpb24gRmFpbGVkOiAlcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJBc3NlcnRpb24g RmFpbHVyZXMiXSA9ICJBc3NlcnRpb24gRmFpbHVyZXMiOwogbG9jYWxpemVkU3RyaW5nc1siQXNz ZXJ0aW9uIHdpdGggbWVzc2FnZTogJXMiXSA9ICJBc3NlcnRpb24gd2l0aCBtZXNzYWdlOiAlcyI7 CiBsb2NhbGl6ZWRTdHJpbmdzWyJBc3NlcnRpdmUiXSA9ICJBc3NlcnRpdmUiOworbG9jYWxpemVk U3RyaW5nc1siQXNzb2NpYXRlZCBEYXRhIl0gPSAiQXNzb2NpYXRlZCBEYXRhIjsKIGxvY2FsaXpl ZFN0cmluZ3NbIkFzeW5jIGF1ZGl0cyBhcmUgbm90IHN1cHBvcnRlZC4iXSA9ICJBc3luYyBhdWRp dHMgYXJlIG5vdCBzdXBwb3J0ZWQuIjsKIGxvY2FsaXplZFN0cmluZ3NbIkF0dHJpYnV0ZSJdID0g IkF0dHJpYnV0ZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJBdHRyaWJ1dGUgTW9kaWZpZWQiXSA9ICJB dHRyaWJ1dGUgTW9kaWZpZWQiOwpAQCAtMTUxLDYgKzE1Miw3IEBAIGxvY2FsaXplZFN0cmluZ3Nb IkJhc2ljIl0gPSAiQmFzaWMiOwogbG9jYWxpemVkU3RyaW5nc1siQmVhY29uIl0gPSAiQmVhY29u IjsKIGxvY2FsaXplZFN0cmluZ3NbIkJlYWNvbnMiXSA9ICJCZWFjb25zIjsKIGxvY2FsaXplZFN0 cmluZ3NbIkJpbmFyeSBGcmFtZSJdID0gIkJpbmFyeSBGcmFtZSI7Citsb2NhbGl6ZWRTdHJpbmdz WyJCaW5kaW5nIl0gPSAiQmluZGluZyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJCbG9jayBWYXJpYWJs ZXMiXSA9ICJCbG9jayBWYXJpYWJsZXMiOwogbG9jYWxpemVkU3RyaW5nc1siQm9keToiXSA9ICJC b2R5OiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJCb3VuZGFyeSJdID0gIkJvdW5kYXJ5IjsKQEAgLTI4 OSw2ICsyOTEsNyBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJET00gRXZlbnRzIl0gPSAiRE9NIEV2ZW50 cyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJET00gTm9kZXM6Il0gPSAiRE9NIE5vZGVzOiI7CiBsb2Nh bGl6ZWRTdHJpbmdzWyJEYW1waW5nIl0gPSAiRGFtcGluZyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJE YXRhIl0gPSAiRGF0YSI7Citsb2NhbGl6ZWRTdHJpbmdzWyJEYXRhIEJpbmRpbmdzIl0gPSAiRGF0 YSBCaW5kaW5ncyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJEYXRhIHJldHVybmVkIGZyb20gdGhlIGRh dGFiYXNlIGlzIHRvbyBsYXJnZS4iXSA9ICJEYXRhIHJldHVybmVkIGZyb20gdGhlIGRhdGFiYXNl IGlzIHRvbyBsYXJnZS4iOwogbG9jYWxpemVkU3RyaW5nc1siRGF0YWJhc2UiXSA9ICJEYXRhYmFz ZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJEYXRhYmFzZSBubyBsb25nZXIgaGFzIGV4cGVjdGVkIHZl cnNpb24uIl0gPSAiRGF0YWJhc2Ugbm8gbG9uZ2VyIGhhcyBleHBlY3RlZCB2ZXJzaW9uLiI7CkBA IC02NDIsNiArNjQ1LDcgQEAgbG9jYWxpemVkU3RyaW5nc1siTmV4dCBTaWJsaW5nIl0gPSAiTmV4 dCBTaWJsaW5nIjsKIGxvY2FsaXplZFN0cmluZ3NbIk5vIl0gPSAiTm8iOwogbG9jYWxpemVkU3Ry aW5nc1siTm8gQWNjZXNzaWJpbGl0eSBJbmZvcm1hdGlvbiJdID0gIk5vIEFjY2Vzc2liaWxpdHkg SW5mb3JtYXRpb24iOwogbG9jYWxpemVkU3RyaW5nc1siTm8gQXBwbGljYXRpb24gQ2FjaGUgaW5m b3JtYXRpb24gYXZhaWxhYmxlIl0gPSAiTm8gQXBwbGljYXRpb24gQ2FjaGUgaW5mb3JtYXRpb24g YXZhaWxhYmxlIjsKK2xvY2FsaXplZFN0cmluZ3NbIk5vIEFzc29jaWF0ZWQgRGF0YSJdID0gIk5v IEFzc29jaWF0ZWQgRGF0YSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJObyBBdHRyaWJ1dGVzIl0gPSAi Tm8gQXR0cmlidXRlcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJObyBBdWRpdHMiXSA9ICJObyBBdWRp dHMiOwogbG9jYWxpemVkU3RyaW5nc1siTm8gQm94IE1vZGVsIEluZm9ybWF0aW9uIl0gPSAiTm8g Qm94IE1vZGVsIEluZm9ybWF0aW9uIjsKQEAgLTY1MCw2ICs2NTQsNyBAQCBsb2NhbGl6ZWRTdHJp bmdzWyJObyBDYW52YXMgQ29udGV4dHMiXSA9ICJObyBDYW52YXMgQ29udGV4dHMiOwogbG9jYWxp emVkU3RyaW5nc1siTm8gQ2FudmFzIFNlbGVjdGVkIl0gPSAiTm8gQ2FudmFzIFNlbGVjdGVkIjsK IGxvY2FsaXplZFN0cmluZ3NbIk5vIENoYXJ0IEF2YWlsYWJsZSJdID0gIk5vIENoYXJ0IEF2YWls YWJsZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJObyBDaGlsZCBMYXllcnMiXSA9ICJObyBDaGlsZCBM YXllcnMiOworbG9jYWxpemVkU3RyaW5nc1siTm8gRGF0YSBCaW5kaW5ncyJdID0gIk5vIERhdGEg QmluZGluZ3MiOwogbG9jYWxpemVkU3RyaW5nc1siTm8gRW50cmllcyJdID0gIk5vIEVudHJpZXMi OwogbG9jYWxpemVkU3RyaW5nc1siTm8gRXZlbnQgTGlzdGVuZXJzIl0gPSAiTm8gRXZlbnQgTGlz dGVuZXJzIjsKIGxvY2FsaXplZFN0cmluZ3NbIk5vIEZpbHRlciBSZXN1bHRzIl0gPSAiTm8gRmls dGVyIFJlc3VsdHMiOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvRE9NTm9kZURldGFpbHNTaWRlYmFyUGFuZWwuY3NzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NTm9kZURldGFpbHNTaWRlYmFyUGFuZWwu Y3NzCmluZGV4IGQ5NWMzYTc5MjMwLi4wMWM2NzI1YmJjYyAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NTm9kZURldGFpbHNTaWRlYmFyUGFu ZWwuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RP TU5vZGVEZXRhaWxzU2lkZWJhclBhbmVsLmNzcwpAQCAtNjYsMyArNjYsOCBAQCBib2R5W2Rpcj1y dGxdIC5zaWRlYmFyID4gLnBhbmVsLmRvbS1ub2RlLWRldGFpbHMgLmRldGFpbHMtc2VjdGlvbi5k b20tbm9kZS1ldmVudAogICAgICAgICBmaWx0ZXI6IGJyaWdodG5lc3MoMS4yNSk7CiAgICAgfQog fQorCisuc2lkZWJhciA+IC5wYW5lbC5kb20tbm9kZS1kZXRhaWxzIC5kZXRhaWxzLXNlY3Rpb24u ZG9tLW5vZGUtYXNzb2NpYXRlZC1kYXRhID4gLmNvbnRlbnQgLnJvdyB7CisgICAgLXdlYmtpdC1t YXJnaW4tc3RhcnQ6IDZweDsKKyAgICBtYXJnaW4tYm90dG9tOiA0cHg7Cit9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01Ob2RlRGV0YWls c1NpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0RPTU5vZGVEZXRhaWxzU2lkZWJhclBhbmVsLmpzCmluZGV4IGZhZmExYzFjYWRjLi44OTgw YzBkYmJmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvRE9NTm9kZURldGFpbHNTaWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NTm9kZURldGFpbHNTaWRlYmFyUGFuZWwuanMK QEAgLTEwMiw2ICsxMDIsMjIgQEAgV0kuRE9NTm9kZURldGFpbHNTaWRlYmFyUGFuZWwgPSBjbGFz cyBET01Ob2RlRGV0YWlsc1NpZGViYXJQYW5lbCBleHRlbmRzIFdJLkRPTUQKICAgICAgICAgdGhp cy5jb250ZW50Vmlldy5lbGVtZW50LmFwcGVuZENoaWxkKHByb3BlcnRpZXNTZWN0aW9uLmVsZW1l bnQpOwogICAgICAgICB0aGlzLmNvbnRlbnRWaWV3LmVsZW1lbnQuYXBwZW5kQ2hpbGQoZXZlbnRM aXN0ZW5lcnNTZWN0aW9uLmVsZW1lbnQpOwogCisgICAgICAgIGlmIChXSS5zaGFyZWRBcHAuaGFz RXh0cmFEb21haW5zKSB7CisgICAgICAgICAgICBpZiAoSW5zcGVjdG9yQmFja2VuZC5kb21haW5z LkRPTS5nZXREYXRhQmluZGluZ3NGb3JOb2RlKSB7CisgICAgICAgICAgICAgICAgdGhpcy5fZGF0 YUJpbmRpbmdzU2VjdGlvbiA9IG5ldyBXSS5EZXRhaWxzU2VjdGlvbigiZG9tLW5vZGUtZGF0YS1i aW5kaW5ncyIsIFdJLlVJU3RyaW5nKCJEYXRhIEJpbmRpbmdzIiksIFtdKTsKKyAgICAgICAgICAg ICAgICB0aGlzLmNvbnRlbnRWaWV3LmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fZGF0YUJpbmRp bmdzU2VjdGlvbi5lbGVtZW50KTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgaWYgKElu c3BlY3RvckJhY2tlbmQuZG9tYWlucy5ET00uZ2V0QXNzb2NpYXRlZERhdGFGb3JOb2RlKSB7Cisg ICAgICAgICAgICAgICAgdGhpcy5fYXNzb2NpYXRlZERhdGFHcmlkID0gbmV3IFdJLkRldGFpbHNT ZWN0aW9uUm93KFdJLlVJU3RyaW5nKCJObyBBc3NvY2lhdGVkIERhdGEiKSk7CisKKyAgICAgICAg ICAgICAgICBsZXQgYXNzb2NpYXRlZERhdGFHcm91cCA9IG5ldyBXSS5EZXRhaWxzU2VjdGlvbkdy b3VwKFt0aGlzLl9hc3NvY2lhdGVkRGF0YUdyaWRdKTsKKworICAgICAgICAgICAgICAgIGxldCBh c3NvY2lhdGVkU2VjdGlvbiA9IG5ldyBXSS5EZXRhaWxzU2VjdGlvbigiZG9tLW5vZGUtYXNzb2Np YXRlZC1kYXRhIiwgV0kuVUlTdHJpbmcoIkFzc29jaWF0ZWQgRGF0YSIpLCBbYXNzb2NpYXRlZERh dGFHcm91cF0pOworICAgICAgICAgICAgICAgIHRoaXMuY29udGVudFZpZXcuZWxlbWVudC5hcHBl bmRDaGlsZChhc3NvY2lhdGVkU2VjdGlvbi5lbGVtZW50KTsKKyAgICAgICAgICAgIH0KKyAgICAg ICAgfQorCiAgICAgICAgIGlmICh0aGlzLl9hY2Nlc3NpYmlsaXR5U3VwcG9ydGVkKCkpIHsKICAg ICAgICAgICAgIHRoaXMuX2FjY2Vzc2liaWxpdHlFbXB0eVJvdyA9IG5ldyBXSS5EZXRhaWxzU2Vj dGlvblJvdyhXSS5VSVN0cmluZygiTm8gQWNjZXNzaWJpbGl0eSBJbmZvcm1hdGlvbiIpKTsKICAg ICAgICAgICAgIHRoaXMuX2FjY2Vzc2liaWxpdHlOb2RlQWN0aXZlRGVzY2VuZGFudFJvdyA9IG5l dyBXSS5EZXRhaWxzU2VjdGlvblNpbXBsZVJvdyhXSS5VSVN0cmluZygiU2hhcmVkIEZvY3VzIikp OwpAQCAtMTQ4LDYgKzE2NCw4IEBAIFdJLkRPTU5vZGVEZXRhaWxzU2lkZWJhclBhbmVsID0gY2xh c3MgRE9NTm9kZURldGFpbHNTaWRlYmFyUGFuZWwgZXh0ZW5kcyBXSS5ET01ECiAgICAgICAgIHRo aXMuX3JlZnJlc2hBdHRyaWJ1dGVzKCk7CiAgICAgICAgIHRoaXMuX3JlZnJlc2hQcm9wZXJ0aWVz KCk7CiAgICAgICAgIHRoaXMuX3JlZnJlc2hFdmVudExpc3RlbmVycygpOworICAgICAgICB0aGlz Ll9yZWZyZXNoRGF0YUJpbmRpbmdzKCk7CisgICAgICAgIHRoaXMuX3JlZnJlc2hBc3NvY2lhdGVk RGF0YSgpOwogICAgICAgICB0aGlzLl9yZWZyZXNoQWNjZXNzaWJpbGl0eSgpOwogICAgIH0KIApA QCAtMjI4LDkgKzI0NiwxMSBAQCBXSS5ET01Ob2RlRGV0YWlsc1NpZGViYXJQYW5lbCA9IGNsYXNz IERPTU5vZGVEZXRhaWxzU2lkZWJhclBhbmVsIGV4dGVuZHMgV0kuRE9NRAogICAgICAgICB9CiAK ICAgICAgICAgbGV0IGRvbU5vZGUgPSB0aGlzLmRvbU5vZGU7Ci0gICAgICAgIFJ1bnRpbWVBZ2Vu dC5yZWxlYXNlT2JqZWN0R3JvdXAoV0kuRE9NTm9kZURldGFpbHNTaWRlYmFyUGFuZWwuUHJvcGVy dGllc09iamVjdEdyb3VwTmFtZSk7CiAKLSAgICAgICAgV0kuUmVtb3RlT2JqZWN0LnJlc29sdmVO b2RlKGRvbU5vZGUsIFdJLkRPTU5vZGVEZXRhaWxzU2lkZWJhclBhbmVsLlByb3BlcnRpZXNPYmpl Y3RHcm91cE5hbWUpLnRoZW4oKG9iamVjdCkgPT4geworICAgICAgICBjb25zdCBvYmplY3RHcm91 cCA9ICJkb20tbm9kZS1kZXRhaWxzLXNpZGViYXItcHJvcGVydGllcy1vYmplY3QtZ3JvdXAiOwor ICAgICAgICBSdW50aW1lQWdlbnQucmVsZWFzZU9iamVjdEdyb3VwKG9iamVjdEdyb3VwKTsKKwor ICAgICAgICBXSS5SZW1vdGVPYmplY3QucmVzb2x2ZU5vZGUoZG9tTm9kZSwgb2JqZWN0R3JvdXAp LnRoZW4oKG9iamVjdCkgPT4gewogICAgICAgICAgICAgLy8gQmFpbCBpZiB0aGUgRE9NIG5vZGUg Y2hhbmdlZCB3aGlsZSB3ZSB3ZXJlIHdhaXRpbmcgZm9yIHRoZSBhc3luYyByZXNwb25zZS4KICAg ICAgICAgICAgIGlmICh0aGlzLmRvbU5vZGUgIT09IGRvbU5vZGUpCiAgICAgICAgICAgICAgICAg cmV0dXJuOwpAQCAtNDExLDYgKzQzMSw4OSBAQCBXSS5ET01Ob2RlRGV0YWlsc1NpZGViYXJQYW5l bCA9IGNsYXNzIERPTU5vZGVEZXRhaWxzU2lkZWJhclBhbmVsIGV4dGVuZHMgV0kuRE9NRAogICAg ICAgICBkb21Ob2RlLmdldEV2ZW50TGlzdGVuZXJzKGV2ZW50TGlzdGVuZXJzQ2FsbGJhY2suYmlu ZCh0aGlzKSk7CiAgICAgfQogCisgICAgX3JlZnJlc2hEYXRhQmluZGluZ3MoKQorICAgIHsKKyAg ICAgICAgaWYgKCF0aGlzLl9kYXRhQmluZGluZ3NTZWN0aW9uKQorICAgICAgICAgICAgcmV0dXJu OworCisgICAgICAgIGxldCBkb21Ob2RlID0gdGhpcy5kb21Ob2RlOworICAgICAgICBpZiAoIWRv bU5vZGUpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgRE9NQWdlbnQuZ2V0RGF0YUJp bmRpbmdzRm9yTm9kZSh0aGlzLmRvbU5vZGUuaWQpLnRoZW4oKHtkYXRhQmluZGluZ3N9KSA9PiB7 CisgICAgICAgICAgICBpZiAodGhpcy5kb21Ob2RlICE9PSBkb21Ob2RlKQorICAgICAgICAgICAg ICAgIHJldHVybjsKKworICAgICAgICAgICAgaWYgKCFkYXRhQmluZGluZ3MubGVuZ3RoKSB7Cisg ICAgICAgICAgICAgICAgbGV0IGVtcHR5Um93ID0gbmV3IFdJLkRldGFpbHNTZWN0aW9uUm93KFdJ LlVJU3RyaW5nKCJObyBEYXRhIEJpbmRpbmdzIikpOworICAgICAgICAgICAgICAgIGVtcHR5Um93 LnNob3dFbXB0eU1lc3NhZ2UoKTsKKyAgICAgICAgICAgICAgICB0aGlzLl9kYXRhQmluZGluZ3NT ZWN0aW9uLmdyb3VwcyA9IFtuZXcgV0kuRGV0YWlsc1NlY3Rpb25Hcm91cChbZW1wdHlSb3ddKV07 CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBs ZXQgZ3JvdXBzID0gW107CisgICAgICAgICAgICBmb3IgKGxldCB7YmluZGluZywgdHlwZSwgdmFs dWV9IG9mIGRhdGFCaW5kaW5ncykgeworICAgICAgICAgICAgICAgIGdyb3Vwcy5wdXNoKG5ldyBX SS5EZXRhaWxzU2VjdGlvbkdyb3VwKFsKKyAgICAgICAgICAgICAgICAgICAgbmV3IFdJLkRldGFp bHNTZWN0aW9uU2ltcGxlUm93KFdJLlVJU3RyaW5nKCJCaW5kaW5nIiksIGJpbmRpbmcpLAorICAg ICAgICAgICAgICAgICAgICBuZXcgV0kuRGV0YWlsc1NlY3Rpb25TaW1wbGVSb3coV0kuVUlTdHJp bmcoIlR5cGUiKSwgdHlwZSksCisgICAgICAgICAgICAgICAgICAgIG5ldyBXSS5EZXRhaWxzU2Vj dGlvblNpbXBsZVJvdyhXSS5VSVN0cmluZygiVmFsdWUiKSwgdmFsdWUpLAorICAgICAgICAgICAg ICAgIF0pKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIHRoaXMuX2RhdGFCaW5kaW5nc1Nl Y3Rpb24uZ3JvdXBzID0gZ3JvdXBzOworICAgICAgICB9KTsKKyAgICB9CisKKyAgICBfcmVmcmVz aEFzc29jaWF0ZWREYXRhKCkKKyAgICB7CisgICAgICAgIGlmICghdGhpcy5fYXNzb2NpYXRlZERh dGFHcmlkKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIGNvbnN0IG9iamVjdEdyb3Vw ID0gImRvbS1ub2RlLWRldGFpbHMtc2lkZWJhci1hc3NvY2lhdGVkLWRhdGEtb2JqZWN0LWdyb3Vw IjsKKyAgICAgICAgUnVudGltZUFnZW50LnJlbGVhc2VPYmplY3RHcm91cChvYmplY3RHcm91cCk7 CisKKyAgICAgICAgbGV0IGRvbU5vZGUgPSB0aGlzLmRvbU5vZGU7CisgICAgICAgIGlmICghZG9t Tm9kZSkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBET01BZ2VudC5nZXRBc3NvY2lh dGVkRGF0YUZvck5vZGUoZG9tTm9kZS5pZCkudGhlbigoe2Fzc29jaWF0ZWREYXRhfSkgPT4gewor ICAgICAgICAgICAgaWYgKHRoaXMuZG9tTm9kZSAhPT0gZG9tTm9kZSkKKyAgICAgICAgICAgICAg ICByZXR1cm47CisKKyAgICAgICAgICAgIGlmICghYXNzb2NpYXRlZERhdGEpIHsKKyAgICAgICAg ICAgICAgICB0aGlzLl9hc3NvY2lhdGVkRGF0YUdyaWQuc2hvd0VtcHR5TWVzc2FnZSgpOworICAg ICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgbGV0IGV4 cHJlc3Npb24gPSBhc3NvY2lhdGVkRGF0YTsKKyAgICAgICAgICAgIGNvbnN0IG9wdGlvbnMgPSB7 CisgICAgICAgICAgICAgICAgb2JqZWN0R3JvdXAsCisgICAgICAgICAgICAgICAgZG9Ob3RQYXVz ZU9uRXhjZXB0aW9uc0FuZE11dGVDb25zb2xlOiB0cnVlLAorICAgICAgICAgICAgfTsKKyAgICAg ICAgICAgIFdJLnJ1bnRpbWVNYW5hZ2VyLmV2YWx1YXRlSW5JbnNwZWN0ZWRXaW5kb3coZXhwcmVz c2lvbiwgb3B0aW9ucywgKHJlc3VsdCwgd2FzVGhyb3duKSA9PiB7CisgICAgICAgICAgICAgICAg Y29uc29sZS5hc3NlcnQoIXdhc1Rocm93bik7CisKKyAgICAgICAgICAgICAgICBpZiAoIXJlc3Vs dCkgeworICAgICAgICAgICAgICAgICAgICB0aGlzLl9hc3NvY2lhdGVkRGF0YUdyaWQuc2hvd0Vt cHR5TWVzc2FnZSgpOworICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAg ICAgfQorCisgICAgICAgICAgICAgICAgdGhpcy5fYXNzb2NpYXRlZERhdGFHcmlkLmhpZGVFbXB0 eU1lc3NhZ2UoKTsKKworICAgICAgICAgICAgICAgIGNvbnN0IHByb3BlcnR5UGF0aCA9IG51bGw7 CisgICAgICAgICAgICAgICAgY29uc3QgZm9yY2VFeHBhbmRpbmcgPSB0cnVlOworICAgICAgICAg ICAgICAgIGxldCBlbGVtZW50ID0gV0kuRm9ybWF0dGVkVmFsdWUuY3JlYXRlT2JqZWN0VHJlZU9y Rm9ybWF0dGVkVmFsdWVGb3JSZW1vdGVPYmplY3QocmVzdWx0LCBwcm9wZXJ0eVBhdGgsIGZvcmNl RXhwYW5kaW5nKTsKKworICAgICAgICAgICAgICAgIGxldCBvYmplY3RUcmVlID0gZWxlbWVudC5f X29iamVjdFRyZWU7CisgICAgICAgICAgICAgICAgaWYgKG9iamVjdFRyZWUpIHsKKyAgICAgICAg ICAgICAgICAgICAgb2JqZWN0VHJlZS5zaG93T25seVByb3BlcnRpZXMoKTsKKyAgICAgICAgICAg ICAgICAgICAgb2JqZWN0VHJlZS5leHBhbmQoKTsKKyAgICAgICAgICAgICAgICB9CisKKyAgICAg ICAgICAgICAgICB0aGlzLl9hc3NvY2lhdGVkRGF0YUdyaWQuZWxlbWVudC5hcHBlbmRDaGlsZChl bGVtZW50KTsKKyAgICAgICAgICAgIH0pOworICAgICAgICB9KTsKKyAgICB9CisKICAgICBfcmVm cmVzaEFjY2Vzc2liaWxpdHkoKQogICAgIHsKICAgICAgICAgaWYgKCF0aGlzLl9hY2Nlc3NpYmls aXR5U3VwcG9ydGVkKCkpCkBAIC03NjcsNiArODcwLDcgQEAgV0kuRE9NTm9kZURldGFpbHNTaWRl YmFyUGFuZWwgPSBjbGFzcyBET01Ob2RlRGV0YWlsc1NpZGViYXJQYW5lbCBleHRlbmRzIFdJLkRP TUQKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgdGhpcy5fcmVmcmVzaEF0dHJpYnV0ZXMo KTsKICAgICAgICAgdGhpcy5fcmVmcmVzaEFjY2Vzc2liaWxpdHkoKTsKKyAgICAgICAgdGhpcy5f cmVmcmVzaERhdGFCaW5kaW5ncygpOwogICAgIH0KIAogICAgIF9hdHRyaWJ1dGVOb2RlVmFsdWVD aGFuZ2VkKGV2ZW50KQpAQCAtODQ2LDUgKzk1MCwzIEBAIFdJLkRPTU5vZGVEZXRhaWxzU2lkZWJh clBhbmVsLkV2ZW50TGlzdGVuZXJHcm91cGluZ01ldGhvZCA9IHsKICAgICBFdmVudDogImV2ZW50 IiwKICAgICBOb2RlOiAibm9kZSIsCiB9OwotCi1XSS5ET01Ob2RlRGV0YWlsc1NpZGViYXJQYW5l bC5Qcm9wZXJ0aWVzT2JqZWN0R3JvdXBOYW1lID0gImRvbS1ub2RlLWRldGFpbHMtc2lkZWJhci1w cm9wZXJ0aWVzLW9iamVjdC1ncm91cCI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9PYmplY3RUcmVlVmlldy5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09iamVjdFRyZWVWaWV3LmpzCmluZGV4IDQzM2Qw NDE4MDNlLi41ZGIxNzMwZDJjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0VHJlZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0VHJlZVZpZXcuanMKQEAgLTUxLDYgKzUx LDcgQEAgV0kuT2JqZWN0VHJlZVZpZXcgPSBjbGFzcyBPYmplY3RUcmVlVmlldyBleHRlbmRzIFdJ Lk9iamVjdAogICAgICAgICAgICAgZm9yY2VFeHBhbmRpbmcgPSB0cnVlOwogCiAgICAgICAgIHRo aXMuX2VsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKKyAgICAgICAgdGhp cy5fZWxlbWVudC5fX29iamVjdFRyZWUgPSB0aGlzOwogICAgICAgICB0aGlzLl9lbGVtZW50LmNs YXNzTmFtZSA9ICJvYmplY3QtdHJlZSI7CiAKICAgICAgICAgaWYgKHRoaXMuX29iamVjdC5wcmV2 aWV3KSB7Cg== 363543 2019-03-04 12:30:03 -0800 2019-03-04 13:48:10 -0800 [PATCH] Proposed Fix itml3.patch text/plain 18586 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGFkYWU3ZDc0NzNkLi43YjA5NjQ5ZWI5MSAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTktMDMtMDQgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBJVE1MS2l0IEluc3Bl Y3RvcjogRGF0YSBCaW5kaW5ncyAvIEFzc29jaWF0ZWQgRGF0YSBmb3Igbm9kZXMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NTI5MAorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vNDgzMDQwMTk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvcHJvdG9jb2wvRE9NLmpzb246CisKIDIwMTkt MDMtMDEgIFl1c3VrZSBTdXp1a2kgIDx5c3V6dWtpQGFwcGxlLmNvbT4KIAogICAgICAgICBbSlND XSBGaXggRlRMIGJ1aWxkIG9uIEFSTTMyXzY0IGJ5IGFkZGluZyBzdHVicyBmb3IgSlNSb3BlU3Ry aW5nOjpvZmZzZXRPZlhYWApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3Bl Y3Rvci9wcm90b2NvbC9ET00uanNvbiBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Iv cHJvdG9jb2wvRE9NLmpzb24KaW5kZXggMDNjNDM3ZjQ1YTAuLmNhZGU1MjE4OTdjIDEwMDY0NAot LS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Byb3RvY29sL0RPTS5qc29uCisr KyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcHJvdG9jb2wvRE9NLmpzb24KQEAg LTY4LDYgKzY4LDE2IEBACiAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJjb250ZW50U2VjdXJp dHlQb2xpY3lIYXNoIiwgInR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2Ny aXB0aW9uIjogIkNvbXB1dGVkIFNIQS0yNTYgQ29udGVudCBTZWN1cml0eSBQb2xpY3kgaGFzaCBz b3VyY2UgZm9yIGdpdmVuIGVsZW1lbnQuIiB9CiAgICAgICAgICAgICBdCiAgICAgICAgIH0sCisg ICAgICAgIHsKKyAgICAgICAgICAgICJpZCI6ICJEYXRhQmluZGluZyIsCisgICAgICAgICAgICAi dHlwZSI6ICJvYmplY3QiLAorICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIlJlbGF0aW9uc2hp cCBiZXR3ZWVuIGRhdGEgdGhhdCBpcyBhc3NvY2lhdGVkIHdpdGggYSBub2RlIGFuZCB0aGUgbm9k ZSBpdHNlbGYuIiwKKyAgICAgICAgICAgICJwcm9wZXJ0aWVzIjogWworICAgICAgICAgICAgICAg IHsgIm5hbWUiOiAiYmluZGluZyIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJU aGUgYmluZGluZyBrZXkgdGhhdCBpcyBzcGVjaWZpZWQuIiB9LAorICAgICAgICAgICAgICAgIHsg Im5hbWUiOiAidHlwZSIsICJvcHRpb25hbCI6IHRydWUsICJ0eXBlIjogInN0cmluZyIsICJkZXNj cmlwdGlvbiI6ICJBIG1vcmUgZGVzY3JpcHRpdmUgbmFtZSBmb3IgdGhlIHR5cGUgb2YgYmluZGlu ZyB0aGF0IHJlcHJlc2VudHMgdGhpcyBwYXJpdGN1bGFyIGRhdGEgcmVsYXRpb25zaGlwIiB9LAor ICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidmFsdWUiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVz Y3JpcHRpb24iOiAiVGhlIHZhbHVlIHRoYXQgaXMgcmVzb2x2ZWQgdG8gd2l0aCB0aGlzIGRhdGEg YmluZGluZyByZWxhdGlvbnNoaXAuIiB9CisgICAgICAgICAgICBdCisgICAgICAgIH0sCiAgICAg ICAgIHsKICAgICAgICAgICAgICJpZCI6ICJFdmVudExpc3RlbmVyIiwKICAgICAgICAgICAgICJ0 eXBlIjogIm9iamVjdCIsCkBAIC0yNTUsNiArMjY1LDI2IEBACiAgICAgICAgICAgICAgICAgeyAi bmFtZSI6ICJldmVudE5hbWVzIiwgInR5cGUiOiAiYXJyYXkiLCAiaXRlbXMiOiB7ICJ0eXBlIjog InN0cmluZyIgfSB9CiAgICAgICAgICAgICBdCiAgICAgICAgIH0sCisgICAgICAgIHsKKyAgICAg ICAgICAgICJuYW1lIjogImdldERhdGFCaW5kaW5nc0Zvck5vZGUiLAorICAgICAgICAgICAgImRl c2NyaXB0aW9uIjogIlJldHVybnMgYWxsIGRhdGEgYmluZGluZyByZWxhdGlvbnNoaXBzIGJldHdl ZW4gZGF0YSB0aGF0IGlzIGFzc29jaWF0ZWQgd2l0aCB0aGUgbm9kZSBhbmQgdGhlIG5vZGUgaXRz ZWxmLiIsCisgICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKKyAgICAgICAgICAgICAgICB7ICJu YW1lIjogIm5vZGVJZCIsICIkcmVmIjogIk5vZGVJZCIsICJkZXNjcmlwdGlvbiI6ICJJZCBvZiB0 aGUgbm9kZSB0byBnZXQgZGF0YSBiaW5kaW5ncyBmb3IuIiB9CisgICAgICAgICAgICBdLAorICAg ICAgICAgICAgInJldHVybnMiOiBbCisgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJkYXRhQmlu ZGluZ3MiLCAidHlwZSI6ICJhcnJheSIsICJpdGVtcyI6IHsgIiRyZWYiOiAiRGF0YUJpbmRpbmci fSwgImRlc2NyaXB0aW9uIjogIkFycmF5IG9mIGJpbmRpbmcgcmVsYXRpb25zaGlwcyBiZXR3ZWVu IGRhdGEgYW5kIG5vZGUiIH0KKyAgICAgICAgICAgIF0KKyAgICAgICAgfSwKKyAgICAgICAgewor ICAgICAgICAgICAgIm5hbWUiOiAiZ2V0QXNzb2NpYXRlZERhdGFGb3JOb2RlIiwKKyAgICAgICAg ICAgICJkZXNjcmlwdGlvbiI6ICJSZXR1cm5zIGFsbCBkYXRhIHRoYXQgaGFzIGJlZW4gYXNzb2Np YXRlZCB3aXRoIHRoZSBub2RlIGFuZCBpcyBhdmFpbGFibGUgZm9yIGRhdGEgYmluZGluZy4iLAor ICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCisgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJu b2RlSWQiLCAiJHJlZiI6ICJOb2RlSWQiLCAiZGVzY3JpcHRpb24iOiAiSWQgb2YgdGhlIG5vZGUg dG8gZ2V0IGFzc29jaWF0ZWQgZGF0YSBmb3IuIiB9CisgICAgICAgICAgICBdLAorICAgICAgICAg ICAgInJldHVybnMiOiBbCisgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJhc3NvY2lhdGVkRGF0 YSIsICJ0eXBlIjogInN0cmluZyIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJB c3NvY2lhdGVkIGRhdGEgYm91bmQgdG8gdGhpcyBub2RlLiBTZW50IGFzIGEgSlNPTiBzdHJpbmcu IiB9CisgICAgICAgICAgICBdCisgICAgICAgIH0sCiAgICAgICAgIHsKICAgICAgICAgICAgICJu YW1lIjogImdldEV2ZW50TGlzdGVuZXJzRm9yTm9kZSIsCiAgICAgICAgICAgICAiZGVzY3JpcHRp b24iOiAiUmV0dXJucyBldmVudCBsaXN0ZW5lcnMgcmVsZXZhbnQgdG8gdGhlIG5vZGUuIiwKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwppbmRleCAzNGU0NzIxY2FmNi4uMTdhYmUxZWIzZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxNyBAQAorMjAxOS0wMy0wNCAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29t PgorCisgICAgICAgIElUTUxLaXQgSW5zcGVjdG9yOiBEYXRhIEJpbmRpbmdzIC8gQXNzb2NpYXRl ZCBEYXRhIGZvciBub2RlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTk1MjkwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80ODMwNDAxOT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9h Z2VudHMvSW5zcGVjdG9yRE9NQWdlbnQuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvYWdlbnRzL0lu c3BlY3RvckRPTUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRPTUFnZW50 OjpnZXREYXRhQmluZGluZ3NGb3JOb2RlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRP TUFnZW50OjpnZXRBc3NvY2lhdGVkRGF0YUZvck5vZGUpOgorICAgICAgICBTdHViIHRoZXNlIGZv ciB3ZWIgcGFnZXMsIHRoZXkgd2lsbCBvbmx5IGJlIHVzZWQgZm9yIElUTUxLaXQgcmlnaHQgbm93 LgorCiAyMDE5LTAzLTAxICBBbnRvaW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CiAKICAg ICAgICAgW2lPU10gVHVybiBtb3VzZSBldmVudCBzaW11bGF0aW9uIG9uIGJ5IGRlZmF1bHQKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yRE9NQWdl bnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JET01BZ2Vu dC5jcHAKaW5kZXggMGM3ZDc2OWVjMTQuLmE5ZmYzOTIzZjdjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvckRPTUFnZW50LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvckRPTUFnZW50LmNwcApAQCAtODY2 LDYgKzg2NiwxNiBAQCB2b2lkIEluc3BlY3RvckRPTUFnZW50OjpnZXRTdXBwb3J0ZWRFdmVudE5h bWVzKEVycm9yU3RyaW5nJiwgUmVmUHRyPEpTT046OkFycmF5TwogI3VuZGVmIERPTV9FVkVOVF9O QU1FU19BREQKIH0KIAordm9pZCBJbnNwZWN0b3JET01BZ2VudDo6Z2V0RGF0YUJpbmRpbmdzRm9y Tm9kZShFcnJvclN0cmluZyYgZXJyb3JTdHJpbmcsIGludCAvKiBub2RlSWQgKi8sIFJlZlB0cjxK U09OOjpBcnJheU9mPEluc3BlY3Rvcjo6UHJvdG9jb2w6OkRPTTo6RGF0YUJpbmRpbmc+PiYgLyog ZGF0YUJpbmRpbmdzICovKQoreworICAgIGVycm9yU3RyaW5nID0gIk5vdCBzdXBwb3J0ZWQiX3M7 Cit9CisKK3ZvaWQgSW5zcGVjdG9yRE9NQWdlbnQ6OmdldEFzc29jaWF0ZWREYXRhRm9yTm9kZShF cnJvclN0cmluZyYgZXJyb3JTdHJpbmcsIGludCAvKiBub2RlSWQgKi8sIE9wdGlvbmFsPFN0cmlu Zz4mIC8qIGFzc29jaWF0ZWREYXRhICovKQoreworICAgIGVycm9yU3RyaW5nID0gIk5vdCBzdXBw b3J0ZWQiX3M7Cit9CisKIHZvaWQgSW5zcGVjdG9yRE9NQWdlbnQ6OmdldEV2ZW50TGlzdGVuZXJz Rm9yTm9kZShFcnJvclN0cmluZyYgZXJyb3JTdHJpbmcsIGludCBub2RlSWQsIGNvbnN0IFN0cmlu Zyogb2JqZWN0R3JvdXAsIFJlZlB0cjxKU09OOjpBcnJheU9mPEluc3BlY3Rvcjo6UHJvdG9jb2w6 OkRPTTo6RXZlbnRMaXN0ZW5lcj4+JiBsaXN0ZW5lcnNBcnJheSkKIHsKICAgICBsaXN0ZW5lcnNB cnJheSA9IEpTT046OkFycmF5T2Y8SW5zcGVjdG9yOjpQcm90b2NvbDo6RE9NOjpFdmVudExpc3Rl bmVyPjo6Y3JlYXRlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdl bnRzL0luc3BlY3RvckRPTUFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRz L0luc3BlY3RvckRPTUFnZW50LmgKaW5kZXggZGYxZWVkY2FmNmUuLjgzN2I3YmViNzliIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvckRPTUFnZW50 LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JET01BZ2Vu dC5oCkBAIC0xMjcsNiArMTI3LDggQEAgcHVibGljOgogICAgIHZvaWQgaW5zZXJ0QWRqYWNlbnRI VE1MKEVycm9yU3RyaW5nJiwgaW50IG5vZGVJZCwgY29uc3QgU3RyaW5nJiBwb3NpdGlvbiwgY29u c3QgU3RyaW5nJiBodG1sKSBvdmVycmlkZTsKICAgICB2b2lkIHNldE5vZGVWYWx1ZShFcnJvclN0 cmluZyYsIGludCBub2RlSWQsIGNvbnN0IFN0cmluZyYgdmFsdWUpIG92ZXJyaWRlOwogICAgIHZv aWQgZ2V0U3VwcG9ydGVkRXZlbnROYW1lcyhFcnJvclN0cmluZyYsIFJlZlB0cjxKU09OOjpBcnJh eU9mPFN0cmluZz4+JiBldmVudE5hbWVzKSBvdmVycmlkZTsKKyAgICB2b2lkIGdldERhdGFCaW5k aW5nc0Zvck5vZGUoRXJyb3JTdHJpbmcmLCBpbnQgbm9kZUlkLCBSZWZQdHI8SlNPTjo6QXJyYXlP ZjxJbnNwZWN0b3I6OlByb3RvY29sOjpET006OkRhdGFCaW5kaW5nPj4mIGRhdGFBcnJheSkgb3Zl cnJpZGU7CisgICAgdm9pZCBnZXRBc3NvY2lhdGVkRGF0YUZvck5vZGUoRXJyb3JTdHJpbmcmLCBp bnQgbm9kZUlkLCBPcHRpb25hbDxTdHJpbmc+JiBhc3NvY2lhdGVkRGF0YSkgb3ZlcnJpZGU7CiAg ICAgdm9pZCBnZXRFdmVudExpc3RlbmVyc0Zvck5vZGUoRXJyb3JTdHJpbmcmLCBpbnQgbm9kZUlk LCBjb25zdCBXVEY6OlN0cmluZyogb2JqZWN0R3JvdXAsIFJlZlB0cjxKU09OOjpBcnJheU9mPElu c3BlY3Rvcjo6UHJvdG9jb2w6OkRPTTo6RXZlbnRMaXN0ZW5lcj4+JiBsaXN0ZW5lcnNBcnJheSkg b3ZlcnJpZGU7CiAgICAgdm9pZCBzZXRFdmVudExpc3RlbmVyRGlzYWJsZWQoRXJyb3JTdHJpbmcm LCBpbnQgZXZlbnRMaXN0ZW5lcklkLCBib29sIGRpc2FibGVkKSBvdmVycmlkZTsKICAgICB2b2lk IHNldEJyZWFrcG9pbnRGb3JFdmVudExpc3RlbmVyKEVycm9yU3RyaW5nJiwgaW50IGV2ZW50TGlz dGVuZXJJZCkgb3ZlcnJpZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hh bmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBkZDY2MmJiNWQ2 OC4uODIwZTg1MmU4N2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VM b2cKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBA CisyMDE5LTAzLTA0ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAg ICAgICAgSVRNTEtpdCBJbnNwZWN0b3I6IERhdGEgQmluZGluZ3MgLyBBc3NvY2lhdGVkIERhdGEg Zm9yIG5vZGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xOTUyOTAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ4MzA0MDE5PgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTG9jYWxpemF0aW9ucy9lbi5s cHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorICAgICAgICBOZXcgdGl0bGUgYW5kIGVtcHR5IG1l c3NhZ2Ugc3RyaW5ncy4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRE9NTm9kZURl dGFpbHNTaWRlYmFyUGFuZWwuY3NzOgorICAgICAgICAoLnNpZGViYXIgPiAucGFuZWwuZG9tLW5v ZGUtZGV0YWlscyAuZGV0YWlscy1zZWN0aW9uLmRvbS1ub2RlLWFzc29jaWF0ZWQtZGF0YSA+IC5j b250ZW50IC5yb3cpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRE9NTm9kZURldGFp bHNTaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChXSS5ET01Ob2RlRGV0YWlsc1NpZGViYXJQYW5l bC5wcm90b3R5cGUuaW5pdGlhbExheW91dCk6CisgICAgICAgIChXSS5ET01Ob2RlRGV0YWlsc1Np ZGViYXJQYW5lbC5wcm90b3R5cGUubGF5b3V0KToKKyAgICAgICAgKFdJLkRPTU5vZGVEZXRhaWxz U2lkZWJhclBhbmVsLnByb3RvdHlwZS5fcmVmcmVzaERhdGFCaW5kaW5ncyk6CisgICAgICAgIChX SS5ET01Ob2RlRGV0YWlsc1NpZGViYXJQYW5lbC5wcm90b3R5cGUuX3JlZnJlc2hBc3NvY2lhdGVk RGF0YSk6CisgICAgICAgIChXSS5ET01Ob2RlRGV0YWlsc1NpZGViYXJQYW5lbC5wcm90b3R5cGUu X2F0dHJpYnV0ZXNDaGFuZ2VkKToKKyAgICAgICAgTmV3IE5vZGUgc2VjdGlvbnMgb25seSBlbmFi bGVkIGZvciBJVE1MS2l0IGBXSS5zaGFyZWRBcHAuaGFzRXh0cmFEb21haW5zYC4KKworICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0VHJlZVZpZXcuanM6CisgICAgICAgIChXSS5P YmplY3RUcmVlVmlldyk6CisgICAgICAgIFByb3ZpZGUgYSB3YXksIGxpa2UgVHJlZUVsZW1lbnQv VmlldyB0byBhY2Nlc3MgdGhlIE9iamVjdFRyZWVWaWV3IGZyb20gYW4gZWxlbWVudC4KKwogMjAx OS0wMy0wMSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAg IFdlYiBJbnNwZWN0b3I6IENQVSBVc2FnZSBUaW1lbGluZSAtIFN0YXRpc3RpY3MgYW5kIFNvdXJj ZXMgc2VjdGlvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRp b25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv TG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IDFhNWViMTI5 N2Q4Li5lNDAwZDY2ZDNlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2Fs aXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCkBAIC0x MzAsNiArMTMwLDcgQEAgbG9jYWxpemVkU3RyaW5nc1siQXNzZXJ0aW9uIEZhaWxlZDogJXMiXSA9 ICJBc3NlcnRpb24gRmFpbGVkOiAlcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJBc3NlcnRpb24gRmFp bHVyZXMiXSA9ICJBc3NlcnRpb24gRmFpbHVyZXMiOwogbG9jYWxpemVkU3RyaW5nc1siQXNzZXJ0 aW9uIHdpdGggbWVzc2FnZTogJXMiXSA9ICJBc3NlcnRpb24gd2l0aCBtZXNzYWdlOiAlcyI7CiBs b2NhbGl6ZWRTdHJpbmdzWyJBc3NlcnRpdmUiXSA9ICJBc3NlcnRpdmUiOworbG9jYWxpemVkU3Ry aW5nc1siQXNzb2NpYXRlZCBEYXRhIl0gPSAiQXNzb2NpYXRlZCBEYXRhIjsKIGxvY2FsaXplZFN0 cmluZ3NbIkFzeW5jIGF1ZGl0cyBhcmUgbm90IHN1cHBvcnRlZC4iXSA9ICJBc3luYyBhdWRpdHMg YXJlIG5vdCBzdXBwb3J0ZWQuIjsKIGxvY2FsaXplZFN0cmluZ3NbIkF0dHJpYnV0ZSJdID0gIkF0 dHJpYnV0ZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJBdHRyaWJ1dGUgTW9kaWZpZWQiXSA9ICJBdHRy aWJ1dGUgTW9kaWZpZWQiOwpAQCAtMTUxLDYgKzE1Miw3IEBAIGxvY2FsaXplZFN0cmluZ3NbIkJh c2ljIl0gPSAiQmFzaWMiOwogbG9jYWxpemVkU3RyaW5nc1siQmVhY29uIl0gPSAiQmVhY29uIjsK IGxvY2FsaXplZFN0cmluZ3NbIkJlYWNvbnMiXSA9ICJCZWFjb25zIjsKIGxvY2FsaXplZFN0cmlu Z3NbIkJpbmFyeSBGcmFtZSJdID0gIkJpbmFyeSBGcmFtZSI7Citsb2NhbGl6ZWRTdHJpbmdzWyJC aW5kaW5nIl0gPSAiQmluZGluZyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJCbG9jayBWYXJpYWJsZXMi XSA9ICJCbG9jayBWYXJpYWJsZXMiOwogbG9jYWxpemVkU3RyaW5nc1siQm9keToiXSA9ICJCb2R5 OiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJCb3VuZGFyeSJdID0gIkJvdW5kYXJ5IjsKQEAgLTI4OSw2 ICsyOTEsNyBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJET00gRXZlbnRzIl0gPSAiRE9NIEV2ZW50cyI7 CiBsb2NhbGl6ZWRTdHJpbmdzWyJET00gTm9kZXM6Il0gPSAiRE9NIE5vZGVzOiI7CiBsb2NhbGl6 ZWRTdHJpbmdzWyJEYW1waW5nIl0gPSAiRGFtcGluZyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJEYXRh Il0gPSAiRGF0YSI7Citsb2NhbGl6ZWRTdHJpbmdzWyJEYXRhIEJpbmRpbmdzIl0gPSAiRGF0YSBC aW5kaW5ncyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJEYXRhIHJldHVybmVkIGZyb20gdGhlIGRhdGFi YXNlIGlzIHRvbyBsYXJnZS4iXSA9ICJEYXRhIHJldHVybmVkIGZyb20gdGhlIGRhdGFiYXNlIGlz IHRvbyBsYXJnZS4iOwogbG9jYWxpemVkU3RyaW5nc1siRGF0YWJhc2UiXSA9ICJEYXRhYmFzZSI7 CiBsb2NhbGl6ZWRTdHJpbmdzWyJEYXRhYmFzZSBubyBsb25nZXIgaGFzIGV4cGVjdGVkIHZlcnNp b24uIl0gPSAiRGF0YWJhc2Ugbm8gbG9uZ2VyIGhhcyBleHBlY3RlZCB2ZXJzaW9uLiI7CkBAIC02 NDIsNiArNjQ1LDcgQEAgbG9jYWxpemVkU3RyaW5nc1siTmV4dCBTaWJsaW5nIl0gPSAiTmV4dCBT aWJsaW5nIjsKIGxvY2FsaXplZFN0cmluZ3NbIk5vIl0gPSAiTm8iOwogbG9jYWxpemVkU3RyaW5n c1siTm8gQWNjZXNzaWJpbGl0eSBJbmZvcm1hdGlvbiJdID0gIk5vIEFjY2Vzc2liaWxpdHkgSW5m b3JtYXRpb24iOwogbG9jYWxpemVkU3RyaW5nc1siTm8gQXBwbGljYXRpb24gQ2FjaGUgaW5mb3Jt YXRpb24gYXZhaWxhYmxlIl0gPSAiTm8gQXBwbGljYXRpb24gQ2FjaGUgaW5mb3JtYXRpb24gYXZh aWxhYmxlIjsKK2xvY2FsaXplZFN0cmluZ3NbIk5vIEFzc29jaWF0ZWQgRGF0YSJdID0gIk5vIEFz c29jaWF0ZWQgRGF0YSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJObyBBdHRyaWJ1dGVzIl0gPSAiTm8g QXR0cmlidXRlcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJObyBBdWRpdHMiXSA9ICJObyBBdWRpdHMi OwogbG9jYWxpemVkU3RyaW5nc1siTm8gQm94IE1vZGVsIEluZm9ybWF0aW9uIl0gPSAiTm8gQm94 IE1vZGVsIEluZm9ybWF0aW9uIjsKQEAgLTY1MCw2ICs2NTQsNyBAQCBsb2NhbGl6ZWRTdHJpbmdz WyJObyBDYW52YXMgQ29udGV4dHMiXSA9ICJObyBDYW52YXMgQ29udGV4dHMiOwogbG9jYWxpemVk U3RyaW5nc1siTm8gQ2FudmFzIFNlbGVjdGVkIl0gPSAiTm8gQ2FudmFzIFNlbGVjdGVkIjsKIGxv Y2FsaXplZFN0cmluZ3NbIk5vIENoYXJ0IEF2YWlsYWJsZSJdID0gIk5vIENoYXJ0IEF2YWlsYWJs ZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJObyBDaGlsZCBMYXllcnMiXSA9ICJObyBDaGlsZCBMYXll cnMiOworbG9jYWxpemVkU3RyaW5nc1siTm8gRGF0YSBCaW5kaW5ncyJdID0gIk5vIERhdGEgQmlu ZGluZ3MiOwogbG9jYWxpemVkU3RyaW5nc1siTm8gRW50cmllcyJdID0gIk5vIEVudHJpZXMiOwog bG9jYWxpemVkU3RyaW5nc1siTm8gRXZlbnQgTGlzdGVuZXJzIl0gPSAiTm8gRXZlbnQgTGlzdGVu ZXJzIjsKIGxvY2FsaXplZFN0cmluZ3NbIk5vIEZpbHRlciBSZXN1bHRzIl0gPSAiTm8gRmlsdGVy IFJlc3VsdHMiOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvRE9NTm9kZURldGFpbHNTaWRlYmFyUGFuZWwuY3NzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NTm9kZURldGFpbHNTaWRlYmFyUGFuZWwuY3Nz CmluZGV4IGQ5NWMzYTc5MjMwLi4wMWM2NzI1YmJjYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NTm9kZURldGFpbHNTaWRlYmFyUGFuZWwu Y3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTU5v ZGVEZXRhaWxzU2lkZWJhclBhbmVsLmNzcwpAQCAtNjYsMyArNjYsOCBAQCBib2R5W2Rpcj1ydGxd IC5zaWRlYmFyID4gLnBhbmVsLmRvbS1ub2RlLWRldGFpbHMgLmRldGFpbHMtc2VjdGlvbi5kb20t bm9kZS1ldmVudAogICAgICAgICBmaWx0ZXI6IGJyaWdodG5lc3MoMS4yNSk7CiAgICAgfQogfQor Cisuc2lkZWJhciA+IC5wYW5lbC5kb20tbm9kZS1kZXRhaWxzIC5kZXRhaWxzLXNlY3Rpb24uZG9t LW5vZGUtYXNzb2NpYXRlZC1kYXRhID4gLmNvbnRlbnQgLnJvdyB7CisgICAgLXdlYmtpdC1tYXJn aW4tc3RhcnQ6IDZweDsKKyAgICBtYXJnaW4tYm90dG9tOiA0cHg7Cit9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01Ob2RlRGV0YWlsc1Np ZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0RPTU5vZGVEZXRhaWxzU2lkZWJhclBhbmVsLmpzCmluZGV4IGZhZmExYzFjYWRjLi44OTgwYzBk YmJmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvRE9NTm9kZURldGFpbHNTaWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NTm9kZURldGFpbHNTaWRlYmFyUGFuZWwuanMKQEAg LTEwMiw2ICsxMDIsMjIgQEAgV0kuRE9NTm9kZURldGFpbHNTaWRlYmFyUGFuZWwgPSBjbGFzcyBE T01Ob2RlRGV0YWlsc1NpZGViYXJQYW5lbCBleHRlbmRzIFdJLkRPTUQKICAgICAgICAgdGhpcy5j b250ZW50Vmlldy5lbGVtZW50LmFwcGVuZENoaWxkKHByb3BlcnRpZXNTZWN0aW9uLmVsZW1lbnQp OwogICAgICAgICB0aGlzLmNvbnRlbnRWaWV3LmVsZW1lbnQuYXBwZW5kQ2hpbGQoZXZlbnRMaXN0 ZW5lcnNTZWN0aW9uLmVsZW1lbnQpOwogCisgICAgICAgIGlmIChXSS5zaGFyZWRBcHAuaGFzRXh0 cmFEb21haW5zKSB7CisgICAgICAgICAgICBpZiAoSW5zcGVjdG9yQmFja2VuZC5kb21haW5zLkRP TS5nZXREYXRhQmluZGluZ3NGb3JOb2RlKSB7CisgICAgICAgICAgICAgICAgdGhpcy5fZGF0YUJp bmRpbmdzU2VjdGlvbiA9IG5ldyBXSS5EZXRhaWxzU2VjdGlvbigiZG9tLW5vZGUtZGF0YS1iaW5k aW5ncyIsIFdJLlVJU3RyaW5nKCJEYXRhIEJpbmRpbmdzIiksIFtdKTsKKyAgICAgICAgICAgICAg ICB0aGlzLmNvbnRlbnRWaWV3LmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fZGF0YUJpbmRpbmdz U2VjdGlvbi5lbGVtZW50KTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgaWYgKEluc3Bl Y3RvckJhY2tlbmQuZG9tYWlucy5ET00uZ2V0QXNzb2NpYXRlZERhdGFGb3JOb2RlKSB7CisgICAg ICAgICAgICAgICAgdGhpcy5fYXNzb2NpYXRlZERhdGFHcmlkID0gbmV3IFdJLkRldGFpbHNTZWN0 aW9uUm93KFdJLlVJU3RyaW5nKCJObyBBc3NvY2lhdGVkIERhdGEiKSk7CisKKyAgICAgICAgICAg ICAgICBsZXQgYXNzb2NpYXRlZERhdGFHcm91cCA9IG5ldyBXSS5EZXRhaWxzU2VjdGlvbkdyb3Vw KFt0aGlzLl9hc3NvY2lhdGVkRGF0YUdyaWRdKTsKKworICAgICAgICAgICAgICAgIGxldCBhc3Nv Y2lhdGVkU2VjdGlvbiA9IG5ldyBXSS5EZXRhaWxzU2VjdGlvbigiZG9tLW5vZGUtYXNzb2NpYXRl ZC1kYXRhIiwgV0kuVUlTdHJpbmcoIkFzc29jaWF0ZWQgRGF0YSIpLCBbYXNzb2NpYXRlZERhdGFH cm91cF0pOworICAgICAgICAgICAgICAgIHRoaXMuY29udGVudFZpZXcuZWxlbWVudC5hcHBlbmRD aGlsZChhc3NvY2lhdGVkU2VjdGlvbi5lbGVtZW50KTsKKyAgICAgICAgICAgIH0KKyAgICAgICAg fQorCiAgICAgICAgIGlmICh0aGlzLl9hY2Nlc3NpYmlsaXR5U3VwcG9ydGVkKCkpIHsKICAgICAg ICAgICAgIHRoaXMuX2FjY2Vzc2liaWxpdHlFbXB0eVJvdyA9IG5ldyBXSS5EZXRhaWxzU2VjdGlv blJvdyhXSS5VSVN0cmluZygiTm8gQWNjZXNzaWJpbGl0eSBJbmZvcm1hdGlvbiIpKTsKICAgICAg ICAgICAgIHRoaXMuX2FjY2Vzc2liaWxpdHlOb2RlQWN0aXZlRGVzY2VuZGFudFJvdyA9IG5ldyBX SS5EZXRhaWxzU2VjdGlvblNpbXBsZVJvdyhXSS5VSVN0cmluZygiU2hhcmVkIEZvY3VzIikpOwpA QCAtMTQ4LDYgKzE2NCw4IEBAIFdJLkRPTU5vZGVEZXRhaWxzU2lkZWJhclBhbmVsID0gY2xhc3Mg RE9NTm9kZURldGFpbHNTaWRlYmFyUGFuZWwgZXh0ZW5kcyBXSS5ET01ECiAgICAgICAgIHRoaXMu X3JlZnJlc2hBdHRyaWJ1dGVzKCk7CiAgICAgICAgIHRoaXMuX3JlZnJlc2hQcm9wZXJ0aWVzKCk7 CiAgICAgICAgIHRoaXMuX3JlZnJlc2hFdmVudExpc3RlbmVycygpOworICAgICAgICB0aGlzLl9y ZWZyZXNoRGF0YUJpbmRpbmdzKCk7CisgICAgICAgIHRoaXMuX3JlZnJlc2hBc3NvY2lhdGVkRGF0 YSgpOwogICAgICAgICB0aGlzLl9yZWZyZXNoQWNjZXNzaWJpbGl0eSgpOwogICAgIH0KIApAQCAt MjI4LDkgKzI0NiwxMSBAQCBXSS5ET01Ob2RlRGV0YWlsc1NpZGViYXJQYW5lbCA9IGNsYXNzIERP TU5vZGVEZXRhaWxzU2lkZWJhclBhbmVsIGV4dGVuZHMgV0kuRE9NRAogICAgICAgICB9CiAKICAg ICAgICAgbGV0IGRvbU5vZGUgPSB0aGlzLmRvbU5vZGU7Ci0gICAgICAgIFJ1bnRpbWVBZ2VudC5y ZWxlYXNlT2JqZWN0R3JvdXAoV0kuRE9NTm9kZURldGFpbHNTaWRlYmFyUGFuZWwuUHJvcGVydGll c09iamVjdEdyb3VwTmFtZSk7CiAKLSAgICAgICAgV0kuUmVtb3RlT2JqZWN0LnJlc29sdmVOb2Rl KGRvbU5vZGUsIFdJLkRPTU5vZGVEZXRhaWxzU2lkZWJhclBhbmVsLlByb3BlcnRpZXNPYmplY3RH cm91cE5hbWUpLnRoZW4oKG9iamVjdCkgPT4geworICAgICAgICBjb25zdCBvYmplY3RHcm91cCA9 ICJkb20tbm9kZS1kZXRhaWxzLXNpZGViYXItcHJvcGVydGllcy1vYmplY3QtZ3JvdXAiOworICAg ICAgICBSdW50aW1lQWdlbnQucmVsZWFzZU9iamVjdEdyb3VwKG9iamVjdEdyb3VwKTsKKworICAg ICAgICBXSS5SZW1vdGVPYmplY3QucmVzb2x2ZU5vZGUoZG9tTm9kZSwgb2JqZWN0R3JvdXApLnRo ZW4oKG9iamVjdCkgPT4gewogICAgICAgICAgICAgLy8gQmFpbCBpZiB0aGUgRE9NIG5vZGUgY2hh bmdlZCB3aGlsZSB3ZSB3ZXJlIHdhaXRpbmcgZm9yIHRoZSBhc3luYyByZXNwb25zZS4KICAgICAg ICAgICAgIGlmICh0aGlzLmRvbU5vZGUgIT09IGRvbU5vZGUpCiAgICAgICAgICAgICAgICAgcmV0 dXJuOwpAQCAtNDExLDYgKzQzMSw4OSBAQCBXSS5ET01Ob2RlRGV0YWlsc1NpZGViYXJQYW5lbCA9 IGNsYXNzIERPTU5vZGVEZXRhaWxzU2lkZWJhclBhbmVsIGV4dGVuZHMgV0kuRE9NRAogICAgICAg ICBkb21Ob2RlLmdldEV2ZW50TGlzdGVuZXJzKGV2ZW50TGlzdGVuZXJzQ2FsbGJhY2suYmluZCh0 aGlzKSk7CiAgICAgfQogCisgICAgX3JlZnJlc2hEYXRhQmluZGluZ3MoKQorICAgIHsKKyAgICAg ICAgaWYgKCF0aGlzLl9kYXRhQmluZGluZ3NTZWN0aW9uKQorICAgICAgICAgICAgcmV0dXJuOwor CisgICAgICAgIGxldCBkb21Ob2RlID0gdGhpcy5kb21Ob2RlOworICAgICAgICBpZiAoIWRvbU5v ZGUpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgRE9NQWdlbnQuZ2V0RGF0YUJpbmRp bmdzRm9yTm9kZSh0aGlzLmRvbU5vZGUuaWQpLnRoZW4oKHtkYXRhQmluZGluZ3N9KSA9PiB7Cisg ICAgICAgICAgICBpZiAodGhpcy5kb21Ob2RlICE9PSBkb21Ob2RlKQorICAgICAgICAgICAgICAg IHJldHVybjsKKworICAgICAgICAgICAgaWYgKCFkYXRhQmluZGluZ3MubGVuZ3RoKSB7CisgICAg ICAgICAgICAgICAgbGV0IGVtcHR5Um93ID0gbmV3IFdJLkRldGFpbHNTZWN0aW9uUm93KFdJLlVJ U3RyaW5nKCJObyBEYXRhIEJpbmRpbmdzIikpOworICAgICAgICAgICAgICAgIGVtcHR5Um93LnNo b3dFbXB0eU1lc3NhZ2UoKTsKKyAgICAgICAgICAgICAgICB0aGlzLl9kYXRhQmluZGluZ3NTZWN0 aW9uLmdyb3VwcyA9IFtuZXcgV0kuRGV0YWlsc1NlY3Rpb25Hcm91cChbZW1wdHlSb3ddKV07Cisg ICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBsZXQg Z3JvdXBzID0gW107CisgICAgICAgICAgICBmb3IgKGxldCB7YmluZGluZywgdHlwZSwgdmFsdWV9 IG9mIGRhdGFCaW5kaW5ncykgeworICAgICAgICAgICAgICAgIGdyb3Vwcy5wdXNoKG5ldyBXSS5E ZXRhaWxzU2VjdGlvbkdyb3VwKFsKKyAgICAgICAgICAgICAgICAgICAgbmV3IFdJLkRldGFpbHNT ZWN0aW9uU2ltcGxlUm93KFdJLlVJU3RyaW5nKCJCaW5kaW5nIiksIGJpbmRpbmcpLAorICAgICAg ICAgICAgICAgICAgICBuZXcgV0kuRGV0YWlsc1NlY3Rpb25TaW1wbGVSb3coV0kuVUlTdHJpbmco IlR5cGUiKSwgdHlwZSksCisgICAgICAgICAgICAgICAgICAgIG5ldyBXSS5EZXRhaWxzU2VjdGlv blNpbXBsZVJvdyhXSS5VSVN0cmluZygiVmFsdWUiKSwgdmFsdWUpLAorICAgICAgICAgICAgICAg IF0pKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIHRoaXMuX2RhdGFCaW5kaW5nc1NlY3Rp b24uZ3JvdXBzID0gZ3JvdXBzOworICAgICAgICB9KTsKKyAgICB9CisKKyAgICBfcmVmcmVzaEFz c29jaWF0ZWREYXRhKCkKKyAgICB7CisgICAgICAgIGlmICghdGhpcy5fYXNzb2NpYXRlZERhdGFH cmlkKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIGNvbnN0IG9iamVjdEdyb3VwID0g ImRvbS1ub2RlLWRldGFpbHMtc2lkZWJhci1hc3NvY2lhdGVkLWRhdGEtb2JqZWN0LWdyb3VwIjsK KyAgICAgICAgUnVudGltZUFnZW50LnJlbGVhc2VPYmplY3RHcm91cChvYmplY3RHcm91cCk7CisK KyAgICAgICAgbGV0IGRvbU5vZGUgPSB0aGlzLmRvbU5vZGU7CisgICAgICAgIGlmICghZG9tTm9k ZSkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBET01BZ2VudC5nZXRBc3NvY2lhdGVk RGF0YUZvck5vZGUoZG9tTm9kZS5pZCkudGhlbigoe2Fzc29jaWF0ZWREYXRhfSkgPT4geworICAg ICAgICAgICAgaWYgKHRoaXMuZG9tTm9kZSAhPT0gZG9tTm9kZSkKKyAgICAgICAgICAgICAgICBy ZXR1cm47CisKKyAgICAgICAgICAgIGlmICghYXNzb2NpYXRlZERhdGEpIHsKKyAgICAgICAgICAg ICAgICB0aGlzLl9hc3NvY2lhdGVkRGF0YUdyaWQuc2hvd0VtcHR5TWVzc2FnZSgpOworICAgICAg ICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgbGV0IGV4cHJl c3Npb24gPSBhc3NvY2lhdGVkRGF0YTsKKyAgICAgICAgICAgIGNvbnN0IG9wdGlvbnMgPSB7Cisg ICAgICAgICAgICAgICAgb2JqZWN0R3JvdXAsCisgICAgICAgICAgICAgICAgZG9Ob3RQYXVzZU9u RXhjZXB0aW9uc0FuZE11dGVDb25zb2xlOiB0cnVlLAorICAgICAgICAgICAgfTsKKyAgICAgICAg ICAgIFdJLnJ1bnRpbWVNYW5hZ2VyLmV2YWx1YXRlSW5JbnNwZWN0ZWRXaW5kb3coZXhwcmVzc2lv biwgb3B0aW9ucywgKHJlc3VsdCwgd2FzVGhyb3duKSA9PiB7CisgICAgICAgICAgICAgICAgY29u c29sZS5hc3NlcnQoIXdhc1Rocm93bik7CisKKyAgICAgICAgICAgICAgICBpZiAoIXJlc3VsdCkg eworICAgICAgICAgICAgICAgICAgICB0aGlzLl9hc3NvY2lhdGVkRGF0YUdyaWQuc2hvd0VtcHR5 TWVzc2FnZSgpOworICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAgICAg fQorCisgICAgICAgICAgICAgICAgdGhpcy5fYXNzb2NpYXRlZERhdGFHcmlkLmhpZGVFbXB0eU1l c3NhZ2UoKTsKKworICAgICAgICAgICAgICAgIGNvbnN0IHByb3BlcnR5UGF0aCA9IG51bGw7Cisg ICAgICAgICAgICAgICAgY29uc3QgZm9yY2VFeHBhbmRpbmcgPSB0cnVlOworICAgICAgICAgICAg ICAgIGxldCBlbGVtZW50ID0gV0kuRm9ybWF0dGVkVmFsdWUuY3JlYXRlT2JqZWN0VHJlZU9yRm9y bWF0dGVkVmFsdWVGb3JSZW1vdGVPYmplY3QocmVzdWx0LCBwcm9wZXJ0eVBhdGgsIGZvcmNlRXhw YW5kaW5nKTsKKworICAgICAgICAgICAgICAgIGxldCBvYmplY3RUcmVlID0gZWxlbWVudC5fX29i amVjdFRyZWU7CisgICAgICAgICAgICAgICAgaWYgKG9iamVjdFRyZWUpIHsKKyAgICAgICAgICAg ICAgICAgICAgb2JqZWN0VHJlZS5zaG93T25seVByb3BlcnRpZXMoKTsKKyAgICAgICAgICAgICAg ICAgICAgb2JqZWN0VHJlZS5leHBhbmQoKTsKKyAgICAgICAgICAgICAgICB9CisKKyAgICAgICAg ICAgICAgICB0aGlzLl9hc3NvY2lhdGVkRGF0YUdyaWQuZWxlbWVudC5hcHBlbmRDaGlsZChlbGVt ZW50KTsKKyAgICAgICAgICAgIH0pOworICAgICAgICB9KTsKKyAgICB9CisKICAgICBfcmVmcmVz aEFjY2Vzc2liaWxpdHkoKQogICAgIHsKICAgICAgICAgaWYgKCF0aGlzLl9hY2Nlc3NpYmlsaXR5 U3VwcG9ydGVkKCkpCkBAIC03NjcsNiArODcwLDcgQEAgV0kuRE9NTm9kZURldGFpbHNTaWRlYmFy UGFuZWwgPSBjbGFzcyBET01Ob2RlRGV0YWlsc1NpZGViYXJQYW5lbCBleHRlbmRzIFdJLkRPTUQK ICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgdGhpcy5fcmVmcmVzaEF0dHJpYnV0ZXMoKTsK ICAgICAgICAgdGhpcy5fcmVmcmVzaEFjY2Vzc2liaWxpdHkoKTsKKyAgICAgICAgdGhpcy5fcmVm cmVzaERhdGFCaW5kaW5ncygpOwogICAgIH0KIAogICAgIF9hdHRyaWJ1dGVOb2RlVmFsdWVDaGFu Z2VkKGV2ZW50KQpAQCAtODQ2LDUgKzk1MCwzIEBAIFdJLkRPTU5vZGVEZXRhaWxzU2lkZWJhclBh bmVsLkV2ZW50TGlzdGVuZXJHcm91cGluZ01ldGhvZCA9IHsKICAgICBFdmVudDogImV2ZW50IiwK ICAgICBOb2RlOiAibm9kZSIsCiB9OwotCi1XSS5ET01Ob2RlRGV0YWlsc1NpZGViYXJQYW5lbC5Q cm9wZXJ0aWVzT2JqZWN0R3JvdXBOYW1lID0gImRvbS1ub2RlLWRldGFpbHMtc2lkZWJhci1wcm9w ZXJ0aWVzLW9iamVjdC1ncm91cCI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9PYmplY3RUcmVlVmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09iamVjdFRyZWVWaWV3LmpzCmluZGV4IDQzM2QwNDE4 MDNlLi41ZGIxNzMwZDJjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvT2JqZWN0VHJlZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0VHJlZVZpZXcuanMKQEAgLTUxLDYgKzUxLDcg QEAgV0kuT2JqZWN0VHJlZVZpZXcgPSBjbGFzcyBPYmplY3RUcmVlVmlldyBleHRlbmRzIFdJLk9i amVjdAogICAgICAgICAgICAgZm9yY2VFeHBhbmRpbmcgPSB0cnVlOwogCiAgICAgICAgIHRoaXMu X2VsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKKyAgICAgICAgdGhpcy5f ZWxlbWVudC5fX29iamVjdFRyZWUgPSB0aGlzOwogICAgICAgICB0aGlzLl9lbGVtZW50LmNsYXNz TmFtZSA9ICJvYmplY3QtdHJlZSI7CiAKICAgICAgICAgaWYgKHRoaXMuX29iamVjdC5wcmV2aWV3 KSB7Cg==