121723 2013-09-20 15:48:24 -0700 Web Inspector: Format JSON for request just like responses 2013-09-20 16:44:18 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 timothy timothy commit-queue graouts joepeck timothy webkit-bug-importer oldest_to_newest 931641 0 timothy 2013-09-20 15:48:24 -0700 <rdar://problem/15028708> When viewing a JSON response from the server it is auto-formatted with {} functionality. When sending a JSON request it is not auto formatted. The {} functionality is greyed out. Both request and response have the "Content-Type application/json;charset=UTF-8" header. Steps to Reproduce: 1. Go to the network requests in timeline. 2. Send out a JSON request with a server JSON response which bot have "Content-Type application/json;charset=UTF-8" header 3. View JSON response: Beautifully formatted. 4. View JSON request: Not formatted and no option to format it. Greyed out {} button. Expected Results: Beautifully formatted JSON request. Actual Results: Raw unformatted JSON 931642 1 212231 timothy 2013-09-20 15:54:52 -0700 Created attachment 212231 Patch 931651 2 212231 joepeck 2013-09-20 16:21:19 -0700 Comment on attachment 212231 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=212231&action=review Nice! r=me > Source/WebInspectorUI/UserInterface/Utilities.js:1146 > + if (subparts[0].toLowerCase() === "boundary") > + boundary = subparts[1]; > + else if (subparts[0].toLowerCase() === "charset") Nit: Avoid duplicate toLowerCase()? 931660 3 212231 commit-queue 2013-09-20 16:44:16 -0700 Comment on attachment 212231 Patch Clearing flags on attachment: 212231 Committed r156209: <http://trac.webkit.org/changeset/156209> 931661 4 commit-queue 2013-09-20 16:44:18 -0700 All reviewed patches have been landed. Closing bug. 212231 2013-09-20 15:54:52 -0700 2013-09-20 16:44:16 -0700 Patch bug-121723-20130920155451.patch text/plain 10851 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTU2MTk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAw MmMzZTI2NjgwMzc2M2UwYzcwODI0OWNkMGI3YmQyZDk2OTIzNzdiLi45MGUxMGE0Yjg2YWE0MjUy YWNhZDFiZWEwNGY2MTU5YTI5YTg4MWYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNCBAQAorMjAxMy0wOS0yMCAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CisKKyAgICAgICAgUGFyc2UgTUlNRS10eXBlcyBhbmQgc3RyaXAgdGhlbSBkb3duIHRvIHRo ZSBiYXNlIHR5cGUgd2hlbiBuZWVkZWQuCisKKyAgICAgICAgVGhlIHVzZSBvZiBjaGFyc2V0IGlu IGEgTUlNRS10eXBlIGludGVyZmVyZXMgd2l0aCBvdXIgdHlwZSBtYXBzLAorICAgICAgICBwcmV2 ZW50aW5nIHRoZSByaWdodCBzeW50YXggaGlnaGxpZ2h0aW5nIG1vZGUgYW5kIHByZXR0eSBwcmlu dGluZy4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTIxNzIzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBVc2VySW50ZXJmYWNlL0NvbnNvbGVQcm9tcHQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu Q29uc29sZVByb21wdCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9Gb250UmVzb3VyY2VDb250 ZW50Vmlldy5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Jlc291cmNlLmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlJlc291cmNlLlR5cGUuZnJvbU1JTUVUeXBlKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUuZ2V0IG1pbWVUeXBlQ29tcG9uZW50cyk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlLmdldCBzeW50aGV0aWNNSU1F VHlwZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlLmdldCBjb250 ZW50VVJMKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUudXBkYXRl Rm9yUmVzcG9uc2UpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvUmVzb3VyY2VEZXRhaWxzU2lk ZWJhclBhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlRGV0YWlsc1NpZGVi YXJQYW5lbC5wcm90b3R5cGUuX3JlZnJlc2hSZXF1ZXN0RGF0YVNlY3Rpb24pOgorICAgICAgICAq IFVzZXJJbnRlcmZhY2UvU291cmNlTWFwUmVzb3VyY2UuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuU291cmNlTWFwUmVzb3VyY2UucHJvdG90eXBlLnJlcXVlc3RDb250ZW50RnJvbUJhY2tlbmQp OgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvU3ludGF4SGlnaGxpZ2h0aW5nU3VwcG9ydC5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5zeW50YXhIaWdobGlnaHRTdHJpbmdBc0RvY3VtZW50RnJh Z21lbnQpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVGV4dEVkaXRvci5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yLnByb3RvdHlwZS5zZXQgbWltZVR5cGUpOgorICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvVXRpbGl0aWVzLmpzOgorICAgICAgICAocGFyc2VNSU1FVHlwZSk6 IEFkZGVkLgorCiAyMDEzLTA5LTIwICBNYXJjZWxvIE1vcmFpcyAgPG0ubW9yYWlzQHNhbXN1bmcu Y29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEZpeCBrZXlib2FyZCBzaG9ydGN1dHMgZm9y IG90aGVyIHBsYXRmb3JtcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvQ29uc29sZVByb21wdC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL0NvbnNvbGVQcm9tcHQuanMKaW5kZXggYmM3MzA5OTUzZjM1ZDM5ZGEzMjg2OGE2ZDY1 ZDhkY2ZlNDEzZWU5Zi4uNzFiMTMyNjQwMTdjMGRiOTlmNTljMzc2M2IyYzI0NmVjOGZlNDRhMiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29uc29sZVBy b21wdC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db25zb2xl UHJvbXB0LmpzCkBAIC0yNyw2ICsyNyw4IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlUHJvbXB0ID0g ZnVuY3Rpb24oZGVsZWdhdGUsIG1pbWVUeXBlLCBlbGVtZW50KQogewogICAgIFdlYkluc3BlY3Rv ci5PYmplY3QuY2FsbCh0aGlzKTsKIAorICAgIG1pbWVUeXBlID0gcGFyc2VNSU1FVHlwZShtaW1l VHlwZSkudHlwZTsKKwogICAgIHRoaXMuX2VsZW1lbnQgPSBlbGVtZW50IHx8IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoImRpdiIpOwogICAgIHRoaXMuX2VsZW1lbnQuY2xhc3NMaXN0LmFkZChXZWJJ bnNwZWN0b3IuQ29uc29sZVByb21wdC5TdHlsZUNsYXNzTmFtZSk7CiAgICAgdGhpcy5fZWxlbWVu dC5jbGFzc0xpc3QuYWRkKFdlYkluc3BlY3Rvci5TeW50YXhIaWdobGlnaHRlZFN0eWxlQ2xhc3NO YW1lKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Zv bnRSZXNvdXJjZUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvRm9udFJlc291cmNlQ29udGVudFZpZXcuanMKaW5kZXggZDQxNWFjMzUwYmU3NjgxNjVk MTAyYmYxZWY3ZmYxZGMxNGJiMjhhOS4uMWEzMjI0M2Y2NGIyNmQ3ZjYxZWRlMzgzY2JjNGY2Yzhm MDcwMzM2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Rm9udFJlc291cmNlQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvRm9udFJlc291cmNlQ29udGVudFZpZXcuanMKQEAgLTgwLDcgKzgwLDcgQEAg V2ViSW5zcGVjdG9yLkZvbnRSZXNvdXJjZUNvbnRlbnRWaWV3LnByb3RvdHlwZSA9IHsKICAgICAg ICAgdmFyIGZvcm1hdCA9ICIiOwogCiAgICAgICAgIC8vIFdlIG5lZWQgdG8gc3BlY2lmeSBhIGZv cm1hdCB3aGVuIGxvYWRpbmcgU1ZHIGZvbnRzIHRvIG1ha2UgdGhlbSB3b3JrLgotICAgICAgICBp ZiAodGhpcy5yZXNvdXJjZS5taW1lVHlwZSA9PT0gImltYWdlL3N2Zyt4bWwiKQorICAgICAgICBp ZiAodGhpcy5yZXNvdXJjZS5taW1lVHlwZUNvbXBvbmVudHMudHlwZSA9PT0gImltYWdlL3N2Zyt4 bWwiKQogICAgICAgICAgICAgZm9ybWF0ID0gIiBmb3JtYXQoXCJzdmdcIikiOwogCiAgICAgICAg IGlmICh0aGlzLl9zdHlsZUVsZW1lbnQgJiYgdGhpcy5fc3R5bGVFbGVtZW50LnBhcmVudE5vZGUp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9SZXNvdXJj ZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Jlc291cmNlLmpzCmlu ZGV4IDRiMmM1N2E1Nzg4ZjVjYTRmZTUyYTdiMjYwYjE1YTA5YzdkMjVmN2QuLmNjMDFlNTVlMjI1 ZGZiMDhkZTRhZjlkMTA1YzgzOTRkYjk2NWYxMDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Jlc291cmNlLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1Jlc291cmNlLmpzCkBAIC0xMjYsNiArMTI2LDggQEAgV2ViSW5z cGVjdG9yLlJlc291cmNlLlR5cGUuZnJvbU1JTUVUeXBlID0gZnVuY3Rpb24obWltZVR5cGUpCiAg ICAgaWYgKCFtaW1lVHlwZSkKICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5U eXBlLk90aGVyOwogCisgICAgbWltZVR5cGUgPSBwYXJzZU1JTUVUeXBlKG1pbWVUeXBlKS50eXBl OworCiAgICAgaWYgKG1pbWVUeXBlIGluIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5UeXBlLl9taW1l VHlwZU1hcCkKICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5UeXBlLl9taW1l VHlwZU1hcFttaW1lVHlwZV07CiAKQEAgLTIwOSw2ICsyMTEsMTMgQEAgV2ViSW5zcGVjdG9yLlJl c291cmNlLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHRoaXMuX21pbWVUeXBlOwogICAg IH0sCiAKKyAgICBnZXQgbWltZVR5cGVDb21wb25lbnRzKCkKKyAgICB7CisgICAgICAgIGlmICgh dGhpcy5fbWltZVR5cGVDb21wb25lbnRzKQorICAgICAgICAgICAgdGhpcy5fbWltZVR5cGVDb21w b25lbnRzID0gcGFyc2VNSU1FVHlwZSh0aGlzLl9taW1lVHlwZSk7CisgICAgICAgIHJldHVybiB0 aGlzLl9taW1lVHlwZUNvbXBvbmVudHM7CisgICAgfSwKKwogICAgIGdldCBzeW50aGV0aWNNSU1F VHlwZSgpCiAgICAgewogICAgICAgICAvLyBSZXNvdXJjZXMgYXJlIG9mdGVuIHRyYW5zZmVycmVk IHdpdGggYSBNSU1FLXR5cGUgdGhhdCBkb2Vzbid0IG1hdGNoIHRoZSBwdXJwb3NlIHRoZQpAQCAt MjQzLDcgKzI1Miw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAg ICAgIGlmIChjb250ZW50ID09PSBudWxsIHx8IGNvbnRlbnQubGVuZ3RoID4gbWF4aW11bURhdGFV UkxTaXplKQogICAgICAgICAgICAgcmV0dXJuIHRoaXMuX3VybDsKIAotICAgICAgICByZXR1cm4g ImRhdGE6IiArIHRoaXMuX21pbWVUeXBlICsgKHRoaXMuY29udGVudElzQmFzZTY0RW5jb2RlZCA/ ICI7YmFzZTY0LCIgKyBjb250ZW50IDogIiwiICsgZW5jb2RlVVJJQ29tcG9uZW50KGNvbnRlbnQp KTsKKyAgICAgICAgcmV0dXJuICJkYXRhOiIgKyB0aGlzLm1pbWVUeXBlQ29tcG9uZW50cy50eXBl ICsgKHRoaXMuY29udGVudElzQmFzZTY0RW5jb2RlZCA/ICI7YmFzZTY0LCIgKyBjb250ZW50IDog IiwiICsgZW5jb2RlVVJJQ29tcG9uZW50KGNvbnRlbnQpKTsKICAgICB9LAogCiAgICAgaXNNYWlu UmVzb3VyY2U6IGZ1bmN0aW9uKCkKQEAgLTQ5OCw4ICs1MDcsMTIgQEAgV2ViSW5zcGVjdG9yLlJl c291cmNlLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlz dGVuZXJzKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5FdmVudC5VUkxEaWRDaGFuZ2UsIHtvbGRVUkw6 IG9sZFVSTH0pOwogICAgICAgICB9CiAKLSAgICAgICAgaWYgKG9sZE1JTUVUeXBlICE9PSBtaW1l VHlwZSkKKyAgICAgICAgaWYgKG9sZE1JTUVUeXBlICE9PSBtaW1lVHlwZSkgeworICAgICAgICAg ICAgLy8gRGVsZXRlIHRoZSBNSU1FLXR5cGUgY29tcG9uZW50cyBzbyB0aGUgTUlNRS10eXBlIGlz IHJlLXBhcnNlZCB0aGUgbmV4dCB0aW1lIGl0IGlzIHJlcXVlc3RlZC4KKyAgICAgICAgICAgIGRl bGV0ZSB0aGlzLl9taW1lVHlwZUNvbXBvbmVudHM7CisKICAgICAgICAgICAgIHRoaXMuZGlzcGF0 Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5FdmVudC5NSU1FVHlwZURp ZENoYW5nZSwge29sZE1JTUVUeXBlOiBvbGRNSU1FVHlwZX0pOworICAgICAgICB9CiAKICAgICAg ICAgaWYgKG9sZFR5cGUgIT09IHR5cGUpCiAgICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRU b0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuUmVzb3VyY2UuRXZlbnQuVHlwZURpZENoYW5nZSwge29s ZFR5cGU6IG9sZFR5cGV9KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1Jlc291cmNlRGV0YWlsc1NpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Jlc291cmNlRGV0YWlsc1NpZGViYXJQYW5lbC5qcwppbmRl eCAxMzg1YjU2OWU0MTE2NjZjMmM0YTM4ZWE1NTEyMjA2MDE0M2RjOTRjLi41OGMyZDhiMDAxZmEy ZmNlOTMwY2M0NjJlODc4MmM5MWZjZTQ2MWRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9SZXNvdXJjZURldGFpbHNTaWRlYmFyUGFuZWwuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUmVzb3VyY2VEZXRhaWxzU2lkZWJh clBhbmVsLmpzCkBAIC00MjcsMjMgKzQyNywxMSBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VEZXRh aWxzU2lkZWJhclBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgLy8gTm90IHNpbXBsZSBmb3Jt IGRhdGEsIHNvIHdlIGNhbiByZWFsbHkgb25seSBzaG93IHRoZSBzaXplIGFuZCB0eXBlIGhlcmUu CiAgICAgICAgIC8vIEZJWE1FOiBBZGQgYSBnby10byBhcnJvdyBoZXJlIHRvIHNob3cgdGhlIGRh dGEgaW4gdGhlIGNvbnRlbnQgYnJvd3Nlci4KIAotICAgICAgICB2YXIgdHlwZVBhcnRzID0gcmVx dWVzdERhdGFDb250ZW50VHlwZS5zcGxpdCgvXHMqO1xzKi8pOwotICAgICAgICBjb25zb2xlLmFz c2VydCh0eXBlUGFydHMubGVuZ3RoID49IDEpOwotCi0gICAgICAgIHZhciBtaW1lVHlwZSA9IHR5 cGVQYXJ0c1swXTsKLSAgICAgICAgdmFyIGJvdW5kYXJ5ID0gbnVsbDsKLSAgICAgICAgdmFyIGVu Y29kaW5nID0gbnVsbDsKLQotICAgICAgICBmb3IgKHZhciBpID0gMTsgaSA8IHR5cGVQYXJ0cy5s ZW5ndGg7ICsraSkgewotICAgICAgICAgICAgdmFyIHN1YnBhcnRzID0gdHlwZVBhcnRzW2ldLnNw bGl0KC9ccyo9XHMqLyk7Ci0gICAgICAgICAgICBpZiAoc3VicGFydHMubGVuZ3RoICE9PSAyKQot ICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotCi0gICAgICAgICAgICBpZiAoc3VicGFydHNbMF0u dG9Mb3dlckNhc2UoKSA9PT0gImJvdW5kYXJ5IikKLSAgICAgICAgICAgICAgICBib3VuZGFyeSA9 IHN1YnBhcnRzWzFdOwotICAgICAgICAgICAgZWxzZSBpZiAoc3VicGFydHNbMF0udG9Mb3dlckNh c2UoKSA9PT0gImNoYXJzZXQiKQotICAgICAgICAgICAgICAgIGVuY29kaW5nID0gc3VicGFydHNb MV0ucmVwbGFjZSgiXlwifFwiJCIsICIiKTsgLy8gVHJpbSBxdW90ZXMuCi0gICAgICAgIH0KKyAg ICAgICAgdmFyIG1pbWVUeXBlQ29tcG9uZW50cyA9IHBhcnNlTUlNRVR5cGUocmVxdWVzdERhdGFD b250ZW50VHlwZSk7CisKKyAgICAgICAgdmFyIG1pbWVUeXBlID0gbWltZVR5cGVDb21wb25lbnRz LnR5cGU7CisgICAgICAgIHZhciBib3VuZGFyeSA9IG1pbWVUeXBlQ29tcG9uZW50cy5ib3VuZGFy eTsKKyAgICAgICAgdmFyIGVuY29kaW5nID0gbWltZVR5cGVDb21wb25lbnRzLmVuY29kaW5nOwog CiAgICAgICAgIHZhciByb3dzID0gW107CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1NvdXJjZU1hcFJlc291cmNlLmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvU291cmNlTWFwUmVzb3VyY2UuanMKaW5kZXggYWE3ZGRjYjNk NDkzNzYxYTJlOWExZTdmNGVkNzk1MThhNjQxYTUyOS4uMGZlZDAzOTNhMWQ5MzNjYmUxNTA2Nzgw MmFjNzJmOWUyMjA3MjI0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvU291cmNlTWFwUmVzb3VyY2UuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvU291cmNlTWFwUmVzb3VyY2UuanMKQEAgLTgxLDggKzgxLDEyIEBAIFdl Ykluc3BlY3Rvci5Tb3VyY2VNYXBSZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0 aGlzLl9taW1lVHlwZSA9IG1pbWVUeXBlOwogICAgICAgICAgICAgdGhpcy5fdHlwZSA9IFdlYklu c3BlY3Rvci5SZXNvdXJjZS5UeXBlLmZyb21NSU1FVHlwZSh0aGlzLl9taW1lVHlwZSk7CiAKLSAg ICAgICAgICAgIGlmIChvbGRNSU1FVHlwZSAhPT0gbWltZVR5cGUpCisgICAgICAgICAgICBpZiAo b2xkTUlNRVR5cGUgIT09IG1pbWVUeXBlKSB7CisgICAgICAgICAgICAgICAgLy8gRGVsZXRlIHRo ZSBNSU1FLXR5cGUgY29tcG9uZW50cyBzbyB0aGUgTUlNRS10eXBlIGlzIHJlLXBhcnNlZCB0aGUg bmV4dCB0aW1lIGl0IGlzIHJlcXVlc3RlZC4KKyAgICAgICAgICAgICAgICBkZWxldGUgdGhpcy5f bWltZVR5cGVDb21wb25lbnRzOworCiAgICAgICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50 VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlJlc291cmNlLkV2ZW50Lk1JTUVUeXBlRGlkQ2hhbmdl LCB7b2xkTUlNRVR5cGU6IG9sZE1JTUVUeXBlfSk7CisgICAgICAgICAgICB9CiAKICAgICAgICAg ICAgIGlmIChvbGRUeXBlICE9PSB0aGlzLl90eXBlKQogICAgICAgICAgICAgICAgIHRoaXMuZGlz cGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5FdmVudC5UeXBlRGlk Q2hhbmdlLCB7b2xkVHlwZTogb2xkVHlwZX0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvU3ludGF4SGlnaGxpZ2h0aW5nU3VwcG9ydC5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1N5bnRheEhpZ2hsaWdodGluZ1N1cHBvcnQu anMKaW5kZXggYjQ0MGQzMmZlMGUxY2VhYzFkYzdkM2Q1MTljMjcwNDNmY2E2MWZjZS4uMWU5OGUy NjkwNDFkMzJlMDUyMzc0ZTg0MzRhNDNlNDE1OWM2NWU1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvU3ludGF4SGlnaGxpZ2h0aW5nU3VwcG9ydC5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9TeW50YXhIaWdobGlnaHRp bmdTdXBwb3J0LmpzCkBAIC00Myw2ICs0Myw4IEBAIFdlYkluc3BlY3Rvci5zeW50YXhIaWdobGln aHRTdHJpbmdBc0RvY3VtZW50RnJhZ21lbnQgPSBmdW5jdGlvbihzdHJpbmcsIG1pbWVUeXBlCiAg ICAgICAgIHJlc3VsdEZyYWdtZW50LmFwcGVuZENoaWxkKHNwYW4pOwogICAgIH0KIAorICAgIG1p bWVUeXBlID0gcGFyc2VNSU1FVHlwZShtaW1lVHlwZSkudHlwZTsKKwogICAgIENvZGVNaXJyb3Iu cnVuTW9kZShzdHJpbmcsIG1pbWVUeXBlLCBhcHBlbmRUZXh0KTsKIAogICAgIHJldHVybiByZXN1 bHRGcmFnbWVudDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1RleHRFZGl0b3IuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9U ZXh0RWRpdG9yLmpzCmluZGV4IGFjZTA0YjA0M2NjOTM4YTU1ZTc0M2I0ZTg3NTU3MDM3OGFiYjAz MmUuLjgzNDBkN2I0Zjc3MTg0NDE5OTlhYTEwMGUxOWVhOWU4NGQyYzBjNTcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RleHRFZGl0b3IuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGV4dEVkaXRvci5qcwpAQCAtMjE4 LDYgKzIxOCw4IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yLnByb3RvdHlwZSA9IHsKIAogICAg IHNldCBtaW1lVHlwZShuZXdNSU1FVHlwZSkKICAgICB7CisgICAgICAgIG5ld01JTUVUeXBlID0g cGFyc2VNSU1FVHlwZShuZXdNSU1FVHlwZSkudHlwZTsKKwogICAgICAgICB0aGlzLl9taW1lVHlw ZSA9IG5ld01JTUVUeXBlOwogICAgICAgICB0aGlzLl9jb2RlTWlycm9yLnNldE9wdGlvbigibW9k ZSIsIG5ld01JTUVUeXBlKTsKICAgICB9LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVXRpbGl0aWVzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVXRpbGl0aWVzLmpzCmluZGV4IDEzZDM1NzNlZTEzYjZlNmY3YzBhNDIyMTc2 NTM5YTc1ODNiZTVmODguLjBhNjZiYTY2Mjg3MjUxNDVlZDhkZjdmOGEzNWFiMGRhMzcyNWZkMzcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1V0aWxpdGll cy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9VdGlsaXRpZXMu anMKQEAgLTExMjQsNiArMTEyNCwzMiBAQCBmdW5jdGlvbiBhYnNvbHV0ZVVSTChwYXJ0aWFsVVJM LCBiYXNlVVJMKQogICAgIHJldHVybiBiYXNlVVJMUHJlZml4ICsgcmVzb2x2ZURvdHNJblBhdGgo YmFzZVBhdGggKyBwYXJ0aWFsVVJMKTsKIH0KIAorZnVuY3Rpb24gcGFyc2VNSU1FVHlwZShmdWxs TWltZVR5cGUpCit7CisgICAgaWYgKCFmdWxsTWltZVR5cGUpCisgICAgICAgIHJldHVybiB7dHlw ZTogZnVsbE1pbWVUeXBlLCBib3VuZGFyeTogbnVsbCwgZW5jb2Rpbmc6IG51bGx9OworCisgICAg dmFyIHR5cGVQYXJ0cyA9IGZ1bGxNaW1lVHlwZS5zcGxpdCgvXHMqO1xzKi8pOworICAgIGNvbnNv bGUuYXNzZXJ0KHR5cGVQYXJ0cy5sZW5ndGggPj0gMSk7CisKKyAgICB2YXIgdHlwZSA9IHR5cGVQ YXJ0c1swXTsKKyAgICB2YXIgYm91bmRhcnkgPSBudWxsOworICAgIHZhciBlbmNvZGluZyA9IG51 bGw7CisKKyAgICBmb3IgKHZhciBpID0gMTsgaSA8IHR5cGVQYXJ0cy5sZW5ndGg7ICsraSkgewor ICAgICAgICB2YXIgc3VicGFydHMgPSB0eXBlUGFydHNbaV0uc3BsaXQoL1xzKj1ccyovKTsKKyAg ICAgICAgaWYgKHN1YnBhcnRzLmxlbmd0aCAhPT0gMikKKyAgICAgICAgICAgIGNvbnRpbnVlOwor CisgICAgICAgIGlmIChzdWJwYXJ0c1swXS50b0xvd2VyQ2FzZSgpID09PSAiYm91bmRhcnkiKQor ICAgICAgICAgICAgYm91bmRhcnkgPSBzdWJwYXJ0c1sxXTsKKyAgICAgICAgZWxzZSBpZiAoc3Vi cGFydHNbMF0udG9Mb3dlckNhc2UoKSA9PT0gImNoYXJzZXQiKQorICAgICAgICAgICAgZW5jb2Rp bmcgPSBzdWJwYXJ0c1sxXS5yZXBsYWNlKCJeXCJ8XCIkIiwgIiIpOyAvLyBUcmltIHF1b3Rlcy4K KyAgICB9CisKKyAgICByZXR1cm4ge3R5cGU6IHR5cGUsIGJvdW5kYXJ5OiBib3VuZGFyeSB8fCBu dWxsLCBlbmNvZGluZzogZW5jb2RpbmcgfHwgbnVsbH07Cit9CisKIGZ1bmN0aW9uIHNpbXBsZUds b2JTdHJpbmdUb1JlZ0V4cChnbG9iU3RyaW5nLCByZWdFeHBGbGFncykKIHsKICAgICAvLyBPbmx5 IHN1cHBvcnRzICIqIiBnbG9icy4K