195693 2019-03-13 12:40:59 -0700 Web Inspector: HAR Extension for Resource Priority 2019-03-18 11:35:09 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck hi inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1516103 0 joepeck 2019-03-13 12:40:59 -0700 HAR Extension for Resource Priority • We include _fetchType we can include _priority 1517090 1 364829 joepeck 2019-03-15 13:26:20 -0700 Created attachment 364829 [PATCH] Proposed Fix 1517218 2 364862 joepeck 2019-03-15 15:53:11 -0700 Created attachment 364862 [PATCH] Proposed Fix 1517295 3 364862 hi 2019-03-15 17:10:31 -0700 Comment on attachment 364862 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=364862&action=review r=me > Source/WebInspectorUI/UserInterface/Controllers/HARBuilder.js:332 > + case WI.Resource.NetworkPriority.Low: > + return "low"; > + case WI.Resource.NetworkPriority.Medium: > + return "medium"; > + case WI.Resource.NetworkPriority.High: > + return "high"; Could we use the `NetworkAgent.MetricsPriority` values instead, or are you worried about backward/forward compatibility? > Source/WebInspectorUI/UserInterface/Controllers/HARBuilder.js:335 > + console.assert(false); `console.assert()` works instead of this :P > Source/WebInspectorUI/UserInterface/Controllers/HARBuilder.js:380 > - console.warn("Unknown HAR Protocol _fetchType", fetchType); > + console.warn("Unknown HAR _fetchType value", fetchType); Oops :P > Source/WebInspectorUI/UserInterface/Controllers/HARBuilder.js:392 > + case "low": > + return WI.Resource.NetworkPriority.Low; > + case "medium": > + return WI.Resource.NetworkPriority.Medium; > + case "high": > + return WI.Resource.NetworkPriority.High; Ditto (>327). 1517327 4 364862 joepeck 2019-03-15 18:56:14 -0700 Comment on attachment 364862 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=364862&action=review >> Source/WebInspectorUI/UserInterface/Controllers/HARBuilder.js:332 >> + return "high"; > > Could we use the `NetworkAgent.MetricsPriority` values instead, or are you worried about backward/forward compatibility? Yeah I don't want changing the protocol to break HAR import/export expectations. >> Source/WebInspectorUI/UserInterface/Controllers/HARBuilder.js:392 >> + return WI.Resource.NetworkPriority.High; > > Ditto (>327). These we are converting back from the HAR to WI.Resource so we'd want what we serialized into the HAR. 1517339 5 joepeck 2019-03-15 20:16:01 -0700 https://trac.webkit.org/r243031 1517820 6 joepeck 2019-03-18 11:34:51 -0700 bump to try and get radar importer to import 1517821 7 webkit-bug-importer 2019-03-18 11:35:09 -0700 <rdar://problem/48986580> 364829 2019-03-15 13:26:20 -0700 2019-03-15 15:53:11 -0700 [PATCH] Proposed Fix priority-1.patch text/plain 8947 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA4MjNiOGM0ZTQ5Yy4uMDJkODQ4Y2FhMmEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAor MjAxOS0wMy0xNSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCisgICAg ICAgIFdlYiBJbnNwZWN0b3I6IEhBUiBFeHRlbnNpb24gZm9yIFJlc291cmNlIFByaW9yaXR5Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTU2OTMKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGh0dHAvdGVz dHMvaW5zcGVjdG9yL25ldHdvcmsvaGFyL2hhci1iYXNpYy1leHBlY3RlZC50eHQ6CisgICAgICAg ICogaHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9oYXIvaGFyLXBhZ2UtZXhwZWN0ZWQudHh0 OgorCiAyMDE5LTAzLTE1ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgog CiAgICAgICAgIFtBc3luYyBvdmVyZmxvdyBTY3JvbGxpbmddIFVwZGF0ZSBwb3NpdGlvbmVkIG5v ZGUgbGF5ZXJzIHdoZW4gb3ZlcmZsb3dzIGFyZSBzY3JvbGxlZApkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9oYXIvaGFyLWJhc2ljLWV4cGVjdGVk LnR4dCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdvcmsvaGFyL2hhci1i YXNpYy1leHBlY3RlZC50eHQKaW5kZXggNDhmYzhiYjVlZjMuLjk3YTEwYmZlOWI4IDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9uZXR3b3JrL2hhci9oYXItYmFz aWMtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL25l dHdvcmsvaGFyL2hhci1iYXNpYy1leHBlY3RlZC50eHQKQEAgLTEzNiw3ICsxMzYsOCBAQCBCYXNp YyB0ZXN0cyBmb3IgSEFSLgogICAgICAgICB9LAogICAgICAgICAic2VydmVySVBBZGRyZXNzIjog IjEyLjM0LjU2Ljc4IiwKICAgICAgICAgImNvbm5lY3Rpb24iOiAiMSIsCi0gICAgICAgICJfZmV0 Y2hUeXBlIjogIk5ldHdvcmsgTG9hZCIKKyAgICAgICAgIl9mZXRjaFR5cGUiOiAiTmV0d29yayBM b2FkIiwKKyAgICAgICAgIl9wcmlvcml0eSI6ICJtZWRpdW0iCiAgICAgICB9CiAgICAgXQogICB9 CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9uZXR3b3JrL2hh ci9oYXItcGFnZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rv ci9uZXR3b3JrL2hhci9oYXItcGFnZS1leHBlY3RlZC50eHQKaW5kZXggM2QwNWM5OTBjYzcuLjdk NWIzYjc3YjJhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9u ZXR3b3JrL2hhci9oYXItcGFnZS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90 ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9oYXIvaGFyLXBhZ2UtZXhwZWN0ZWQudHh0CkBAIC02MSw3 ICs2MSw4IEBAIEhBUiBQYWdlIFRlc3QuCiAgICAgICAgICAgInNlbmQiOiAiPGZpbHRlcmVkPiIs CiAgICAgICAgICAgIndhaXQiOiAiPGZpbHRlcmVkPiIsCiAgICAgICAgICAgInJlY2VpdmUiOiAi PGZpbHRlcmVkPiIKLSAgICAgICAgfQorICAgICAgICB9LAorICAgICAgICAiX3ByaW9yaXR5Ijog ImhpZ2giCiAgICAgICB9LAogICAgICAgewogICAgICAgICAicGFnZXJlZiI6ICJwYWdlXzAiLApA QCAtMTAyLDcgKzEwMyw4IEBAIEhBUiBQYWdlIFRlc3QuCiAgICAgICAgICAgInNlbmQiOiAiPGZp bHRlcmVkPiIsCiAgICAgICAgICAgIndhaXQiOiAiPGZpbHRlcmVkPiIsCiAgICAgICAgICAgInJl Y2VpdmUiOiAiPGZpbHRlcmVkPiIKLSAgICAgICAgfQorICAgICAgICB9LAorICAgICAgICAiX3By aW9yaXR5IjogImhpZ2giCiAgICAgICB9LAogICAgICAgewogICAgICAgICAicGFnZXJlZiI6ICJw YWdlXzAiLApAQCAtMTQzLDcgKzE0NSw4IEBAIEhBUiBQYWdlIFRlc3QuCiAgICAgICAgICAgInNl bmQiOiAiPGZpbHRlcmVkPiIsCiAgICAgICAgICAgIndhaXQiOiAiPGZpbHRlcmVkPiIsCiAgICAg ICAgICAgInJlY2VpdmUiOiAiPGZpbHRlcmVkPiIKLSAgICAgICAgfQorICAgICAgICB9LAorICAg ICAgICAiX3ByaW9yaXR5IjogImhpZ2giCiAgICAgICB9LAogICAgICAgewogICAgICAgICAicGFn ZXJlZiI6ICJwYWdlXzAiLApAQCAtMTkxLDcgKzE5NCw4IEBAIEhBUiBQYWdlIFRlc3QuCiAgICAg ICAgICAgInNlbmQiOiAiPGZpbHRlcmVkPiIsCiAgICAgICAgICAgIndhaXQiOiAiPGZpbHRlcmVk PiIsCiAgICAgICAgICAgInJlY2VpdmUiOiAiPGZpbHRlcmVkPiIKLSAgICAgICAgfQorICAgICAg ICB9LAorICAgICAgICAiX3ByaW9yaXR5IjogIm1lZGl1bSIKICAgICAgIH0sCiAgICAgICB7CiAg ICAgICAgICJwYWdlcmVmIjogInBhZ2VfMCIsCkBAIC0yNDUsNyArMjQ5LDggQEAgSEFSIFBhZ2Ug VGVzdC4KICAgICAgICAgICAic2VuZCI6ICI8ZmlsdGVyZWQ+IiwKICAgICAgICAgICAid2FpdCI6 ICI8ZmlsdGVyZWQ+IiwKICAgICAgICAgICAicmVjZWl2ZSI6ICI8ZmlsdGVyZWQ+IgotICAgICAg ICB9CisgICAgICAgIH0sCisgICAgICAgICJfcHJpb3JpdHkiOiAibWVkaXVtIgogICAgICAgfSwK ICAgICAgIHsKICAgICAgICAgInBhZ2VyZWYiOiAicGFnZV8wIiwKQEAgLTI5OCw3ICszMDMsOCBA QCBIQVIgUGFnZSBUZXN0LgogICAgICAgICAgICJzZW5kIjogIjxmaWx0ZXJlZD4iLAogICAgICAg ICAgICJ3YWl0IjogIjxmaWx0ZXJlZD4iLAogICAgICAgICAgICJyZWNlaXZlIjogIjxmaWx0ZXJl ZD4iCi0gICAgICAgIH0KKyAgICAgICAgfSwKKyAgICAgICAgIl9wcmlvcml0eSI6ICJtZWRpdW0i CiAgICAgICB9LAogICAgICAgewogICAgICAgICAicGFnZXJlZiI6ICJwYWdlXzAiLApAQCAtMzUx LDcgKzM1Nyw4IEBAIEhBUiBQYWdlIFRlc3QuCiAgICAgICAgICAgInNlbmQiOiAiPGZpbHRlcmVk PiIsCiAgICAgICAgICAgIndhaXQiOiAiPGZpbHRlcmVkPiIsCiAgICAgICAgICAgInJlY2VpdmUi OiAiPGZpbHRlcmVkPiIKLSAgICAgICAgfQorICAgICAgICB9LAorICAgICAgICAiX3ByaW9yaXR5 IjogIm1lZGl1bSIKICAgICAgIH0sCiAgICAgICB7CiAgICAgICAgICJwYWdlcmVmIjogInBhZ2Vf MCIsCkBAIC00MDQsNyArNDExLDggQEAgSEFSIFBhZ2UgVGVzdC4KICAgICAgICAgICAic2VuZCI6 ICI8ZmlsdGVyZWQ+IiwKICAgICAgICAgICAid2FpdCI6ICI8ZmlsdGVyZWQ+IiwKICAgICAgICAg ICAicmVjZWl2ZSI6ICI8ZmlsdGVyZWQ+IgotICAgICAgICB9CisgICAgICAgIH0sCisgICAgICAg ICJfcHJpb3JpdHkiOiAibWVkaXVtIgogICAgICAgfSwKICAgICAgIHsKICAgICAgICAgInBhZ2Vy ZWYiOiAicGFnZV8wIiwKQEAgLTQ2MSw3ICs0NjksOCBAQCBIQVIgUGFnZSBUZXN0LgogICAgICAg ICAgICJzZW5kIjogIjxmaWx0ZXJlZD4iLAogICAgICAgICAgICJ3YWl0IjogIjxmaWx0ZXJlZD4i LAogICAgICAgICAgICJyZWNlaXZlIjogIjxmaWx0ZXJlZD4iCi0gICAgICAgIH0KKyAgICAgICAg fSwKKyAgICAgICAgIl9wcmlvcml0eSI6ICJtZWRpdW0iCiAgICAgICB9LAogICAgICAgewogICAg ICAgICAicGFnZXJlZiI6ICJwYWdlXzAiLApAQCAtNTI0LDcgKzUzMyw4IEBAIEhBUiBQYWdlIFRl c3QuCiAgICAgICAgICAgInNlbmQiOiAiPGZpbHRlcmVkPiIsCiAgICAgICAgICAgIndhaXQiOiAi PGZpbHRlcmVkPiIsCiAgICAgICAgICAgInJlY2VpdmUiOiAiPGZpbHRlcmVkPiIKLSAgICAgICAg fQorICAgICAgICB9LAorICAgICAgICAiX3ByaW9yaXR5IjogIm1lZGl1bSIKICAgICAgIH0sCiAg ICAgICB7CiAgICAgICAgICJwYWdlcmVmIjogInBhZ2VfMCIsCkBAIC01OTEsNyArNjAxLDggQEAg SEFSIFBhZ2UgVGVzdC4KICAgICAgICAgICAic2VuZCI6ICI8ZmlsdGVyZWQ+IiwKICAgICAgICAg ICAid2FpdCI6ICI8ZmlsdGVyZWQ+IiwKICAgICAgICAgICAicmVjZWl2ZSI6ICI8ZmlsdGVyZWQ+ IgotICAgICAgICB9CisgICAgICAgIH0sCisgICAgICAgICJfcHJpb3JpdHkiOiAibWVkaXVtIgog ICAgICAgfSwKICAgICAgIHsKICAgICAgICAgInBhZ2VyZWYiOiAicGFnZV8wIiwKQEAgLTY2Miw3 ICs2NzMsOCBAQCBIQVIgUGFnZSBUZXN0LgogICAgICAgICAgICJzZW5kIjogIjxmaWx0ZXJlZD4i LAogICAgICAgICAgICJ3YWl0IjogIjxmaWx0ZXJlZD4iLAogICAgICAgICAgICJyZWNlaXZlIjog IjxmaWx0ZXJlZD4iCi0gICAgICAgIH0KKyAgICAgICAgfSwKKyAgICAgICAgIl9wcmlvcml0eSI6 ICJtZWRpdW0iCiAgICAgICB9LAogICAgICAgewogICAgICAgICAicGFnZXJlZiI6ICJwYWdlXzAi LApAQCAtNzM3LDcgKzc0OSw4IEBAIEhBUiBQYWdlIFRlc3QuCiAgICAgICAgICAgInNlbmQiOiAi PGZpbHRlcmVkPiIsCiAgICAgICAgICAgIndhaXQiOiAiPGZpbHRlcmVkPiIsCiAgICAgICAgICAg InJlY2VpdmUiOiAiPGZpbHRlcmVkPiIKLSAgICAgICAgfQorICAgICAgICB9LAorICAgICAgICAi X3ByaW9yaXR5IjogIm1lZGl1bSIKICAgICAgIH0KICAgICBdCiAgIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hh bmdlTG9nCmluZGV4IGM0YjdiMDc3NjRkLi4xMzg0OTcyNzI4MyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTktMDMtMTUgIEpvc2VwaCBQZWNvcmFybyAgPHBl Y29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBIQVIgRXh0ZW5zaW9u IGZvciBSZXNvdXJjZSBQcmlvcml0eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTk1NjkzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0hBUkJ1aWxkZXIuanM6 CisgICAgICAgIChXSS5IQVJCdWlsZGVyLmVudHJ5KToKKyAgICAgICAgKFdJLkhBUkJ1aWxkZXIu cHJpb3JpdHkpOgorICAgICAgICAoV0kuSEFSQnVpbGRlci5uZXR3b3JrUHJpb3JpdHlGcm9tSEFS UHJpb3JpdHkpOgorICAgICAgICBJbmNsdWRlIHByaW9yaXR5IGN1c3RvbSBleHRlbnNpb24uCisK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9Mb2NhbFJlc291cmNlLmpzOgorICAgICAg ICAoV0kuTG9jYWxSZXNvdXJjZS5mcm9tSEFSRW50cnkpOgorICAgICAgICBJbXBvcnQgcHJpb3Jp dHkuCisKIDIwMTktMDMtMTUgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4K IAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBOZXR3b3JrIC0gVG9nZ2xlIEJldHdlZW4gTGl2ZSBB Y3Rpdml0eSBhbmQgSW1wb3J0ZWQgSEFSIHJlc291cmNlIGNvbGxlY3Rpb25zCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9IQVJCdWls ZGVyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMv SEFSQnVpbGRlci5qcwppbmRleCAxMzUwZGZjNGNhMi4uMTMxOTMwZTM5OTkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0hBUkJ1aWxk ZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxl cnMvSEFSQnVpbGRlci5qcwpAQCAtMTE0LDcgKzExNCw5IEBAIFdJLkhBUkJ1aWxkZXIgPSBjbGFz cyBIQVJCdWlsZGVyCiAgICAgICAgIGlmIChyZXNvdXJjZS5yZXNwb25zZVNvdXJjZSAhPT0gV0ku UmVzb3VyY2UuUmVzcG9uc2VTb3VyY2UuVW5rbm93bikKICAgICAgICAgICAgIGVudHJ5Ll9mZXRj aFR5cGUgPSBIQVJCdWlsZGVyLmZldGNoVHlwZShyZXNvdXJjZS5yZXNwb25zZVNvdXJjZSk7CiAK LSAgICAgICAgLy8gRklYTUU6IDxodHRwczovL3dlYmtpdC5vcmcvYi8xOTU2OTM+IFdlYiBJbnNw ZWN0b3I6IEhBUiBFeHRlbnNpb24gZm9yIFJlc291cmNlIFByaW9yaXR5CisgICAgICAgIC8vIFdl YktpdCBDdXN0b20gRmllbGQgYF9wcmlvcml0eWAuCisgICAgICAgIGlmIChyZXNvdXJjZS5wcmlv cml0eSAhPT0gV0kuUmVzb3VyY2UuTmV0d29ya1ByaW9yaXR5LlVua25vd24pCisgICAgICAgICAg ICBlbnRyeS5fcHJpb3JpdHkgPSBIQVJCdWlsZGVyLnByaW9yaXR5KHJlc291cmNlLnByaW9yaXR5 KTsKIAogICAgICAgICByZXR1cm4gZW50cnk7CiAgICAgfQpAQCAtMzE5LDYgKzMyMSwyMSBAQCBX SS5IQVJCdWlsZGVyID0gY2xhc3MgSEFSQnVpbGRlcgogICAgICAgICByZXR1cm4gdW5kZWZpbmVk OwogICAgIH0KIAorICAgIHN0YXRpYyBwcmlvcml0eShwcmlvcml0eSkKKyAgICB7CisgICAgICAg IHN3aXRjaCAocHJpb3JpdHkpIHsKKyAgICAgICAgY2FzZSBXSS5SZXNvdXJjZS5OZXR3b3JrUHJp b3JpdHkuTG93OgorICAgICAgICAgICAgcmV0dXJuICJsb3ciOworICAgICAgICBjYXNlIFdJLlJl c291cmNlLk5ldHdvcmtQcmlvcml0eS5NZWRpdW06CisgICAgICAgICAgICByZXR1cm4gIm1lZGl1 bSI7CisgICAgICAgIGNhc2UgV0kuUmVzb3VyY2UuTmV0d29ya1ByaW9yaXR5LkhpZ2g6CisgICAg ICAgICAgICByZXR1cm4gImhpZ2giOworICAgICAgICB9CisKKyAgICAgICAgY29uc29sZS5hc3Nl cnQoZmFsc2UpOworICAgICAgICByZXR1cm4gdW5kZWZpbmVkOworICAgIH0KKwogICAgIC8vIENv bnN1bWluZy4KIAogICAgIHN0YXRpYyBkYXRlRnJvbUhBUkRhdGUoaXNvU3RyaW5nKQpAQCAtMzQ0 LDcgKzM2MSw3IEBAIFdJLkhBUkJ1aWxkZXIgPSBjbGFzcyBIQVJCdWlsZGVyCiAgICAgICAgIH0K IAogICAgICAgICBpZiAocHJvdG9jb2wpCi0gICAgICAgICAgICBjb25zb2xlLndhcm4oIlVua25v d24gSEFSIFByb3RvY29sIHZhbHVlIiwgcHJvdG9jb2wpOworICAgICAgICAgICAgY29uc29sZS53 YXJuKCJVbmtub3duIEhBUiBwcm90b2NvbCB2YWx1ZSIsIHByb3RvY29sKTsKICAgICAgICAgcmV0 dXJuIG51bGw7CiAgICAgfQogCkBAIC0zNjAsNyArMzc3LDIzIEBAIFdJLkhBUkJ1aWxkZXIgPSBj bGFzcyBIQVJCdWlsZGVyCiAgICAgICAgIH0KIAogICAgICAgICBpZiAoZmV0Y2hUeXBlKQotICAg ICAgICAgICAgY29uc29sZS53YXJuKCJVbmtub3duIEhBUiBQcm90b2NvbCBfZmV0Y2hUeXBlIiwg ZmV0Y2hUeXBlKTsKKyAgICAgICAgICAgIGNvbnNvbGUud2FybigiVW5rbm93biBIQVIgX2ZldGNo VHlwZSB2YWx1ZSIsIGZldGNoVHlwZSk7CiAgICAgICAgIHJldHVybiBXSS5SZXNvdXJjZS5SZXNw b25zZVNvdXJjZS5PdGhlcjsKICAgICB9CisKKyAgICBzdGF0aWMgbmV0d29ya1ByaW9yaXR5RnJv bUhBUlByaW9yaXR5KHByaW9yaXR5KQorICAgIHsKKyAgICAgICAgc3dpdGNoIChwcmlvcml0eSkg eworICAgICAgICBjYXNlICJsb3ciOgorICAgICAgICAgICAgcmV0dXJuIFdJLlJlc291cmNlLk5l dHdvcmtQcmlvcml0eS5Mb3c7CisgICAgICAgIGNhc2UgIm1lZGl1bSI6CisgICAgICAgICAgICBy ZXR1cm4gV0kuUmVzb3VyY2UuTmV0d29ya1ByaW9yaXR5Lk1lZGl1bTsKKyAgICAgICAgY2FzZSAi aGlnaCI6CisgICAgICAgICAgICByZXR1cm4gV0kuUmVzb3VyY2UuTmV0d29ya1ByaW9yaXR5Lkhp Z2g7CisgICAgICAgIH0KKworICAgICAgICBpZiAocHJpb3JpdHkpCisgICAgICAgICAgICBjb25z b2xlLndhcm4oIlVua25vd24gSEFSIHByaW9yaXR5IHZhbHVlIiwgcHJpb3JpdHkpOworICAgICAg ICByZXR1cm4gV0kuUmVzb3VyY2UuTmV0d29ya1ByaW9yaXR5LlVua25vd247CisgICAgfQogfTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9M b2NhbFJlc291cmNlLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9k ZWxzL0xvY2FsUmVzb3VyY2UuanMKaW5kZXggOTUzZGJlMmMwMmYuLjRhNjE2NzUwM2M2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvTG9jYWxS ZXNvdXJjZS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2Rl bHMvTG9jYWxSZXNvdXJjZS5qcwpAQCAtMTgyLDcgKzE4Miw3IEBAIFdJLkxvY2FsUmVzb3VyY2Ug PSBjbGFzcyBMb2NhbFJlc291cmNlIGV4dGVuZHMgV0kuUmVzb3VyY2UKICAgICAgICAgICAgIG1l dHJpY3M6IHsKICAgICAgICAgICAgICAgICByZXNwb25zZVNvdXJjZTogV0kuSEFSQnVpbGRlci5y ZXNwb25zZVNvdXJjZUZyb21IQVJGZXRjaFR5cGUoZW50cnkuX2ZldGNoVHlwZSksCiAgICAgICAg ICAgICAgICAgcHJvdG9jb2w6IFdJLkhBUkJ1aWxkZXIucHJvdG9jb2xGcm9tSEFSUHJvdG9jb2wo cmVzcG9uc2UuaHR0cFZlcnNpb24pLAotICAgICAgICAgICAgICAgIHByaW9yaXR5OiBudWxsLAor ICAgICAgICAgICAgICAgIHByaW9yaXR5OiBXSS5IQVJCdWlsZGVyLm5ldHdvcmtQcmlvcml0eUZy b21IQVJQcmlvcml0eShlbnRyeS5fcHJpb3JpdHkpLAogICAgICAgICAgICAgICAgIHJlbW90ZUFk ZHJlc3M6IGVudHJ5LnNlcnZlcklQQWRkcmVzcyB8fCBudWxsLAogICAgICAgICAgICAgICAgIGNv bm5lY3Rpb25JZGVudGlmaWVyOiBlbnRyeS5jb25uZWN0aW9uID8gcGFyc2VJbnQoZW50cnkuY29u bmVjdGlvbikgOiBudWxsLAogICAgICAgICAgICAgICAgIHJlcXVlc3RIZWFkZXJCeXRlc1NlbnQ6 IHJlcXVlc3QuaGVhZGVyc1NpemUgPj0gMCA/IHJlcXVlc3QuaGVhZGVyc1NpemUgOiBOYU4sCg== 364862 2019-03-15 15:53:11 -0700 2019-03-15 18:56:14 -0700 [PATCH] Proposed Fix better-1.patch text/plain 9506 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA4MjNiOGM0ZTQ5Yy4uMDJkODQ4Y2FhMmEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAor MjAxOS0wMy0xNSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCisgICAg ICAgIFdlYiBJbnNwZWN0b3I6IEhBUiBFeHRlbnNpb24gZm9yIFJlc291cmNlIFByaW9yaXR5Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTU2OTMKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGh0dHAvdGVz dHMvaW5zcGVjdG9yL25ldHdvcmsvaGFyL2hhci1iYXNpYy1leHBlY3RlZC50eHQ6CisgICAgICAg ICogaHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9oYXIvaGFyLXBhZ2UtZXhwZWN0ZWQudHh0 OgorCiAyMDE5LTAzLTE1ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgog CiAgICAgICAgIFtBc3luYyBvdmVyZmxvdyBTY3JvbGxpbmddIFVwZGF0ZSBwb3NpdGlvbmVkIG5v ZGUgbGF5ZXJzIHdoZW4gb3ZlcmZsb3dzIGFyZSBzY3JvbGxlZApkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9oYXIvaGFyLWJhc2ljLWV4cGVjdGVk LnR4dCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdvcmsvaGFyL2hhci1i YXNpYy1leHBlY3RlZC50eHQKaW5kZXggNDhmYzhiYjVlZjMuLjk3YTEwYmZlOWI4IDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9uZXR3b3JrL2hhci9oYXItYmFz aWMtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL25l dHdvcmsvaGFyL2hhci1iYXNpYy1leHBlY3RlZC50eHQKQEAgLTEzNiw3ICsxMzYsOCBAQCBCYXNp YyB0ZXN0cyBmb3IgSEFSLgogICAgICAgICB9LAogICAgICAgICAic2VydmVySVBBZGRyZXNzIjog IjEyLjM0LjU2Ljc4IiwKICAgICAgICAgImNvbm5lY3Rpb24iOiAiMSIsCi0gICAgICAgICJfZmV0 Y2hUeXBlIjogIk5ldHdvcmsgTG9hZCIKKyAgICAgICAgIl9mZXRjaFR5cGUiOiAiTmV0d29yayBM b2FkIiwKKyAgICAgICAgIl9wcmlvcml0eSI6ICJtZWRpdW0iCiAgICAgICB9CiAgICAgXQogICB9 CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9uZXR3b3JrL2hh ci9oYXItcGFnZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rv ci9uZXR3b3JrL2hhci9oYXItcGFnZS1leHBlY3RlZC50eHQKaW5kZXggM2QwNWM5OTBjYzcuLjdk NWIzYjc3YjJhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9u ZXR3b3JrL2hhci9oYXItcGFnZS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90 ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9oYXIvaGFyLXBhZ2UtZXhwZWN0ZWQudHh0CkBAIC02MSw3 ICs2MSw4IEBAIEhBUiBQYWdlIFRlc3QuCiAgICAgICAgICAgInNlbmQiOiAiPGZpbHRlcmVkPiIs CiAgICAgICAgICAgIndhaXQiOiAiPGZpbHRlcmVkPiIsCiAgICAgICAgICAgInJlY2VpdmUiOiAi PGZpbHRlcmVkPiIKLSAgICAgICAgfQorICAgICAgICB9LAorICAgICAgICAiX3ByaW9yaXR5Ijog ImhpZ2giCiAgICAgICB9LAogICAgICAgewogICAgICAgICAicGFnZXJlZiI6ICJwYWdlXzAiLApA QCAtMTAyLDcgKzEwMyw4IEBAIEhBUiBQYWdlIFRlc3QuCiAgICAgICAgICAgInNlbmQiOiAiPGZp bHRlcmVkPiIsCiAgICAgICAgICAgIndhaXQiOiAiPGZpbHRlcmVkPiIsCiAgICAgICAgICAgInJl Y2VpdmUiOiAiPGZpbHRlcmVkPiIKLSAgICAgICAgfQorICAgICAgICB9LAorICAgICAgICAiX3By aW9yaXR5IjogImhpZ2giCiAgICAgICB9LAogICAgICAgewogICAgICAgICAicGFnZXJlZiI6ICJw YWdlXzAiLApAQCAtMTQzLDcgKzE0NSw4IEBAIEhBUiBQYWdlIFRlc3QuCiAgICAgICAgICAgInNl bmQiOiAiPGZpbHRlcmVkPiIsCiAgICAgICAgICAgIndhaXQiOiAiPGZpbHRlcmVkPiIsCiAgICAg ICAgICAgInJlY2VpdmUiOiAiPGZpbHRlcmVkPiIKLSAgICAgICAgfQorICAgICAgICB9LAorICAg ICAgICAiX3ByaW9yaXR5IjogImhpZ2giCiAgICAgICB9LAogICAgICAgewogICAgICAgICAicGFn ZXJlZiI6ICJwYWdlXzAiLApAQCAtMTkxLDcgKzE5NCw4IEBAIEhBUiBQYWdlIFRlc3QuCiAgICAg ICAgICAgInNlbmQiOiAiPGZpbHRlcmVkPiIsCiAgICAgICAgICAgIndhaXQiOiAiPGZpbHRlcmVk PiIsCiAgICAgICAgICAgInJlY2VpdmUiOiAiPGZpbHRlcmVkPiIKLSAgICAgICAgfQorICAgICAg ICB9LAorICAgICAgICAiX3ByaW9yaXR5IjogIm1lZGl1bSIKICAgICAgIH0sCiAgICAgICB7CiAg ICAgICAgICJwYWdlcmVmIjogInBhZ2VfMCIsCkBAIC0yNDUsNyArMjQ5LDggQEAgSEFSIFBhZ2Ug VGVzdC4KICAgICAgICAgICAic2VuZCI6ICI8ZmlsdGVyZWQ+IiwKICAgICAgICAgICAid2FpdCI6 ICI8ZmlsdGVyZWQ+IiwKICAgICAgICAgICAicmVjZWl2ZSI6ICI8ZmlsdGVyZWQ+IgotICAgICAg ICB9CisgICAgICAgIH0sCisgICAgICAgICJfcHJpb3JpdHkiOiAibWVkaXVtIgogICAgICAgfSwK ICAgICAgIHsKICAgICAgICAgInBhZ2VyZWYiOiAicGFnZV8wIiwKQEAgLTI5OCw3ICszMDMsOCBA QCBIQVIgUGFnZSBUZXN0LgogICAgICAgICAgICJzZW5kIjogIjxmaWx0ZXJlZD4iLAogICAgICAg ICAgICJ3YWl0IjogIjxmaWx0ZXJlZD4iLAogICAgICAgICAgICJyZWNlaXZlIjogIjxmaWx0ZXJl ZD4iCi0gICAgICAgIH0KKyAgICAgICAgfSwKKyAgICAgICAgIl9wcmlvcml0eSI6ICJtZWRpdW0i CiAgICAgICB9LAogICAgICAgewogICAgICAgICAicGFnZXJlZiI6ICJwYWdlXzAiLApAQCAtMzUx LDcgKzM1Nyw4IEBAIEhBUiBQYWdlIFRlc3QuCiAgICAgICAgICAgInNlbmQiOiAiPGZpbHRlcmVk PiIsCiAgICAgICAgICAgIndhaXQiOiAiPGZpbHRlcmVkPiIsCiAgICAgICAgICAgInJlY2VpdmUi OiAiPGZpbHRlcmVkPiIKLSAgICAgICAgfQorICAgICAgICB9LAorICAgICAgICAiX3ByaW9yaXR5 IjogIm1lZGl1bSIKICAgICAgIH0sCiAgICAgICB7CiAgICAgICAgICJwYWdlcmVmIjogInBhZ2Vf MCIsCkBAIC00MDQsNyArNDExLDggQEAgSEFSIFBhZ2UgVGVzdC4KICAgICAgICAgICAic2VuZCI6 ICI8ZmlsdGVyZWQ+IiwKICAgICAgICAgICAid2FpdCI6ICI8ZmlsdGVyZWQ+IiwKICAgICAgICAg ICAicmVjZWl2ZSI6ICI8ZmlsdGVyZWQ+IgotICAgICAgICB9CisgICAgICAgIH0sCisgICAgICAg ICJfcHJpb3JpdHkiOiAibWVkaXVtIgogICAgICAgfSwKICAgICAgIHsKICAgICAgICAgInBhZ2Vy ZWYiOiAicGFnZV8wIiwKQEAgLTQ2MSw3ICs0NjksOCBAQCBIQVIgUGFnZSBUZXN0LgogICAgICAg ICAgICJzZW5kIjogIjxmaWx0ZXJlZD4iLAogICAgICAgICAgICJ3YWl0IjogIjxmaWx0ZXJlZD4i LAogICAgICAgICAgICJyZWNlaXZlIjogIjxmaWx0ZXJlZD4iCi0gICAgICAgIH0KKyAgICAgICAg fSwKKyAgICAgICAgIl9wcmlvcml0eSI6ICJtZWRpdW0iCiAgICAgICB9LAogICAgICAgewogICAg ICAgICAicGFnZXJlZiI6ICJwYWdlXzAiLApAQCAtNTI0LDcgKzUzMyw4IEBAIEhBUiBQYWdlIFRl c3QuCiAgICAgICAgICAgInNlbmQiOiAiPGZpbHRlcmVkPiIsCiAgICAgICAgICAgIndhaXQiOiAi PGZpbHRlcmVkPiIsCiAgICAgICAgICAgInJlY2VpdmUiOiAiPGZpbHRlcmVkPiIKLSAgICAgICAg fQorICAgICAgICB9LAorICAgICAgICAiX3ByaW9yaXR5IjogIm1lZGl1bSIKICAgICAgIH0sCiAg ICAgICB7CiAgICAgICAgICJwYWdlcmVmIjogInBhZ2VfMCIsCkBAIC01OTEsNyArNjAxLDggQEAg SEFSIFBhZ2UgVGVzdC4KICAgICAgICAgICAic2VuZCI6ICI8ZmlsdGVyZWQ+IiwKICAgICAgICAg ICAid2FpdCI6ICI8ZmlsdGVyZWQ+IiwKICAgICAgICAgICAicmVjZWl2ZSI6ICI8ZmlsdGVyZWQ+ IgotICAgICAgICB9CisgICAgICAgIH0sCisgICAgICAgICJfcHJpb3JpdHkiOiAibWVkaXVtIgog ICAgICAgfSwKICAgICAgIHsKICAgICAgICAgInBhZ2VyZWYiOiAicGFnZV8wIiwKQEAgLTY2Miw3 ICs2NzMsOCBAQCBIQVIgUGFnZSBUZXN0LgogICAgICAgICAgICJzZW5kIjogIjxmaWx0ZXJlZD4i LAogICAgICAgICAgICJ3YWl0IjogIjxmaWx0ZXJlZD4iLAogICAgICAgICAgICJyZWNlaXZlIjog IjxmaWx0ZXJlZD4iCi0gICAgICAgIH0KKyAgICAgICAgfSwKKyAgICAgICAgIl9wcmlvcml0eSI6 ICJtZWRpdW0iCiAgICAgICB9LAogICAgICAgewogICAgICAgICAicGFnZXJlZiI6ICJwYWdlXzAi LApAQCAtNzM3LDcgKzc0OSw4IEBAIEhBUiBQYWdlIFRlc3QuCiAgICAgICAgICAgInNlbmQiOiAi PGZpbHRlcmVkPiIsCiAgICAgICAgICAgIndhaXQiOiAiPGZpbHRlcmVkPiIsCiAgICAgICAgICAg InJlY2VpdmUiOiAiPGZpbHRlcmVkPiIKLSAgICAgICAgfQorICAgICAgICB9LAorICAgICAgICAi X3ByaW9yaXR5IjogIm1lZGl1bSIKICAgICAgIH0KICAgICBdCiAgIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hh bmdlTG9nCmluZGV4IGM0YjdiMDc3NjRkLi4xMzg0OTcyNzI4MyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTktMDMtMTUgIEpvc2VwaCBQZWNvcmFybyAgPHBl Y29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBIQVIgRXh0ZW5zaW9u IGZvciBSZXNvdXJjZSBQcmlvcml0eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTk1NjkzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0hBUkJ1aWxkZXIuanM6 CisgICAgICAgIChXSS5IQVJCdWlsZGVyLmVudHJ5KToKKyAgICAgICAgKFdJLkhBUkJ1aWxkZXIu cHJpb3JpdHkpOgorICAgICAgICAoV0kuSEFSQnVpbGRlci5uZXR3b3JrUHJpb3JpdHlGcm9tSEFS UHJpb3JpdHkpOgorICAgICAgICBJbmNsdWRlIHByaW9yaXR5IGN1c3RvbSBleHRlbnNpb24uCisK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9Mb2NhbFJlc291cmNlLmpzOgorICAgICAg ICAoV0kuTG9jYWxSZXNvdXJjZS5mcm9tSEFSRW50cnkpOgorICAgICAgICBJbXBvcnQgcHJpb3Jp dHkuCisKIDIwMTktMDMtMTUgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4K IAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBOZXR3b3JrIC0gVG9nZ2xlIEJldHdlZW4gTGl2ZSBB Y3Rpdml0eSBhbmQgSW1wb3J0ZWQgSEFSIHJlc291cmNlIGNvbGxlY3Rpb25zCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9IQVJCdWls ZGVyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMv SEFSQnVpbGRlci5qcwppbmRleCAxMzUwZGZjNGNhMi4uMTMxOTMwZTM5OTkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0hBUkJ1aWxk ZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxl cnMvSEFSQnVpbGRlci5qcwpAQCAtMTE0LDcgKzExNCw5IEBAIFdJLkhBUkJ1aWxkZXIgPSBjbGFz cyBIQVJCdWlsZGVyCiAgICAgICAgIGlmIChyZXNvdXJjZS5yZXNwb25zZVNvdXJjZSAhPT0gV0ku UmVzb3VyY2UuUmVzcG9uc2VTb3VyY2UuVW5rbm93bikKICAgICAgICAgICAgIGVudHJ5Ll9mZXRj aFR5cGUgPSBIQVJCdWlsZGVyLmZldGNoVHlwZShyZXNvdXJjZS5yZXNwb25zZVNvdXJjZSk7CiAK LSAgICAgICAgLy8gRklYTUU6IDxodHRwczovL3dlYmtpdC5vcmcvYi8xOTU2OTM+IFdlYiBJbnNw ZWN0b3I6IEhBUiBFeHRlbnNpb24gZm9yIFJlc291cmNlIFByaW9yaXR5CisgICAgICAgIC8vIFdl YktpdCBDdXN0b20gRmllbGQgYF9wcmlvcml0eWAuCisgICAgICAgIGlmIChyZXNvdXJjZS5wcmlv cml0eSAhPT0gV0kuUmVzb3VyY2UuTmV0d29ya1ByaW9yaXR5LlVua25vd24pCisgICAgICAgICAg ICBlbnRyeS5fcHJpb3JpdHkgPSBIQVJCdWlsZGVyLnByaW9yaXR5KHJlc291cmNlLnByaW9yaXR5 KTsKIAogICAgICAgICByZXR1cm4gZW50cnk7CiAgICAgfQpAQCAtMzE5LDYgKzMyMSwyMSBAQCBX SS5IQVJCdWlsZGVyID0gY2xhc3MgSEFSQnVpbGRlcgogICAgICAgICByZXR1cm4gdW5kZWZpbmVk OwogICAgIH0KIAorICAgIHN0YXRpYyBwcmlvcml0eShwcmlvcml0eSkKKyAgICB7CisgICAgICAg IHN3aXRjaCAocHJpb3JpdHkpIHsKKyAgICAgICAgY2FzZSBXSS5SZXNvdXJjZS5OZXR3b3JrUHJp b3JpdHkuTG93OgorICAgICAgICAgICAgcmV0dXJuICJsb3ciOworICAgICAgICBjYXNlIFdJLlJl c291cmNlLk5ldHdvcmtQcmlvcml0eS5NZWRpdW06CisgICAgICAgICAgICByZXR1cm4gIm1lZGl1 bSI7CisgICAgICAgIGNhc2UgV0kuUmVzb3VyY2UuTmV0d29ya1ByaW9yaXR5LkhpZ2g6CisgICAg ICAgICAgICByZXR1cm4gImhpZ2giOworICAgICAgICB9CisKKyAgICAgICAgY29uc29sZS5hc3Nl cnQoZmFsc2UpOworICAgICAgICByZXR1cm4gdW5kZWZpbmVkOworICAgIH0KKwogICAgIC8vIENv bnN1bWluZy4KIAogICAgIHN0YXRpYyBkYXRlRnJvbUhBUkRhdGUoaXNvU3RyaW5nKQpAQCAtMzQ0 LDcgKzM2MSw3IEBAIFdJLkhBUkJ1aWxkZXIgPSBjbGFzcyBIQVJCdWlsZGVyCiAgICAgICAgIH0K IAogICAgICAgICBpZiAocHJvdG9jb2wpCi0gICAgICAgICAgICBjb25zb2xlLndhcm4oIlVua25v d24gSEFSIFByb3RvY29sIHZhbHVlIiwgcHJvdG9jb2wpOworICAgICAgICAgICAgY29uc29sZS53 YXJuKCJVbmtub3duIEhBUiBwcm90b2NvbCB2YWx1ZSIsIHByb3RvY29sKTsKICAgICAgICAgcmV0 dXJuIG51bGw7CiAgICAgfQogCkBAIC0zNjAsNyArMzc3LDIzIEBAIFdJLkhBUkJ1aWxkZXIgPSBj bGFzcyBIQVJCdWlsZGVyCiAgICAgICAgIH0KIAogICAgICAgICBpZiAoZmV0Y2hUeXBlKQotICAg ICAgICAgICAgY29uc29sZS53YXJuKCJVbmtub3duIEhBUiBQcm90b2NvbCBfZmV0Y2hUeXBlIiwg ZmV0Y2hUeXBlKTsKKyAgICAgICAgICAgIGNvbnNvbGUud2FybigiVW5rbm93biBIQVIgX2ZldGNo VHlwZSB2YWx1ZSIsIGZldGNoVHlwZSk7CiAgICAgICAgIHJldHVybiBXSS5SZXNvdXJjZS5SZXNw b25zZVNvdXJjZS5PdGhlcjsKICAgICB9CisKKyAgICBzdGF0aWMgbmV0d29ya1ByaW9yaXR5RnJv bUhBUlByaW9yaXR5KHByaW9yaXR5KQorICAgIHsKKyAgICAgICAgc3dpdGNoIChwcmlvcml0eSkg eworICAgICAgICBjYXNlICJsb3ciOgorICAgICAgICAgICAgcmV0dXJuIFdJLlJlc291cmNlLk5l dHdvcmtQcmlvcml0eS5Mb3c7CisgICAgICAgIGNhc2UgIm1lZGl1bSI6CisgICAgICAgICAgICBy ZXR1cm4gV0kuUmVzb3VyY2UuTmV0d29ya1ByaW9yaXR5Lk1lZGl1bTsKKyAgICAgICAgY2FzZSAi aGlnaCI6CisgICAgICAgICAgICByZXR1cm4gV0kuUmVzb3VyY2UuTmV0d29ya1ByaW9yaXR5Lkhp Z2g7CisgICAgICAgIH0KKworICAgICAgICBpZiAocHJpb3JpdHkpCisgICAgICAgICAgICBjb25z b2xlLndhcm4oIlVua25vd24gSEFSIHByaW9yaXR5IHZhbHVlIiwgcHJpb3JpdHkpOworICAgICAg ICByZXR1cm4gV0kuUmVzb3VyY2UuTmV0d29ya1ByaW9yaXR5LlVua25vd247CisgICAgfQogfTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9M b2NhbFJlc291cmNlLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9k ZWxzL0xvY2FsUmVzb3VyY2UuanMKaW5kZXggOTUzZGJlMmMwMmYuLmZiOGFiNDI2YjYyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvTG9jYWxS ZXNvdXJjZS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2Rl bHMvTG9jYWxSZXNvdXJjZS5qcwpAQCAtOTksNyArOTksNiBAQCBXSS5Mb2NhbFJlc291cmNlID0g Y2xhc3MgTG9jYWxSZXNvdXJjZSBleHRlbmRzIFdJLlJlc291cmNlCiAgICAgewogICAgICAgICAv LyBGSVhNRTogPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzE5NTY5NT4gV2ViIEluc3BlY3RvcjogSEFS IEV4dGVuc2lvbiBmb3IgYHNlcnZlcklQQWRkcmVzc2AgcG9ydCBudW1iZXIKICAgICAgICAgLy8g RklYTUU6IDxodHRwczovL3dlYmtpdC5vcmcvYi8xOTU2OTQ+IFdlYiBJbnNwZWN0b3I6IEhBUiBF eHRlbnNpb24gZm9yIFJlZGlyZWN0IFRpbWluZyBJbmZvCi0gICAgICAgIC8vIEZJWE1FOiA8aHR0 cHM6Ly93ZWJraXQub3JnL2IvMTk1NjkzPiBXZWIgSW5zcGVjdG9yOiBIQVIgRXh0ZW5zaW9uIGZv ciBSZXNvdXJjZSBQcmlvcml0eQogCiAgICAgICAgIGxldCB7cmVxdWVzdCwgcmVzcG9uc2UsIHN0 YXJ0ZWREYXRlVGltZSwgdGltaW5nc30gPSBlbnRyeTsKICAgICAgICAgbGV0IHJlcXVlc3RTZW50 V2FsbHRpbWUgPSBXSS5IQVJCdWlsZGVyLmRhdGVGcm9tSEFSRGF0ZShzdGFydGVkRGF0ZVRpbWUp IC8gMTAwMDsKQEAgLTE4Miw3ICsxODEsNyBAQCBXSS5Mb2NhbFJlc291cmNlID0gY2xhc3MgTG9j YWxSZXNvdXJjZSBleHRlbmRzIFdJLlJlc291cmNlCiAgICAgICAgICAgICBtZXRyaWNzOiB7CiAg ICAgICAgICAgICAgICAgcmVzcG9uc2VTb3VyY2U6IFdJLkhBUkJ1aWxkZXIucmVzcG9uc2VTb3Vy Y2VGcm9tSEFSRmV0Y2hUeXBlKGVudHJ5Ll9mZXRjaFR5cGUpLAogICAgICAgICAgICAgICAgIHBy b3RvY29sOiBXSS5IQVJCdWlsZGVyLnByb3RvY29sRnJvbUhBUlByb3RvY29sKHJlc3BvbnNlLmh0 dHBWZXJzaW9uKSwKLSAgICAgICAgICAgICAgICBwcmlvcml0eTogbnVsbCwKKyAgICAgICAgICAg ICAgICBwcmlvcml0eTogV0kuSEFSQnVpbGRlci5uZXR3b3JrUHJpb3JpdHlGcm9tSEFSUHJpb3Jp dHkoZW50cnkuX3ByaW9yaXR5KSwKICAgICAgICAgICAgICAgICByZW1vdGVBZGRyZXNzOiBlbnRy eS5zZXJ2ZXJJUEFkZHJlc3MgfHwgbnVsbCwKICAgICAgICAgICAgICAgICBjb25uZWN0aW9uSWRl bnRpZmllcjogZW50cnkuY29ubmVjdGlvbiA/IHBhcnNlSW50KGVudHJ5LmNvbm5lY3Rpb24pIDog bnVsbCwKICAgICAgICAgICAgICAgICByZXF1ZXN0SGVhZGVyQnl0ZXNTZW50OiByZXF1ZXN0Lmhl YWRlcnNTaXplID49IDAgPyByZXF1ZXN0LmhlYWRlcnNTaXplIDogTmFOLAo=