205680 2020-01-01 20:34:47 -0800 Reformat WebResourceLoader logging 2020-01-02 13:21:09 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=205679 InRadar P2 Normal --- 1 krollin krollin achristensen cdumez commit-queue dbates ews-watchlist mkwst webkit-bug-importer oldest_to_newest 1602126 0 krollin 2020-01-01 20:34:47 -0800 Update the format used by WebResourceLoader in its RELEASE_LOG logging. Use the format used by WebPageProxy and NetworkResourceLoader, which is generally of the form: <object-address> - [<values that help thread together operations>] <class>::<method>: <message and other useful values> So, for example: 0x4a1dbcb58 - WebResourceLoader::didFinishResourceLoad: (webPageID=15, frameID=3, resourceID=1, length=212132) becomes: 0x621af2c40 - [webPageID=15, frameID=3, resourceID=1] WebResourceLoader::didFinishResourceLoad: (length=212132) 1602127 1 webkit-bug-importer 2020-01-01 20:34:56 -0800 <rdar://problem/58266105> 1602129 2 386595 krollin 2020-01-01 20:39:26 -0800 Created attachment 386595 Patch 1602211 3 386595 commit-queue 2020-01-02 13:21:08 -0800 Comment on attachment 386595 Patch Clearing flags on attachment: 386595 Committed r253979: <https://trac.webkit.org/changeset/253979> 1602212 4 commit-queue 2020-01-02 13:21:09 -0800 All reviewed patches have been landed. Closing bug. 386595 2020-01-01 20:39:26 -0800 2020-01-02 13:21:08 -0800 Patch bug-205680-20200101203925.patch text/plain 13801 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzODg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGVkMTBjNWQ2MDYyZWE1NjZl YWRiZjFmNmJlMmNhMzU5YWViYWMzNjEuLjYwZjg0YzEzOTNmNGYyOTg1YWE2NmM1YjVmZjg3MWQy YTYzYmMzMmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzggQEAKKzIwMjAtMDEtMDEgIEtlaXRoIFJv bGxpbiAgPGtyb2xsaW5AYXBwbGUuY29tPgorCisgICAgICAgIFJlZm9ybWF0IFdlYlJlc291cmNl TG9hZGVyIGxvZ2dpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIwNTY4MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTgyNjYxMDU+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlIHRoZSBmb3Jt YXQgdXNlZCBieSBXZWJSZXNvdXJjZUxvYWRlciBpbiBpdHMgUkVMRUFTRV9MT0cKKyAgICAgICAg bG9nZ2luZy4gVXNlIHRoZSBmb3JtYXQgdXNlZCBieSBXZWJQYWdlUHJveHkgYW5kCisgICAgICAg IE5ldHdvcmtSZXNvdXJjZUxvYWRlciwgd2hpY2ggaXMgZ2VuZXJhbGx5IG9mIHRoZSBmb3JtOgor CisgICAgICAgICAgICA8b2JqZWN0LWFkZHJlc3M+IC0gWzx2YWx1ZXMgdGhhdCBoZWxwIHRocmVh ZCB0b2dldGhlciBvcGVyYXRpb25zPl0gPGNsYXNzPjo6PG1ldGhvZD46IDxtZXNzYWdlIGFuZCBv dGhlciB1c2VmdWwgdmFsdWVzPgorCisgICAgICAgIFNvLCBmb3IgZXhhbXBsZToKKworICAgICAg ICAgICAgMHg0YTFkYmNiNTggLSBXZWJSZXNvdXJjZUxvYWRlcjo6ZGlkRmluaXNoUmVzb3VyY2VM b2FkOiAod2ViUGFnZUlEPTE1LCBmcmFtZUlEPTMsIHJlc291cmNlSUQ9MSwgbGVuZ3RoPTIxMjEz MikKKworICAgICAgICBiZWNvbWVzOgorCisgICAgICAgICAgICAweDRhMWRiY2I1OCAtIFt3ZWJQ YWdlSUQ9MTUsIGZyYW1lSUQ9MywgcmVzb3VyY2VJRD0xXSBXZWJSZXNvdXJjZUxvYWRlcjo6ZGlk RmluaXNoUmVzb3VyY2VMb2FkOiAobGVuZ3RoPTIxMjEzMikKKworICAgICAgICBObyBuZXcgdGVz dHMgLSBubyBhZGRlZCBvciBjaGFuZ2VkIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBXZWJQ cm9jZXNzL05ldHdvcmsvV2ViUmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJSZXNvdXJjZUxvYWRlcjo6d2lsbFNlbmRSZXF1ZXN0KToKKyAgICAgICAgKFdlYktpdDo6V2Vi UmVzb3VyY2VMb2FkZXI6OmRpZFJlY2VpdmVSZXNwb25zZSk6CisgICAgICAgIChXZWJLaXQ6Oldl YlJlc291cmNlTG9hZGVyOjpkaWRSZWNlaXZlRGF0YSk6CisgICAgICAgIChXZWJLaXQ6OldlYlJl c291cmNlTG9hZGVyOjpkaWRGaW5pc2hSZXNvdXJjZUxvYWQpOgorICAgICAgICAoV2ViS2l0OjpX ZWJSZXNvdXJjZUxvYWRlcjo6c2VydmljZVdvcmtlckRpZE5vdEhhbmRsZSk6CisgICAgICAgIChX ZWJLaXQ6OldlYlJlc291cmNlTG9hZGVyOjpkaWRGYWlsUmVzb3VyY2VMb2FkKToKKyAgICAgICAg KFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkZXI6OmRpZEJsb2NrQXV0aGVudGljYXRpb25DaGFsbGVu Z2UpOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRlcjo6c3RvcExvYWRpbmdBZnRl clhGcmFtZU9wdGlvbnNPckNvbnRlbnRTZWN1cml0eVBvbGljeURlbmllZCk6CisgICAgICAgIChX ZWJLaXQ6OldlYlJlc291cmNlTG9hZGVyOjpkaWRSZWNlaXZlUmVzb3VyY2UpOgorCiAyMDIwLTAx LTAxICBLZWl0aCBSb2xsaW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZWZvcm1h dCBQcm9jZXNzVGhyb3R0bGVyIGxvZ2dpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9OZXR3b3JrL1dlYlJlc291cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9OZXR3b3JrL1dlYlJlc291cmNlTG9hZGVyLmNwcAppbmRleCA4ODA3ZmE1NTliOTRh ZGUzMjJlOWQ3YjQzMDgwN2M3YzI4ZDc2MTg5Li5hYWFhNmQxMzEyYTUxZWIyNmEwOGU1NDI3YzI0 NGVlYWRjY2QxODkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29y ay9XZWJSZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05l dHdvcmsvV2ViUmVzb3VyY2VMb2FkZXIuY3BwCkBAIC01NSw3ICs1NSw3IEBACiAjaW5jbHVkZSA8 V2ViQ29yZS9TdWJyZXNvdXJjZUxvYWRlci5oPgogI2luY2x1ZGUgPHd0Zi9Db21wbGV0aW9uSGFu ZGxlci5oPgogCi0jZGVmaW5lIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoZm10LCAuLi4pIFJFTEVB U0VfTE9HX0lGKGlzQWx3YXlzT25Mb2dnaW5nQWxsb3dlZCgpLCBOZXR3b3JrLCAiJXAgLSBXZWJS ZXNvdXJjZUxvYWRlcjo6IiBmbXQsIHRoaXMsICMjX19WQV9BUkdTX18pCisjZGVmaW5lIFJFTEVB U0VfTE9HX0lGX0FMTE9XRUQoZm10LCAuLi4pIFJFTEVBU0VfTE9HX0lGKGlzQWx3YXlzT25Mb2dn aW5nQWxsb3dlZCgpLCBOZXR3b3JrLCAiJXAgLSBbd2ViUGFnZUlEPSUiIFBSSXU2NCAiLCBmcmFt ZUlEPSUiIFBSSXU2NCAiLCByZXNvdXJjZUlEPSUiIFBSSXU2NCAiXSBXZWJSZXNvdXJjZUxvYWRl cjo6IiBmbXQsIHRoaXMsIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLnBhZ2VJRC50b1VJbnQ2NCgpLCBt X3RyYWNraW5nUGFyYW1ldGVycy5mcmFtZUlELnRvVUludDY0KCksIG1fdHJhY2tpbmdQYXJhbWV0 ZXJzLnJlc291cmNlSUQsICMjX19WQV9BUkdTX18pCiAKIG5hbWVzcGFjZSBXZWJLaXQgewogdXNp bmcgbmFtZXNwYWNlIFdlYkNvcmU7CkBAIC0xMDEsMTYgKzEwMSwxNiBAQCB2b2lkIFdlYlJlc291 cmNlTG9hZGVyOjp3aWxsU2VuZFJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0JiYgcHJvcG9zZWRSZXF1 ZXN0LCBJUEM6OgogICAgIHByb3Bvc2VkUmVxdWVzdC5zZXRIVFRQQm9keShwcm9wb3NlZFJlcXVl c3RCb2R5LnRha2VEYXRhKCkpOwogCiAgICAgTE9HKE5ldHdvcmssICIoV2ViUHJvY2VzcykgV2Vi UmVzb3VyY2VMb2FkZXI6OndpbGxTZW5kUmVxdWVzdCB0byAnJXMnIiwgcHJvcG9zZWRSZXF1ZXN0 LnVybCgpLnN0cmluZygpLmxhdGluMSgpLmRhdGEoKSk7Ci0gICAgUkVMRUFTRV9MT0dfSUZfQUxM T1dFRCgid2lsbFNlbmRSZXF1ZXN0OiAod2ViUGFnZUlEPSUiIFBSSXU2NCAiLCBmcmFtZUlEPSUi IFBSSXU2NCAiLCByZXNvdXJjZUlEPSUiIFBSSXU2NCAiKSIsIG1fdHJhY2tpbmdQYXJhbWV0ZXJz LnBhZ2VJRC50b1VJbnQ2NCgpLCBtX3RyYWNraW5nUGFyYW1ldGVycy5mcmFtZUlELnRvVUludDY0 KCksIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLnJlc291cmNlSUQpOworICAgIFJFTEVBU0VfTE9HX0lG X0FMTE9XRUQoIndpbGxTZW5kUmVxdWVzdDoiKTsKIAogICAgIGlmIChtX2NvcmVMb2FkZXItPmRv Y3VtZW50TG9hZGVyKCktPmFwcGxpY2F0aW9uQ2FjaGVIb3N0KCkubWF5YmVMb2FkRmFsbGJhY2tG b3JSZWRpcmVjdChtX2NvcmVMb2FkZXIuZ2V0KCksIHByb3Bvc2VkUmVxdWVzdCwgcmVkaXJlY3RS ZXNwb25zZSkpIHsKLSAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgid2lsbFNlbmRSZXF1 ZXN0OiBleGl0aW5nIGVhcmx5IGJlY2F1c2UgbWF5YmVMb2FkRmFsbGJhY2tGb3JSZWRpcmVjdCBy ZXR1cm5lZCBmYWxzZSAod2ViUGFnZUlEPSUiIFBSSXU2NCAiLCBmcmFtZUlEPSUiIFBSSXU2NCAi LCByZXNvdXJjZUlEPSUiIFBSSXU2NCAiKSIsIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLnBhZ2VJRC50 b1VJbnQ2NCgpLCBtX3RyYWNraW5nUGFyYW1ldGVycy5mcmFtZUlELnRvVUludDY0KCksIG1fdHJh Y2tpbmdQYXJhbWV0ZXJzLnJlc291cmNlSUQpOworICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExP V0VEKCJ3aWxsU2VuZFJlcXVlc3Q6IGV4aXRpbmcgZWFybHkgYmVjYXVzZSBtYXliZUxvYWRGYWxs YmFja0ZvclJlZGlyZWN0IHJldHVybmVkIGZhbHNlIik7CiAgICAgICAgIHJldHVybjsKICAgICB9 CiAKICAgICBtX2NvcmVMb2FkZXItPndpbGxTZW5kUmVxdWVzdChXVEZNb3ZlKHByb3Bvc2VkUmVx dWVzdCksIHJlZGlyZWN0UmVzcG9uc2UsIFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gV1RGTW92ZShw cm90ZWN0ZWRUaGlzKV0oUmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCkgewogICAgICAgICBpZiAo IW1fY29yZUxvYWRlciB8fCAhbV9jb3JlTG9hZGVyLT5pZGVudGlmaWVyKCkpIHsKLSAgICAgICAg ICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoIndpbGxTZW5kUmVxdWVzdDogZXhpdGluZyBlYXJs eSBiZWNhdXNlIG5vIGNvcmVsb2FkZXIgb3IgaWRlbnRpZmllciAod2ViUGFnZUlEPSUiIFBSSXU2 NCAiLCBmcmFtZUlEPSUiIFBSSXU2NCAiLCByZXNvdXJjZUlEPSUiIFBSSXU2NCAiKSIsIG1fdHJh Y2tpbmdQYXJhbWV0ZXJzLnBhZ2VJRC50b1VJbnQ2NCgpLCBtX3RyYWNraW5nUGFyYW1ldGVycy5m cmFtZUlELnRvVUludDY0KCksIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLnJlc291cmNlSUQpOworICAg ICAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgid2lsbFNlbmRSZXF1ZXN0OiBleGl0aW5n IGVhcmx5IGJlY2F1c2Ugbm8gY29yZWxvYWRlciBvciBpZGVudGlmaWVyIik7CiAgICAgICAgICAg ICByZXR1cm47CiAgICAgICAgIH0KIApAQCAtMTI2LDEyICsxMjYsMTIgQEAgdm9pZCBXZWJSZXNv dXJjZUxvYWRlcjo6ZGlkU2VuZERhdGEodWludDY0X3QgYnl0ZXNTZW50LCB1aW50NjRfdCB0b3Rh bEJ5dGVzVG9CZVMKIHZvaWQgV2ViUmVzb3VyY2VMb2FkZXI6OmRpZFJlY2VpdmVSZXNwb25zZShj b25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSwgYm9vbCBuZWVkc0NvbnRpbnVlRGlkUmVj ZWl2ZVJlc3BvbnNlTWVzc2FnZSkKIHsKICAgICBMT0coTmV0d29yaywgIihXZWJQcm9jZXNzKSBX ZWJSZXNvdXJjZUxvYWRlcjo6ZGlkUmVjZWl2ZVJlc3BvbnNlIGZvciAnJXMnLiBTdGF0dXMgJWQu IiwgbV9jb3JlTG9hZGVyLT51cmwoKS5zdHJpbmcoKS5sYXRpbjEoKS5kYXRhKCksIHJlc3BvbnNl Lmh0dHBTdGF0dXNDb2RlKCkpOwotICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoImRpZFJlY2Vp dmVSZXNwb25zZTogKHdlYlBhZ2VJRD0lIiBQUkl1NjQgIiwgZnJhbWVJRD0lIiBQUkl1NjQgIiwg cmVzb3VyY2VJRD0lIiBQUkl1NjQgIiwgc3RhdHVzPSVkKSIsIG1fdHJhY2tpbmdQYXJhbWV0ZXJz LnBhZ2VJRC50b1VJbnQ2NCgpLCBtX3RyYWNraW5nUGFyYW1ldGVycy5mcmFtZUlELnRvVUludDY0 KCksIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLnJlc291cmNlSUQsIHJlc3BvbnNlLmh0dHBTdGF0dXND b2RlKCkpOworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoImRpZFJlY2VpdmVSZXNwb25zZTog KGh0dHBTdGF0dXNDb2RlPSVkKSIsIHJlc3BvbnNlLmh0dHBTdGF0dXNDb2RlKCkpOwogCiAgICAg UmVmPFdlYlJlc291cmNlTG9hZGVyPiBwcm90ZWN0ZWRUaGlzKCp0aGlzKTsKIAogICAgIGlmICht X2NvcmVMb2FkZXItPmRvY3VtZW50TG9hZGVyKCktPmFwcGxpY2F0aW9uQ2FjaGVIb3N0KCkubWF5 YmVMb2FkRmFsbGJhY2tGb3JSZXNwb25zZShtX2NvcmVMb2FkZXIuZ2V0KCksIHJlc3BvbnNlKSkg ewotICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJkaWRSZWNlaXZlUmVzcG9uc2U6IG5v dCBjb250aW51aW5nIGxvYWQgYmVjYXVzZSB0aGUgY29udGVudCBpcyBhbHJlYWR5IGNhY2hlZCAo d2ViUGFnZUlEPSUiIFBSSXU2NCAiLCBmcmFtZUlEPSUiIFBSSXU2NCAiLCByZXNvdXJjZUlEPSUi IFBSSXU2NCAiKSIsIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLnBhZ2VJRC50b1VJbnQ2NCgpLCBtX3Ry YWNraW5nUGFyYW1ldGVycy5mcmFtZUlELnRvVUludDY0KCksIG1fdHJhY2tpbmdQYXJhbWV0ZXJz LnJlc291cmNlSUQpOworICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJkaWRSZWNlaXZl UmVzcG9uc2U6IG5vdCBjb250aW51aW5nIGxvYWQgYmVjYXVzZSB0aGUgY29udGVudCBpcyBhbHJl YWR5IGNhY2hlZCIpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC0xNDgsNyArMTQ4LDcg QEAgdm9pZCBXZWJSZXNvdXJjZUxvYWRlcjo6ZGlkUmVjZWl2ZVJlc3BvbnNlKGNvbnN0IFJlc291 cmNlUmVzcG9uc2UmIHJlc3BvbnNlLCBib28KICAgICAgICAgICAgIGlmIChtX2NvcmVMb2FkZXIg JiYgbV9jb3JlTG9hZGVyLT5pZGVudGlmaWVyKCkpCiAgICAgICAgICAgICAgICAgc2VuZChNZXNz YWdlczo6TmV0d29ya1Jlc291cmNlTG9hZGVyOjpDb250aW51ZURpZFJlY2VpdmVSZXNwb25zZSgp KTsKICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExP V0VEKCJkaWRSZWNlaXZlUmVzcG9uc2U6IG5vdCBjb250aW51aW5nIGxvYWQgYmVjYXVzZSBubyBj b3JlTG9hZGVyIG9yIG5vIElEICh3ZWJQYWdlSUQ9JSIgUFJJdTY0ICIsIGZyYW1lSUQ9JSIgUFJJ dTY0ICIsIHJlc291cmNlSUQ9JSIgUFJJdTY0ICIpIiwgbV90cmFja2luZ1BhcmFtZXRlcnMucGFn ZUlELnRvVUludDY0KCksIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLmZyYW1lSUQudG9VSW50NjQoKSwg bV90cmFja2luZ1BhcmFtZXRlcnMucmVzb3VyY2VJRCk7CisgICAgICAgICAgICAgICAgUkVMRUFT RV9MT0dfSUZfQUxMT1dFRCgiZGlkUmVjZWl2ZVJlc3BvbnNlOiBub3QgY29udGludWluZyBsb2Fk IGJlY2F1c2Ugbm8gY29yZUxvYWRlciBvciBubyBJRCIpOwogICAgICAgICB9OwogICAgIH0KIApA QCAtMTU3LDcgKzE1Nyw3IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkZXI6OmRpZFJlY2VpdmVSZXNw b25zZShjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSwgYm9vCiAgICAgICAgIG1faW50 ZXJjZXB0Q29udHJvbGxlci5iZWdpbkludGVyY2VwdGluZ1Jlc3BvbnNlKGludGVyY2VwdGVkUmVx dWVzdElkZW50aWZpZXIpOwogICAgICAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25XZWJLaXQ6 OmludGVyY2VwdFJlc3BvbnNlKG1fY29yZUxvYWRlci0+ZnJhbWUoKSwgcmVzcG9uc2UsIGludGVy Y2VwdGVkUmVxdWVzdElkZW50aWZpZXIsIFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigq dGhpcyksIGludGVyY2VwdGVkUmVxdWVzdElkZW50aWZpZXIsIHBvbGljeURlY2lzaW9uQ29tcGxl dGlvbkhhbmRsZXIgPSBXVEZNb3ZlKHBvbGljeURlY2lzaW9uQ29tcGxldGlvbkhhbmRsZXIpXShj b25zdCBSZXNvdXJjZVJlc3BvbnNlJiBpbnNwZWN0b3JSZXNwb25zZSwgUmVmUHRyPFNoYXJlZEJ1 ZmZlcj4gb3ZlcnJpZGVEYXRhKSBtdXRhYmxlIHsKICAgICAgICAgICAgIGlmICghbV9jb3JlTG9h ZGVyIHx8ICFtX2NvcmVMb2FkZXItPmlkZW50aWZpZXIoKSkgewotICAgICAgICAgICAgICAgIFJF TEVBU0VfTE9HX0lGX0FMTE9XRUQoImRpZFJlY2VpdmVSZXNwb25zZTogbm90IGNvbnRpbnVpbmcg aW50ZXJjZXB0IGxvYWQgYmVjYXVzZSBubyBjb3JlTG9hZGVyIG9yIG5vIElEICh3ZWJQYWdlSUQ9 JSIgUFJJdTY0ICIsIGZyYW1lSUQ9JSIgUFJJdTY0ICIsIHJlc291cmNlSUQ9JSIgUFJJdTY0ICIp IiwgbV90cmFja2luZ1BhcmFtZXRlcnMucGFnZUlELnRvVUludDY0KCksIG1fdHJhY2tpbmdQYXJh bWV0ZXJzLmZyYW1lSUQudG9VSW50NjQoKSwgbV90cmFja2luZ1BhcmFtZXRlcnMucmVzb3VyY2VJ RCk7CisgICAgICAgICAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiZGlkUmVjZWl2ZVJl c3BvbnNlOiBub3QgY29udGludWluZyBpbnRlcmNlcHQgbG9hZCBiZWNhdXNlIG5vIGNvcmVMb2Fk ZXIgb3Igbm8gSUQiKTsKICAgICAgICAgICAgICAgICBtX2ludGVyY2VwdENvbnRyb2xsZXIuY29u dGludWVSZXNwb25zZShpbnRlcmNlcHRlZFJlcXVlc3RJZGVudGlmaWVyKTsKICAgICAgICAgICAg ICAgICByZXR1cm47CiAgICAgICAgICAgICB9CkBAIC0yMDUsNyArMjA1LDcgQEAgdm9pZCBXZWJS ZXNvdXJjZUxvYWRlcjo6ZGlkUmVjZWl2ZURhdGEoY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiBk YXRhLCBpbnQ2NF90IGUKICAgICB9CiAKICAgICBpZiAoIW1fbnVtQnl0ZXNSZWNlaXZlZCkgewot ICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJkaWRSZWNlaXZlRGF0YTogU3RhcnRlZCBy ZWNlaXZpbmcgZGF0YSAod2ViUGFnZUlEPSUiIFBSSXU2NCAiLCBmcmFtZUlEPSUiIFBSSXU2NCAi LCByZXNvdXJjZUlEPSUiIFBSSXU2NCAiKSIsIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLnBhZ2VJRC50 b1VJbnQ2NCgpLCBtX3RyYWNraW5nUGFyYW1ldGVycy5mcmFtZUlELnRvVUludDY0KCksIG1fdHJh Y2tpbmdQYXJhbWV0ZXJzLnJlc291cmNlSUQpOworICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExP V0VEKCJkaWRSZWNlaXZlRGF0YTogU3RhcnRlZCByZWNlaXZpbmcgZGF0YSIpOwogICAgIH0KICAg ICBtX251bUJ5dGVzUmVjZWl2ZWQgKz0gZGF0YS5zaXplKCk7CiAKQEAgLTIxNSw3ICsyMTUsNyBA QCB2b2lkIFdlYlJlc291cmNlTG9hZGVyOjpkaWRSZWNlaXZlRGF0YShjb25zdCBJUEM6OkRhdGFS ZWZlcmVuY2UmIGRhdGEsIGludDY0X3QgZQogdm9pZCBXZWJSZXNvdXJjZUxvYWRlcjo6ZGlkRmlu aXNoUmVzb3VyY2VMb2FkKGNvbnN0IE5ldHdvcmtMb2FkTWV0cmljcyYgbmV0d29ya0xvYWRNZXRy aWNzKQogewogICAgIExPRyhOZXR3b3JrLCAiKFdlYlByb2Nlc3MpIFdlYlJlc291cmNlTG9hZGVy OjpkaWRGaW5pc2hSZXNvdXJjZUxvYWQgZm9yICclcyciLCBtX2NvcmVMb2FkZXItPnVybCgpLnN0 cmluZygpLmxhdGluMSgpLmRhdGEoKSk7Ci0gICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiZGlk RmluaXNoUmVzb3VyY2VMb2FkOiAod2ViUGFnZUlEPSUiIFBSSXU2NCAiLCBmcmFtZUlEPSUiIFBS SXU2NCAiLCByZXNvdXJjZUlEPSUiIFBSSXU2NCAiLCBsZW5ndGg9JXpkKSIsIG1fdHJhY2tpbmdQ YXJhbWV0ZXJzLnBhZ2VJRC50b1VJbnQ2NCgpLCBtX3RyYWNraW5nUGFyYW1ldGVycy5mcmFtZUlE LnRvVUludDY0KCksIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLnJlc291cmNlSUQsIG1fbnVtQnl0ZXNS ZWNlaXZlZCk7CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiZGlkRmluaXNoUmVzb3VyY2VM b2FkOiAobGVuZ3RoPSV6ZCkiLCBtX251bUJ5dGVzUmVjZWl2ZWQpOwogCiAgICAgaWYgKFVOTElL RUxZKG1faW50ZXJjZXB0Q29udHJvbGxlci5pc0ludGVyY2VwdGluZyhtX2NvcmVMb2FkZXItPmlk ZW50aWZpZXIoKSkpKSB7CiAgICAgICAgIG1faW50ZXJjZXB0Q29udHJvbGxlci5kZWZlcihtX2Nv cmVMb2FkZXItPmlkZW50aWZpZXIoKSwgW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0 aGlzKSwgbmV0d29ya0xvYWRNZXRyaWNzXSgpIG11dGFibGUgewpAQCAtMjQ0LDcgKzI0NCw3IEBA IHZvaWQgV2ViUmVzb3VyY2VMb2FkZXI6OmRpZEZhaWxTZXJ2aWNlV29ya2VyTG9hZChjb25zdCBS ZXNvdXJjZUVycm9yJiBlcnJvcikKIHZvaWQgV2ViUmVzb3VyY2VMb2FkZXI6OnNlcnZpY2VXb3Jr ZXJEaWROb3RIYW5kbGUoKQogewogI2lmIEVOQUJMRShTRVJWSUNFX1dPUktFUikKLSAgICBSRUxF QVNFX0xPR19JRl9BTExPV0VEKCJzZXJ2aWNlV29ya2VyRGlkTm90SGFuZGxlOiAod2ViUGFnZUlE PSUiIFBSSXU2NCAiLCBmcmFtZUlEPSUiIFBSSXU2NCAiLCByZXNvdXJjZUlEPSUiIFBSSXU2NCAi KSIsIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLnBhZ2VJRC50b1VJbnQ2NCgpLCBtX3RyYWNraW5nUGFy YW1ldGVycy5mcmFtZUlELnRvVUludDY0KCksIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLnJlc291cmNl SUQpOworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoInNlcnZpY2VXb3JrZXJEaWROb3RIYW5k bGU6Iik7CiAKICAgICBBU1NFUlQobV9jb3JlTG9hZGVyLT5vcHRpb25zKCkuc2VydmljZVdvcmtl cnNNb2RlID09IFNlcnZpY2VXb3JrZXJzTW9kZTo6T25seSk7CiAgICAgYXV0byBlcnJvciA9IGlu dGVybmFsRXJyb3IobV9jb3JlTG9hZGVyLT5yZXF1ZXN0KCkudXJsKCkpOwpAQCAtMjU4LDcgKzI1 OCw3IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkZXI6OnNlcnZpY2VXb3JrZXJEaWROb3RIYW5kbGUo KQogdm9pZCBXZWJSZXNvdXJjZUxvYWRlcjo6ZGlkRmFpbFJlc291cmNlTG9hZChjb25zdCBSZXNv dXJjZUVycm9yJiBlcnJvcikKIHsKICAgICBMT0coTmV0d29yaywgIihXZWJQcm9jZXNzKSBXZWJS ZXNvdXJjZUxvYWRlcjo6ZGlkRmFpbFJlc291cmNlTG9hZCBmb3IgJyVzJyIsIG1fY29yZUxvYWRl ci0+dXJsKCkuc3RyaW5nKCkubGF0aW4xKCkuZGF0YSgpKTsKLSAgICBSRUxFQVNFX0xPR19JRl9B TExPV0VEKCJkaWRGYWlsUmVzb3VyY2VMb2FkOiAod2ViUGFnZUlEPSUiIFBSSXU2NCAiLCBmcmFt ZUlEPSUiIFBSSXU2NCAiLCByZXNvdXJjZUlEPSUiIFBSSXU2NCAiKSIsIG1fdHJhY2tpbmdQYXJh bWV0ZXJzLnBhZ2VJRC50b1VJbnQ2NCgpLCBtX3RyYWNraW5nUGFyYW1ldGVycy5mcmFtZUlELnRv VUludDY0KCksIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLnJlc291cmNlSUQpOworICAgIFJFTEVBU0Vf TE9HX0lGX0FMTE9XRUQoImRpZEZhaWxSZXNvdXJjZUxvYWQ6Iik7CiAKICAgICBpZiAoVU5MSUtF TFkobV9pbnRlcmNlcHRDb250cm9sbGVyLmlzSW50ZXJjZXB0aW5nKG1fY29yZUxvYWRlci0+aWRl bnRpZmllcigpKSkpIHsKICAgICAgICAgbV9pbnRlcmNlcHRDb250cm9sbGVyLmRlZmVyKG1fY29y ZUxvYWRlci0+aWRlbnRpZmllcigpLCBbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRo aXMpLCBlcnJvcl0oKSBtdXRhYmxlIHsKQEAgLTI3OCw3ICsyNzgsNyBAQCB2b2lkIFdlYlJlc291 cmNlTG9hZGVyOjpkaWRGYWlsUmVzb3VyY2VMb2FkKGNvbnN0IFJlc291cmNlRXJyb3ImIGVycm9y KQogdm9pZCBXZWJSZXNvdXJjZUxvYWRlcjo6ZGlkQmxvY2tBdXRoZW50aWNhdGlvbkNoYWxsZW5n ZSgpCiB7CiAgICAgTE9HKE5ldHdvcmssICIoV2ViUHJvY2VzcykgV2ViUmVzb3VyY2VMb2FkZXI6 OmRpZEJsb2NrQXV0aGVudGljYXRpb25DaGFsbGVuZ2UgZm9yICclcyciLCBtX2NvcmVMb2FkZXIt PnVybCgpLnN0cmluZygpLmxhdGluMSgpLmRhdGEoKSk7Ci0gICAgUkVMRUFTRV9MT0dfSUZfQUxM T1dFRCgiZGlkQmxvY2tBdXRoZW50aWNhdGlvbkNoYWxsZW5nZTogKHdlYlBhZ2VJRD0lIiBQUkl1 NjQgIiwgZnJhbWVJRD0lIiBQUkl1NjQgIiwgcmVzb3VyY2VJRD0lIiBQUkl1NjQgIikiLCBtX3Ry YWNraW5nUGFyYW1ldGVycy5wYWdlSUQudG9VSW50NjQoKSwgbV90cmFja2luZ1BhcmFtZXRlcnMu ZnJhbWVJRC50b1VJbnQ2NCgpLCBtX3RyYWNraW5nUGFyYW1ldGVycy5yZXNvdXJjZUlEKTsKKyAg ICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJkaWRCbG9ja0F1dGhlbnRpY2F0aW9uQ2hhbGxlbmdl OiIpOwogCiAgICAgbV9jb3JlTG9hZGVyLT5kaWRCbG9ja0F1dGhlbnRpY2F0aW9uQ2hhbGxlbmdl KCk7CiB9CkBAIC0yODYsNyArMjg2LDcgQEAgdm9pZCBXZWJSZXNvdXJjZUxvYWRlcjo6ZGlkQmxv Y2tBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSgpCiB2b2lkIFdlYlJlc291cmNlTG9hZGVyOjpzdG9w TG9hZGluZ0FmdGVyWEZyYW1lT3B0aW9uc09yQ29udGVudFNlY3VyaXR5UG9saWN5RGVuaWVkKGNv bnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlKQogewogICAgIExPRyhOZXR3b3JrLCAiKFdl YlByb2Nlc3MpIFdlYlJlc291cmNlTG9hZGVyOjpzdG9wTG9hZGluZ0FmdGVyWEZyYW1lT3B0aW9u c09yQ29udGVudFNlY3VyaXR5UG9saWN5RGVuaWVkIGZvciAnJXMnIiwgbV9jb3JlTG9hZGVyLT51 cmwoKS5zdHJpbmcoKS5sYXRpbjEoKS5kYXRhKCkpOwotICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9X RUQoInN0b3BMb2FkaW5nQWZ0ZXJYRnJhbWVPcHRpb25zT3JDb250ZW50U2VjdXJpdHlQb2xpY3lE ZW5pZWQ6ICh3ZWJQYWdlSUQ9JSIgUFJJdTY0ICIsIGZyYW1lSUQ9JSIgUFJJdTY0ICIsIHJlc291 cmNlSUQ9JSIgUFJJdTY0ICIpIiwgbV90cmFja2luZ1BhcmFtZXRlcnMucGFnZUlELnRvVUludDY0 KCksIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLmZyYW1lSUQudG9VSW50NjQoKSwgbV90cmFja2luZ1Bh cmFtZXRlcnMucmVzb3VyY2VJRCk7CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgic3RvcExv YWRpbmdBZnRlclhGcmFtZU9wdGlvbnNPckNvbnRlbnRTZWN1cml0eVBvbGljeURlbmllZDoiKTsK IAogICAgIG1fY29yZUxvYWRlci0+ZG9jdW1lbnRMb2FkZXIoKS0+c3RvcExvYWRpbmdBZnRlclhG cmFtZU9wdGlvbnNPckNvbnRlbnRTZWN1cml0eVBvbGljeURlbmllZChtX2NvcmVMb2FkZXItPmlk ZW50aWZpZXIoKSwgcmVzcG9uc2UpOwogfQpAQCAtMjk1LDEzICsyOTUsMTMgQEAgdm9pZCBXZWJS ZXNvdXJjZUxvYWRlcjo6c3RvcExvYWRpbmdBZnRlclhGcmFtZU9wdGlvbnNPckNvbnRlbnRTZWN1 cml0eVBvbGljeURlbmkKIHZvaWQgV2ViUmVzb3VyY2VMb2FkZXI6OmRpZFJlY2VpdmVSZXNvdXJj ZShjb25zdCBTaGFyZWFibGVSZXNvdXJjZTo6SGFuZGxlJiBoYW5kbGUpCiB7CiAgICAgTE9HKE5l dHdvcmssICIoV2ViUHJvY2VzcykgV2ViUmVzb3VyY2VMb2FkZXI6OmRpZFJlY2VpdmVSZXNvdXJj ZSBmb3IgJyVzJyIsIG1fY29yZUxvYWRlci0+dXJsKCkuc3RyaW5nKCkubGF0aW4xKCkuZGF0YSgp KTsKLSAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJkaWRSZWNlaXZlUmVzb3VyY2U6ICh3ZWJQ YWdlSUQ9JSIgUFJJdTY0ICIsIGZyYW1lSUQ9JSIgUFJJdTY0ICIsIHJlc291cmNlSUQ9JSIgUFJJ dTY0ICIpIiwgbV90cmFja2luZ1BhcmFtZXRlcnMucGFnZUlELnRvVUludDY0KCksIG1fdHJhY2tp bmdQYXJhbWV0ZXJzLmZyYW1lSUQudG9VSW50NjQoKSwgbV90cmFja2luZ1BhcmFtZXRlcnMucmVz b3VyY2VJRCk7CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiZGlkUmVjZWl2ZVJlc291cmNl OiIpOwogCiAgICAgUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gYnVmZmVyID0gaGFuZGxlLnRyeVdyYXBJ blNoYXJlZEJ1ZmZlcigpOwogCiAgICAgaWYgKCFidWZmZXIpIHsKICAgICAgICAgTE9HX0VSUk9S KCJVbmFibGUgdG8gY3JlYXRlIGJ1ZmZlciBmcm9tIFNoYXJlYWJsZVJlc291cmNlIHNlbnQgZnJv bSB0aGUgbmV0d29yayBwcm9jZXNzLiIpOwotICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VE KCJkaWRSZWNlaXZlUmVzb3VyY2U6IFVuYWJsZSB0byBjcmVhdGUgU2hhcmVkQnVmZmVyICh3ZWJQ YWdlSUQ9JSIgUFJJdTY0ICIsIGZyYW1lSUQ9JSIgUFJJdTY0ICIsIHJlc291cmNlSUQ9JSIgUFJJ dTY0ICIpIiwgbV90cmFja2luZ1BhcmFtZXRlcnMucGFnZUlELnRvVUludDY0KCksIG1fdHJhY2tp bmdQYXJhbWV0ZXJzLmZyYW1lSUQudG9VSW50NjQoKSwgbV90cmFja2luZ1BhcmFtZXRlcnMucmVz b3VyY2VJRCk7CisgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoImRpZFJlY2VpdmVSZXNv dXJjZTogVW5hYmxlIHRvIGNyZWF0ZSBTaGFyZWRCdWZmZXIiKTsKICAgICAgICAgaWYgKGF1dG8q IGZyYW1lID0gbV9jb3JlTG9hZGVyLT5mcmFtZSgpKSB7CiAgICAgICAgICAgICBpZiAoYXV0byog cGFnZSA9IGZyYW1lLT5wYWdlKCkpCiAgICAgICAgICAgICAgICAgcGFnZS0+ZGlhZ25vc3RpY0xv Z2dpbmdDbGllbnQoKS5sb2dEaWFnbm9zdGljTWVzc2FnZShXZWJDb3JlOjpEaWFnbm9zdGljTG9n Z2luZ0tleXM6OmludGVybmFsRXJyb3JLZXkoKSwgV2ViQ29yZTo6RGlhZ25vc3RpY0xvZ2dpbmdL ZXlzOjpjcmVhdGVTaGFyZWRCdWZmZXJGYWlsZWRLZXkoKSwgV2ViQ29yZTo6U2hvdWxkU2FtcGxl OjpObyk7Cg==