161422 2016-08-30 20:56:03 -0700 Web Inspector: XHR with text but responseType = "blob" shows blank content 2016-08-31 15:18:34 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck bburg joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1224849 0 joepeck 2016-08-30 20:56:03 -0700 Summary: XHR with text but responseType = "blob" shows blank content Test: <script> let xhr = new XMLHttpRequest; xhr.open("GET", "data.json", true); xhr.responseType = "blob"; xhr.send(); </script> Steps to Reproduce: 1. Inspect test 2. Reload 3. Select data.json resource => Content is blank, expected json content Notes: - XMLHttpRequest::didFinishLoad sets the content for the inspector, but it can set blank content if the XHR was loading binary data 1224850 1 joepeck 2016-08-30 20:56:14 -0700 <rdar://problem/28066869> 1224851 2 287478 joepeck 2016-08-30 21:03:21 -0700 Created attachment 287478 [PATCH] Proposed Fix We should really clean up our XHR <-> Inspector code. We may want to start sharing some of it with Fetch. 1225030 3 287478 bburg 2016-08-31 12:32:15 -0700 Comment on attachment 287478 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=287478&action=review r=me So the bug is that we try to send gibberish decoded text instead of letting the inspector autodetect it or what? The changelog didn't really explain why this fix makes the frontend do anything different. > LayoutTests/inspector/network/xhr-json-blob-has-content.html:33 > + resource.singleFireEventListener(WebInspector.Resource.Event.LoadingDidFinish, (event) => { The nesting here is getting excessive for my taste. I filed https://bugs.webkit.org/show_bug.cgi?id=161451 which could help. > LayoutTests/inspector/network/xhr-json-blob-has-content.html:37 > + resolve(); I think it would be cleaner to remove this resolve(), then have .then(resolve, reject) or .then(resolve).catch(reject) at the end > LayoutTests/inspector/network/xhr-json-blob-has-content.html:57 > + resolve(); > + }, reject); Ditto 1225054 4 joepeck 2016-08-31 13:08:12 -0700 (In reply to comment #3) > Comment on attachment 287478 [details] > [PATCH] Proposed Fix > > View in context: > https://bugs.webkit.org/attachment.cgi?id=287478&action=review > > r=me > > So the bug is that we try to send gibberish decoded text instead of letting > the inspector autodetect it or what? The changelog didn't really explain why > this fix makes the frontend do anything different. Somehow this got lost in my ChangeLog. Previously we were overwriting the content with an empty string. Now we don't. 1225117 5 joepeck 2016-08-31 15:18:34 -0700 <https://trac.webkit.org/changeset/205268> 287478 2016-08-30 21:03:21 -0700 2016-08-31 15:17:51 -0700 [PATCH] Proposed Fix xhr-1.patch text/plain 14687 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBhNjEwZTkyLi5lZGM3MTdmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTYtMDgt MzAgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIg SW5zcGVjdG9yOiBYSFIgd2l0aCB0ZXh0IGJ1dCByZXNwb25zZVR5cGUgPSAiYmxvYiIgc2hvd3Mg YmxhbmsgY29udGVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTYxNDIyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yODA2Njg2OT4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9uZXR3 b3JrL3Jlc291cmNlcy9kYXRhLmpzb246IEFkZGVkLgorICAgICAgICAqIGluc3BlY3Rvci9uZXR3 b3JrL3hoci1qc29uLWJsb2ItaGFzLWNvbnRlbnQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAg ICAgKiBpbnNwZWN0b3IvbmV0d29yay94aHItanNvbi1ibG9iLWhhcy1jb250ZW50Lmh0bWw6IEFk ZGVkLgorCiAyMDE2LTA4LTI5ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAg ICAgICAgUmVncmVzc2lvbihyMjA0OTIzKTogSXQgc2hvdWxkIGJlIHBvc3NpYmxlIHRvIHNldCAn TG9jYXRpb24uaHJlZicgY3Jvc3Mgb3JpZ2luCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvbmV0d29yay9yZXNvdXJjZXMvZGF0YS5qc29uIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L25ldHdvcmsvcmVzb3VyY2VzL2RhdGEuanNvbgpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwLi5hODk0MzhlCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L25ldHdvcmsvcmVzb3VyY2VzL2RhdGEuanNvbgpAQCAtMCwwICsxIEBACit7ImFscGhhIjoiYmV0 YSIsImdhbW1hIjoxMjM0NX0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9uZXR3 b3JrL3hoci1qc29uLWJsb2ItaGFzLWNvbnRlbnQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL25ldHdvcmsveGhyLWpzb24tYmxvYi1oYXMtY29udGVudC1leHBlY3RlZC50eHQK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYTE2Y2JmNwotLS0gL2Rldi9udWxs CisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9uZXR3b3JrL3hoci1qc29uLWJsb2ItaGFzLWNv bnRlbnQtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMTQgQEAKK1Rlc3RzIHRoYXQgYW4gWE1MSHR0 cFJlcXVlc3QgcmVzb3VyY2UgZ2l2ZXMgdXMgSlNPTiB0ZXh0IGV2ZW4gaWYgaXQgaXMgbWFya2Vk IGFzIGhhdmluZyBibG9iIGNvbnRlbnQuCisKKworPT0gUnVubmluZyB0ZXN0IHN1aXRlOiBYSFIu QmxvYgorLS0gUnVubmluZyB0ZXN0IGNhc2U6IFhIUi5KU09OQ29udGVudAorUEFTUzogUmVzb3Vy Y2Ugc2hvdWxkIGJlIGNyZWF0ZWQuCitQQVNTOiBSZXNvdXJjZSBzaG91bGQgY29tcGxldGUgbG9h ZGluZy4KK1BBU1M6IFJlc291cmNlIGhhcyBleHBlY3RlZCBjb250ZW50LgorCistLSBSdW5uaW5n IHRlc3QgY2FzZTogWEhSLkpTT05Db250ZW50LkJsb2IKK1BBU1M6IFJlc291cmNlIHNob3VsZCBi ZSBjcmVhdGVkLgorUEFTUzogUmVzb3VyY2Ugc2hvdWxkIGNvbXBsZXRlIGxvYWRpbmcuCitQQVNT OiBSZXNvdXJjZSBoYXMgZXhwZWN0ZWQgY29udGVudC4KKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL25ldHdvcmsveGhyLWpzb24tYmxvYi1oYXMtY29udGVudC5odG1sIGIvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL25ldHdvcmsveGhyLWpzb24tYmxvYi1oYXMtY29udGVudC5odG1s Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjc5ZjU1ZjIKLS0tIC9kZXYvbnVs bAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvbmV0d29yay94aHItanNvbi1ibG9iLWhhcy1j b250ZW50Lmh0bWwKQEAgLTAsMCArMSw3MCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxo ZWFkPgorPHNjcmlwdCBzcmM9Ii4uLy4uL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291cmNlcy9p bnNwZWN0b3ItdGVzdC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0PgorZnVuY3Rpb24gY3JlYXRlSlNP TlhIUigpIHsKKyAgICBsZXQgeGhyID0gbmV3IFhNTEh0dHBSZXF1ZXN0OworICAgIHhoci5vcGVu KCJHRVQiLCAicmVzb3VyY2VzL2RhdGEuanNvbj8iICsgTWF0aC5yYW5kb20oKSwgdHJ1ZSk7Cisg ICAgeGhyLnNlbmQoKTsKK30KKworZnVuY3Rpb24gY3JlYXRlSlNPTkJsb2JYSFIoKSB7CisgICAg bGV0IHhociA9IG5ldyBYTUxIdHRwUmVxdWVzdDsKKyAgICB4aHIub3BlbigiR0VUIiwgInJlc291 cmNlcy9kYXRhLmpzb24/IiArIE1hdGgucmFuZG9tKCksIHRydWUpOworICAgIHhoci5yZXNwb25z ZVR5cGUgPSAiYmxvYiI7CisgICAgeGhyLnNlbmQoKTsKK30KKworZnVuY3Rpb24gdGVzdCgpCit7 CisgICAgbGV0IHN1aXRlID0gSW5zcGVjdG9yVGVzdC5jcmVhdGVBc3luY1N1aXRlKCJYSFIuQmxv YiIpOworCisgICAgY29uc3QganNvbkNvbnRlbnQgPSBgeyJhbHBoYSI6ImJldGEiLCJnYW1tYSI6 MTIzNDV9XG5gOworCisgICAgc3VpdGUuYWRkVGVzdENhc2UoeworICAgICAgICBuYW1lOiAiWEhS LkpTT05Db250ZW50IiwKKyAgICAgICAgZGVzY3JpcHRpb246ICJFbnN1cmUgYW4gWE1MSHR0cFJl cXVlc3Qgd2l0aCBKU09OIGNvbnRlbnQgc3RpbGwgZ2l2ZXMgdXMgdGV4dC4iLAorICAgICAgICB0 ZXN0OiAocmVzb2x2ZSwgcmVqZWN0KSA9PiB7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV2 YWx1YXRlSW5QYWdlKCJjcmVhdGVKU09OWEhSKCkiKTsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rv ci5GcmFtZS5zaW5nbGVGaXJlRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRnJhbWUuRXZlbnQu UmVzb3VyY2VXYXNBZGRlZCwgKGV2ZW50KSA9PiB7CisgICAgICAgICAgICAgICAgbGV0IHJlc291 cmNlID0gZXZlbnQuZGF0YS5yZXNvdXJjZTsKKyAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0 LmV4cGVjdFRoYXQocmVzb3VyY2UgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuUmVzb3VyY2UsICJS ZXNvdXJjZSBzaG91bGQgYmUgY3JlYXRlZC4iKTsKKyAgICAgICAgICAgICAgICByZXNvdXJjZS5z aW5nbGVGaXJlRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuUmVzb3VyY2UuRXZlbnQuTG9hZGlu Z0RpZEZpbmlzaCwgKGV2ZW50KSA9PiB7CisgICAgICAgICAgICAgICAgICAgIEluc3BlY3RvclRl c3QucGFzcygiUmVzb3VyY2Ugc2hvdWxkIGNvbXBsZXRlIGxvYWRpbmcuIik7CisgICAgICAgICAg ICAgICAgICAgIHJlc291cmNlLnJlcXVlc3RDb250ZW50KCkudGhlbigoKSA9PiB7CisgICAgICAg ICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQocmVzb3VyY2UuY29udGVu dCA9PT0ganNvbkNvbnRlbnQsICJSZXNvdXJjZSBoYXMgZXhwZWN0ZWQgY29udGVudC4iKTsKKyAg ICAgICAgICAgICAgICAgICAgICAgIHJlc29sdmUoKTsKKyAgICAgICAgICAgICAgICAgICAgfSwg cmVqZWN0KTsKKyAgICAgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgIH0pOworICAgICAgICB9 CisgICAgfSk7CisKKyAgICBzdWl0ZS5hZGRUZXN0Q2FzZSh7CisgICAgICAgIG5hbWU6ICJYSFIu SlNPTkNvbnRlbnQuQmxvYiIsCisgICAgICAgIGRlc2NyaXB0aW9uOiAiRW5zdXJlIGFuIFhNTEh0 dHBSZXF1ZXN0IHdpdGggSlNPTiBjb250ZW50IGFuZCBhIHJlc3BvbnNlVHlwZSBvZiBibG9iIHN0 aWxsIGdpdmVzIHVzIHRleHQuIiwKKyAgICAgICAgdGVzdDogKHJlc29sdmUsIHJlamVjdCkgPT4g eworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5ldmFsdWF0ZUluUGFnZSgiY3JlYXRlSlNPTkJs b2JYSFIoKSIpOworICAgICAgICAgICAgV2ViSW5zcGVjdG9yLkZyYW1lLnNpbmdsZUZpcmVFdmVu dExpc3RlbmVyKFdlYkluc3BlY3Rvci5GcmFtZS5FdmVudC5SZXNvdXJjZVdhc0FkZGVkLCAoZXZl bnQpID0+IHsKKyAgICAgICAgICAgICAgICBsZXQgcmVzb3VyY2UgPSBldmVudC5kYXRhLnJlc291 cmNlOworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0VGhhdChyZXNvdXJjZSBp bnN0YW5jZW9mIFdlYkluc3BlY3Rvci5SZXNvdXJjZSwgIlJlc291cmNlIHNob3VsZCBiZSBjcmVh dGVkLiIpOworICAgICAgICAgICAgICAgIHJlc291cmNlLnNpbmdsZUZpcmVFdmVudExpc3RlbmVy KFdlYkluc3BlY3Rvci5SZXNvdXJjZS5FdmVudC5Mb2FkaW5nRGlkRmluaXNoLCAoZXZlbnQpID0+ IHsKKyAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5wYXNzKCJSZXNvdXJjZSBzaG91 bGQgY29tcGxldGUgbG9hZGluZy4iKTsKKyAgICAgICAgICAgICAgICAgICAgcmVzb3VyY2UucmVx dWVzdENvbnRlbnQoKS50aGVuKCgpID0+IHsKKyAgICAgICAgICAgICAgICAgICAgICAgIEluc3Bl Y3RvclRlc3QuZXhwZWN0VGhhdChyZXNvdXJjZS5jb250ZW50ID09PSBqc29uQ29udGVudCwgIlJl c291cmNlIGhhcyBleHBlY3RlZCBjb250ZW50LiIpOworICAgICAgICAgICAgICAgICAgICAgICAg cmVzb2x2ZSgpOworICAgICAgICAgICAgICAgICAgICB9LCByZWplY3QpOworICAgICAgICAgICAg ICAgIH0pOworICAgICAgICAgICAgfSk7CisgICAgICAgIH0KKyAgICB9KTsKKworICAgIHN1aXRl LnJ1blRlc3RDYXNlc0FuZEZpbmlzaCgpOworfQorPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBv bmxvYWQ9InJ1blRlc3QoKSI+Cis8cD5UZXN0cyB0aGF0IGFuIFhNTEh0dHBSZXF1ZXN0IHJlc291 cmNlIGdpdmVzIHVzIEpTT04gdGV4dCBldmVuIGlmIGl0IGlzIG1hcmtlZCBhcyBoYXZpbmcgYmxv YiBjb250ZW50LjwvcD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBmMjVmMzBiLi5i NDBlODE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzEgQEAKIDIwMTYtMDgtMzAgIEpvc2VwaCBQ ZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAorICAgICAgICBXZWIgSW5zcGVjdG9yOiBY SFIgd2l0aCB0ZXh0IGJ1dCByZXNwb25zZVR5cGUgPSAiYmxvYiIgc2hvd3MgYmxhbmsgY29udGVu dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYxNDIy CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yODA2Njg2OT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBpbnNwZWN0b3IvbmV0d29yay94aHIt anNvbi1ibG9iLWhhcy1jb250ZW50Lmh0bWwKKworICAgICAgICAqIHhtbC9YTUxIdHRwUmVxdWVz dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpYTUxIdHRwUmVxdWVzdDo6ZGlkRmluaXNoTG9hZGlu Zyk6CisgICAgICAgIFdoZW4gbG9hZGluZyBiaW5hcnkgY29udGVudCB3ZSBoYXZlIG5vIGRlY29k ZWQgdGV4dCB0byBzZW5kIHRvIHRoZSBpbnNwZWN0b3IuCisKKyAgICAgICAgKiBpbnNwZWN0b3Iv SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rv ckluc3RydW1lbnRhdGlvbjo6ZGlkRmluaXNoWEhSTG9hZGluZ0ltcGwpOgorICAgICAgICAqIGlu c3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaDoKKyAgICAgICAgKFdlYkNvcmU6Oklu c3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkRmluaXNoWEhSTG9hZGluZyk6CisgICAgICAgIFN3 aXRjaCB0byBhbiBPcHRpb25hbCBzdHJpbmcsIGFuZCBpZiBpdCBpcyBub3QgYXZhaWxhYmxlIGRv bid0CisgICAgICAgIGNhbGwgdGhyb3VnaCB0byB0aGUgTmV0d29ya0FnZW50IGV4cGVjdGluZyBk ZWNvZGVkIHRleHQuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yTmV0d29ya0FnZW50 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvck5ldHdvcmtBZ2VudDo6ZGlkRmluaXNo WEhSTG9hZGluZyk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvck5ldHdvcmtBZ2VudC5o OgorICAgICAgICBJbXByb3ZlIHZhcmlhYmxlIG5hbWUuCisKKzIwMTYtMDgtMzAgIEpvc2VwaCBQ ZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwogICAgICAgICBSZW1vdmUgdW51c2VkIG1l bWJlciB2YXJpYWJsZSBpbiBXZWJDb3JlOjpGaWxlCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjE0MjAKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcAppbmRleCBiOTZkZDAxLi5m ZmU1NzFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5z dHJ1bWVudGF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y SW5zdHJ1bWVudGF0aW9uLmNwcApAQCAtNjM1LDEyICs2MzUsMTQgQEAgdm9pZCBJbnNwZWN0b3JJ bnN0cnVtZW50YXRpb246OmRpZEZhaWxMb2FkaW5nSW1wbChJbnN0cnVtZW50aW5nQWdlbnRzJiBp bnN0cnVtZW4KICAgICAgICAgY29uc29sZUFnZW50LT5kaWRGYWlsTG9hZGluZyhpZGVudGlmaWVy LCBlcnJvcik7IC8vIFRoaXMgc2hvdWxkIGNvbWUgQUZURVIgcmVzb3VyY2Ugbm90aWZpY2F0aW9u LCBmcm9udC1lbmQgcmVsaWVzIG9uIHRoaXMuCiB9CiAKLXZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVu dGF0aW9uOjpkaWRGaW5pc2hYSFJMb2FkaW5nSW1wbChJbnN0cnVtZW50aW5nQWdlbnRzJiBpbnN0 cnVtZW50aW5nQWdlbnRzLCBUaHJlYWRhYmxlTG9hZGVyQ2xpZW50KiBjbGllbnQsIHVuc2lnbmVk IGxvbmcgaWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiBzb3VyY2VTdHJpbmcsIGNvbnN0IFN0cmlu ZyYgdXJsLCBjb25zdCBTdHJpbmcmIHNlbmRVUkwsIHVuc2lnbmVkIHNlbmRMaW5lTnVtYmVyLCB1 bnNpZ25lZCBzZW5kQ29sdW1uTnVtYmVyKQordm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246 OmRpZEZpbmlzaFhIUkxvYWRpbmdJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMmIGluc3RydW1lbnRp bmdBZ2VudHMsIFRocmVhZGFibGVMb2FkZXJDbGllbnQqIGNsaWVudCwgdW5zaWduZWQgbG9uZyBp ZGVudGlmaWVyLCBPcHRpb25hbDxTdHJpbmc+IGRlY29kZWRUZXh0LCBjb25zdCBTdHJpbmcmIHVy bCwgY29uc3QgU3RyaW5nJiBzZW5kVVJMLCB1bnNpZ25lZCBzZW5kTGluZU51bWJlciwgdW5zaWdu ZWQgc2VuZENvbHVtbk51bWJlcikKIHsKICAgICBpZiAoV2ViQ29uc29sZUFnZW50KiBjb25zb2xl QWdlbnQgPSBpbnN0cnVtZW50aW5nQWdlbnRzLndlYkNvbnNvbGVBZ2VudCgpKQogICAgICAgICBj b25zb2xlQWdlbnQtPmRpZEZpbmlzaFhIUkxvYWRpbmcoaWRlbnRpZmllciwgdXJsLCBzZW5kVVJM LCBzZW5kTGluZU51bWJlciwgc2VuZENvbHVtbk51bWJlcik7Ci0gICAgaWYgKEluc3BlY3Rvck5l dHdvcmtBZ2VudCogbmV0d29ya0FnZW50ID0gaW5zdHJ1bWVudGluZ0FnZW50cy5pbnNwZWN0b3JO ZXR3b3JrQWdlbnQoKSkKLSAgICAgICAgbmV0d29ya0FnZW50LT5kaWRGaW5pc2hYSFJMb2FkaW5n KGNsaWVudCwgaWRlbnRpZmllciwgc291cmNlU3RyaW5nKTsKKyAgICBpZiAoSW5zcGVjdG9yTmV0 d29ya0FnZW50KiBuZXR3b3JrQWdlbnQgPSBpbnN0cnVtZW50aW5nQWdlbnRzLmluc3BlY3Rvck5l dHdvcmtBZ2VudCgpKSB7CisgICAgICAgIGlmIChkZWNvZGVkVGV4dCkKKyAgICAgICAgICAgIG5l dHdvcmtBZ2VudC0+ZGlkRmluaXNoWEhSTG9hZGluZyhjbGllbnQsIGlkZW50aWZpZXIsICpkZWNv ZGVkVGV4dCk7CisgICAgfQogfQogCiB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlk UmVjZWl2ZVhIUlJlc3BvbnNlSW1wbChJbnN0cnVtZW50aW5nQWdlbnRzJiBpbnN0cnVtZW50aW5n QWdlbnRzLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmggYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmgKaW5kZXggOWQ3NjYwNS4uMWEw OWM4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3Ry dW1lbnRhdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0 cnVtZW50YXRpb24uaApAQCAtMTc2LDcgKzE3Niw3IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgdm9p ZCBkaWRSZWNlaXZlRGF0YShGcmFtZSosIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3Qg Y2hhciogZGF0YSwgaW50IGRhdGFMZW5ndGgsIGludCBlbmNvZGVkRGF0YUxlbmd0aCk7CiAgICAg c3RhdGljIHZvaWQgZGlkRmluaXNoTG9hZGluZyhGcmFtZSosIERvY3VtZW50TG9hZGVyKiwgdW5z aWduZWQgbG9uZyBpZGVudGlmaWVyLCBkb3VibGUgZmluaXNoVGltZSk7CiAgICAgc3RhdGljIHZv aWQgZGlkRmFpbExvYWRpbmcoRnJhbWUqLCBEb2N1bWVudExvYWRlciosIHVuc2lnbmVkIGxvbmcg aWRlbnRpZmllciwgY29uc3QgUmVzb3VyY2VFcnJvciYpOwotICAgIHN0YXRpYyB2b2lkIGRpZEZp bmlzaFhIUkxvYWRpbmcoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIFRocmVhZGFibGVMb2FkZXJD bGllbnQqLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYgc291cmNlU3Ry aW5nLCBjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiBzZW5kVVJMLCB1bnNpZ25lZCBz ZW5kTGluZU51bWJlciwgdW5zaWduZWQgc2VuZENvbHVtbk51bWJlcik7CisgICAgc3RhdGljIHZv aWQgZGlkRmluaXNoWEhSTG9hZGluZyhTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgVGhyZWFkYWJs ZUxvYWRlckNsaWVudCosIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgT3B0aW9uYWw8U3RyaW5n PiBkZWNvZGVkVGV4dCwgY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgc2VuZFVSTCwg dW5zaWduZWQgc2VuZExpbmVOdW1iZXIsIHVuc2lnbmVkIHNlbmRDb2x1bW5OdW1iZXIpOwogICAg IHN0YXRpYyB2b2lkIGRpZFJlY2VpdmVYSFJSZXNwb25zZShTY3JpcHRFeGVjdXRpb25Db250ZXh0 KiwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyKTsKICAgICBzdGF0aWMgdm9pZCB3aWxsTG9hZFhI UlN5bmNocm9ub3VzbHkoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCopOwogICAgIHN0YXRpYyB2b2lk IGRpZExvYWRYSFJTeW5jaHJvbm91c2x5KFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqKTsKQEAgLTM0 OCw3ICszNDgsNyBAQCBwcml2YXRlOgogICAgIHN0YXRpYyB2b2lkIGRpZEZhaWxMb2FkaW5nSW1w bChJbnN0cnVtZW50aW5nQWdlbnRzJiwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBEb2N1bWVu dExvYWRlciosIGNvbnN0IFJlc291cmNlRXJyb3ImKTsKICAgICBzdGF0aWMgdm9pZCB3aWxsTG9h ZFhIUkltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyYsIFRocmVhZGFibGVMb2FkZXJDbGllbnQqLCBj b25zdCBTdHJpbmcmLCBjb25zdCBVUkwmLCBib29sLCBSZWZQdHI8Rm9ybURhdGE+JiYsIGNvbnN0 IEhUVFBIZWFkZXJNYXAmLCBib29sKTsKICAgICBzdGF0aWMgdm9pZCBkaWRGYWlsWEhSTG9hZGlu Z0ltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyYsIFRocmVhZGFibGVMb2FkZXJDbGllbnQqKTsKLSAg ICBzdGF0aWMgdm9pZCBkaWRGaW5pc2hYSFJMb2FkaW5nSW1wbChJbnN0cnVtZW50aW5nQWdlbnRz JiwgVGhyZWFkYWJsZUxvYWRlckNsaWVudCosIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29u c3QgU3RyaW5nJiBzb3VyY2VTdHJpbmcsIGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcm IHNlbmRVUkwsIHVuc2lnbmVkIHNlbmRMaW5lTnVtYmVyLCB1bnNpZ25lZCBzZW5kQ29sdW1uTnVt YmVyKTsKKyAgICBzdGF0aWMgdm9pZCBkaWRGaW5pc2hYSFJMb2FkaW5nSW1wbChJbnN0cnVtZW50 aW5nQWdlbnRzJiwgVGhyZWFkYWJsZUxvYWRlckNsaWVudCosIHVuc2lnbmVkIGxvbmcgaWRlbnRp ZmllciwgT3B0aW9uYWw8U3RyaW5nPiBkZWNvZGVkVGV4dCwgY29uc3QgU3RyaW5nJiB1cmwsIGNv bnN0IFN0cmluZyYgc2VuZFVSTCwgdW5zaWduZWQgc2VuZExpbmVOdW1iZXIsIHVuc2lnbmVkIHNl bmRDb2x1bW5OdW1iZXIpOwogICAgIHN0YXRpYyB2b2lkIGRpZFJlY2VpdmVYSFJSZXNwb25zZUlt cGwoSW5zdHJ1bWVudGluZ0FnZW50cyYsIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllcik7CiAgICAg c3RhdGljIHZvaWQgd2lsbExvYWRYSFJTeW5jaHJvbm91c2x5SW1wbChJbnN0cnVtZW50aW5nQWdl bnRzJik7CiAgICAgc3RhdGljIHZvaWQgZGlkTG9hZFhIUlN5bmNocm9ub3VzbHlJbXBsKEluc3Ry dW1lbnRpbmdBZ2VudHMmKTsKQEAgLTkxNiwxMCArOTE2LDEwIEBAIGlubGluZSB2b2lkIEluc3Bl Y3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkRmFpbExvYWRpbmcoRnJhbWUqIGZyYW1lLCBEb2N1bWVu dExvYWRlCiAgICAgICAgIGRpZEZhaWxMb2FkaW5nSW1wbCgqaW5zdHJ1bWVudGluZ0FnZW50cywg aWRlbnRpZmllciwgbG9hZGVyLCBlcnJvcik7CiB9CiAKLWlubGluZSB2b2lkIEluc3BlY3Rvcklu c3RydW1lbnRhdGlvbjo6ZGlkRmluaXNoWEhSTG9hZGluZyhTY3JpcHRFeGVjdXRpb25Db250ZXh0 KiBjb250ZXh0LCBUaHJlYWRhYmxlTG9hZGVyQ2xpZW50KiBjbGllbnQsIHVuc2lnbmVkIGxvbmcg aWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiBzb3VyY2VTdHJpbmcsIGNvbnN0IFN0cmluZyYgdXJs LCBjb25zdCBTdHJpbmcmIHNlbmRVUkwsIHVuc2lnbmVkIHNlbmRMaW5lTnVtYmVyLCB1bnNpZ25l ZCBzZW5kQ29sdW1uTnVtYmVyKQoraW5saW5lIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9u OjpkaWRGaW5pc2hYSFJMb2FkaW5nKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQsIFRo cmVhZGFibGVMb2FkZXJDbGllbnQqIGNsaWVudCwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBP cHRpb25hbDxTdHJpbmc+IGRlY29kZWRUZXh0LCBjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3Ry aW5nJiBzZW5kVVJMLCB1bnNpZ25lZCBzZW5kTGluZU51bWJlciwgdW5zaWduZWQgc2VuZENvbHVt bk51bWJlcikKIHsKICAgICBpZiAoSW5zdHJ1bWVudGluZ0FnZW50cyogaW5zdHJ1bWVudGluZ0Fn ZW50cyA9IGluc3RydW1lbnRpbmdBZ2VudHNGb3JDb250ZXh0KGNvbnRleHQpKQotICAgICAgICBk aWRGaW5pc2hYSFJMb2FkaW5nSW1wbCgqaW5zdHJ1bWVudGluZ0FnZW50cywgY2xpZW50LCBpZGVu dGlmaWVyLCBzb3VyY2VTdHJpbmcsIHVybCwgc2VuZFVSTCwgc2VuZExpbmVOdW1iZXIsIHNlbmRD b2x1bW5OdW1iZXIpOworICAgICAgICBkaWRGaW5pc2hYSFJMb2FkaW5nSW1wbCgqaW5zdHJ1bWVu dGluZ0FnZW50cywgY2xpZW50LCBpZGVudGlmaWVyLCBkZWNvZGVkVGV4dCwgdXJsLCBzZW5kVVJM LCBzZW5kTGluZU51bWJlciwgc2VuZENvbHVtbk51bWJlcik7CiB9CiAKIGlubGluZSB2b2lkIElu c3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkUmVjZWl2ZVhIUlJlc3BvbnNlKFNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQqIGNvbnRleHQsIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllcikKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JOZXR3b3JrQWdlbnQuY3BwIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck5ldHdvcmtBZ2VudC5jcHAKaW5kZXgg ZjA5ZjQ5Yi4uMmRiYWQ1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3Rvck5ldHdvcmtBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3Rvck5ldHdvcmtBZ2VudC5jcHAKQEAgLTQ0OCw5ICs0NDgsOSBAQCB2b2lkIEluc3BlY3Rv ck5ldHdvcmtBZ2VudDo6ZGlkUmVjZWl2ZVNjcmlwdFJlc3BvbnNlKHVuc2lnbmVkIGxvbmcgaWRl bnRpZmllcikKICAgICBtX3Jlc291cmNlc0RhdGEtPnNldFJlc291cmNlVHlwZShJZGVudGlmaWVy c0ZhY3Rvcnk6OnJlcXVlc3RJZChpZGVudGlmaWVyKSwgSW5zcGVjdG9yUGFnZUFnZW50OjpTY3Jp cHRSZXNvdXJjZSk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yTmV0d29ya0FnZW50OjpkaWRGaW5pc2hY SFJMb2FkaW5nKFRocmVhZGFibGVMb2FkZXJDbGllbnQqLCB1bnNpZ25lZCBsb25nIGlkZW50aWZp ZXIsIGNvbnN0IFN0cmluZyYgc291cmNlU3RyaW5nKQordm9pZCBJbnNwZWN0b3JOZXR3b3JrQWdl bnQ6OmRpZEZpbmlzaFhIUkxvYWRpbmcoVGhyZWFkYWJsZUxvYWRlckNsaWVudCosIHVuc2lnbmVk IGxvbmcgaWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiBkZWNvZGVkVGV4dCkKIHsKLSAgICBtX3Jl c291cmNlc0RhdGEtPnNldFJlc291cmNlQ29udGVudChJZGVudGlmaWVyc0ZhY3Rvcnk6OnJlcXVl c3RJZChpZGVudGlmaWVyKSwgc291cmNlU3RyaW5nKTsKKyAgICBtX3Jlc291cmNlc0RhdGEtPnNl dFJlc291cmNlQ29udGVudChJZGVudGlmaWVyc0ZhY3Rvcnk6OnJlcXVlc3RJZChpZGVudGlmaWVy KSwgZGVjb2RlZFRleHQpOwogfQogCiB2b2lkIEluc3BlY3Rvck5ldHdvcmtBZ2VudDo6ZGlkUmVj ZWl2ZVhIUlJlc3BvbnNlKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllcikKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JOZXR3b3JrQWdlbnQuaCBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JOZXR3b3JrQWdlbnQuaAppbmRleCA1MzRjZWY3Li4y NjE2OTA4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yTmV0 d29ya0FnZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck5ldHdv cmtBZ2VudC5oCkBAIC04Miw3ICs4Miw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGRpZEZpbmlzaExv YWRpbmcodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBEb2N1bWVudExvYWRlciYsIGRvdWJsZSBm aW5pc2hUaW1lKTsKICAgICB2b2lkIGRpZEZhaWxMb2FkaW5nKHVuc2lnbmVkIGxvbmcgaWRlbnRp ZmllciwgRG9jdW1lbnRMb2FkZXImLCBjb25zdCBSZXNvdXJjZUVycm9yJik7CiAgICAgdm9pZCBk aWRMb2FkUmVzb3VyY2VGcm9tTWVtb3J5Q2FjaGUoRG9jdW1lbnRMb2FkZXImLCBDYWNoZWRSZXNv dXJjZSYpOwotICAgIHZvaWQgZGlkRmluaXNoWEhSTG9hZGluZyhUaHJlYWRhYmxlTG9hZGVyQ2xp ZW50KiwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBTdHJpbmcmIHNvdXJjZVN0cmlu Zyk7CisgICAgdm9pZCBkaWRGaW5pc2hYSFJMb2FkaW5nKFRocmVhZGFibGVMb2FkZXJDbGllbnQq LCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYgZGVjb2RlZFRleHQpOwog ICAgIHZvaWQgZGlkUmVjZWl2ZVhIUlJlc3BvbnNlKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllcik7 CiAgICAgdm9pZCB3aWxsTG9hZFhIUlN5bmNocm9ub3VzbHkoKTsKICAgICB2b2lkIGRpZExvYWRY SFJTeW5jaHJvbm91c2x5KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0 cFJlcXVlc3QuY3BwIGIvU291cmNlL1dlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0LmNwcAppbmRl eCAyNzA0MDRhLi5jMGI1YTU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0 cFJlcXVlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdC5jcHAK QEAgLTEwMDYsNyArMTAwNiwxMCBAQCB2b2lkIFhNTEh0dHBSZXF1ZXN0OjpkaWRGaW5pc2hMb2Fk aW5nKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgZG91YmxlKQogCiAgICAgbV9yZXNwb25zZUJ1 aWxkZXIuc2hyaW5rVG9GaXQoKTsKIAotICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlk RmluaXNoWEhSTG9hZGluZyhzY3JpcHRFeGVjdXRpb25Db250ZXh0KCksIHRoaXMsIGlkZW50aWZp ZXIsIG1fcmVzcG9uc2VCdWlsZGVyLnRvU3RyaW5nUHJlc2VydmVDYXBhY2l0eSgpLCBtX3VybCwg bV9sYXN0U2VuZFVSTCwgbV9sYXN0U2VuZExpbmVOdW1iZXIsIG1fbGFzdFNlbmRDb2x1bW5OdW1i ZXIpOworICAgIE9wdGlvbmFsPFN0cmluZz4gZGVjb2RlZFRleHQ7CisgICAgaWYgKCFtX2JpbmFy eVJlc3BvbnNlQnVpbGRlcikKKyAgICAgICAgZGVjb2RlZFRleHQgPSBtX3Jlc3BvbnNlQnVpbGRl ci50b1N0cmluZ1ByZXNlcnZlQ2FwYWNpdHkoKTsKKyAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRp b246OmRpZEZpbmlzaFhIUkxvYWRpbmcoc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLCB0aGlzLCBp ZGVudGlmaWVyLCBkZWNvZGVkVGV4dCwgbV91cmwsIG1fbGFzdFNlbmRVUkwsIG1fbGFzdFNlbmRM aW5lTnVtYmVyLCBtX2xhc3RTZW5kQ29sdW1uTnVtYmVyKTsKIAogICAgIGJvb2wgaGFkTG9hZGVy ID0gbV9sb2FkZXI7CiAgICAgbV9sb2FkZXIgPSBudWxscHRyOwo=