28600 2009-08-20 22:31:31 -0700 Inspector: XML Tags should not be converted to lowercase 2010-03-24 10:22:40 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 joepeck apavlov ap aroben mjs pfeldman timothy oldest_to_newest 141773 0 38354 joepeck 2009-08-20 22:31:31 -0700 Created attachment 38354 [SAMPLE] XML File with Different Case Tags Restoring Bug after Bugzilla Data Loss - HTML can show lowercase node names (via localName) - XML should show unaffected due to its case-sensitivity --- Comment #1 from Maciej Stachowiak <mjs@apple.com> 2009-08-20 16:18:00 PDT --- My suggestion would be to use nodeName to get tag names in an XML document (this will preserve case and include the prefix) and localName in an HTML document (this will lowercase automatically). 146884 1 timothy 2009-09-11 20:24:54 -0700 The DOM is now serilized in native code and transfered to the Inspector in InspectorDOMAgent.cpp. We can serilize the correct nodeName case there and remove the forced lowercase code in the front end. 203104 2 51435 apavlov 2010-03-23 10:43:23 -0700 Created attachment 51435 [PATCH] Proposed solution 203274 3 ap 2010-03-23 16:10:59 -0700 Even a document that was originally served as XHTML can become an HTML document after a document.open() call. In this case, the MIME type check in this patch would be wrong. A more correct check would be to call Document.isHTMLDocument(), but that is not exposed to JS. There is also an issue with non-HTML elements added to HTML documents via DOM manipulation. I'd expect these to preserve their case, too. But maybe this is a good enough improvement as it is. 203429 4 51435 pfeldman 2010-03-24 08:52:48 -0700 Comment on attachment 51435 [PATCH] Proposed solution Please check tests. 203442 5 51512 apavlov 2010-03-24 09:19:30 -0700 Created attachment 51512 [PATCH] Test altered to cover the change 203469 6 apavlov 2010-03-24 10:22:40 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M LayoutTests/ChangeLog M LayoutTests/inspector/elements-panel-xhtml-structure-expected.txt M LayoutTests/inspector/elements-panel-xhtml-structure.xhtml M WebCore/ChangeLog M WebCore/inspector/front-end/ElementsPanel.js M WebCore/inspector/front-end/ElementsTreeOutline.js Committed r56446 38354 2009-08-20 22:31:31 -0700 2009-08-20 22:31:31 -0700 [SAMPLE] XML File with Different Case Tags sample.xml application/xml 109 joepeck PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0nVVRGLTgnPz4KPGV4YW1wbGVzPgogIDxsb3dl cmNhc2UgLz4KICA8VVBQRVJDQVNFIC8+CiAgPGNhbWVsQ2FzZSAvPgo8L2V4YW1wbGVzPg== 51435 2010-03-23 10:43:23 -0700 2010-03-24 09:19:30 -0700 [PATCH] Proposed solution xmlcase.patch text/plain 6259 apavlov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NzA5YTdhOC4uNmJiM2RmYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0wMy0yMyAgQWxleGFuZGVyIFBh dmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFhNTCBUYWdzIHNob3VsZCBub3Qg YmUgY29udmVydGVkIHRvIGxvd2VyY2FzZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9Mjg2MDAKKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv RWxlbWVudHNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FbGVtZW50c1BhbmVsLnBy b3RvdHlwZS51cGRhdGVCcmVhZGNydW1iKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FbGVtZW50 c1BhbmVsLnByb3RvdHlwZS5kZWNvcmF0ZU5vZGVMYWJlbCk6CisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkVsZW1lbnRzVHJlZU91dGxpbmUucHJvdG90eXBlLm5vZGVOYW1lVG9Db3JyZWN0Q2FzZSk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlRWxlbWVudC5wcm90b3R5cGUuX3VwZGF0 ZUNoaWxkcmVuKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVFbGVtZW50LnBy b3RvdHlwZS5fbm9kZVRpdGxlSW5mbyk6CisKIDIwMTAtMDMtMjMgIEp1bGllbiBDaGFmZnJhaXgg IDxqY2hhZmZyYWl4QHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCBidWlsZCBmaXgu CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNQYW5lbC5q cyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpzCmluZGV4IDc1 ZThkMDguLmUyY2E4MzggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9F bGVtZW50c1BhbmVsLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50 c1BhbmVsLmpzCkBAIC02OTIsNyArNjkyLDcgQEAgV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwu cHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgICAgICBicmVhazsKIAogICAgICAgICAgICAg ICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICAgICAgICAgIGNydW1iVGl0bGUgPSBjdXJyZW50Lm5v ZGVOYW1lLnRvTG93ZXJDYXNlKCk7CisgICAgICAgICAgICAgICAgICAgIGNydW1iVGl0bGUgPSB0 aGlzLnRyZWVPdXRsaW5lLm5vZGVOYW1lVG9Db3JyZWN0Q2FzZShjdXJyZW50Lm5vZGVOYW1lKTsK ICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgaWYgKCFjcnVtYi5jaGlsZE5vZGVzLmxlbmd0 aCkgewpAQCAtNzIwLDcgKzcyMCw3IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1BhbmVsLnByb3Rv dHlwZSA9IHsKIAogICAgIGRlY29yYXRlTm9kZUxhYmVsOiBmdW5jdGlvbihub2RlLCBwYXJlbnRF bGVtZW50KQogICAgIHsKLSAgICAgICAgdmFyIHRpdGxlID0gbm9kZS5ub2RlTmFtZS50b0xvd2Vy Q2FzZSgpOworICAgICAgICB2YXIgdGl0bGUgPSB0aGlzLnRyZWVPdXRsaW5lLm5vZGVOYW1lVG9D b3JyZWN0Q2FzZShub2RlLm5vZGVOYW1lKTsKIAogICAgICAgICB2YXIgbmFtZUVsZW1lbnQgPSBk b2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7CiAgICAgICAgIG5hbWVFbGVtZW50LnRleHRD b250ZW50ID0gdGl0bGU7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv RWxlbWVudHNUcmVlT3V0bGluZS5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVt ZW50c1RyZWVPdXRsaW5lLmpzCmluZGV4IDhjYTBiNTcuLjI2YTE5NDkgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5lLmpzCisrKyBiL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5lLmpzCkBAIC02OSw2 ICs2OSwxMSBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlT3V0bGluZS5wcm90b3R5cGUgPSB7 CiAgICAgICAgIHJldHVybiB0aGlzLl9pc1hNTE1pbWVUeXBlOwogICAgIH0sCiAKKyAgICBub2Rl TmFtZVRvQ29ycmVjdENhc2U6IGZ1bmN0aW9uKG5vZGVOYW1lKQorICAgIHsKKyAgICAgICAgcmV0 dXJuIHRoaXMuaXNYTUxNaW1lVHlwZSA/IG5vZGVOYW1lIDogbm9kZU5hbWUudG9Mb3dlckNhc2Uo KTsKKyAgICB9LAorCiAgICAgZ2V0IGZvY3VzZWRET01Ob2RlKCkKICAgICB7CiAgICAgICAgIHJl dHVybiB0aGlzLl9mb2N1c2VkRE9NTm9kZTsKQEAgLTU3Niw3ICs1ODEsNyBAQCBXZWJJbnNwZWN0 b3IuRWxlbWVudHNUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgdmFyIGxhc3RD aGlsZCA9IHRoaXMuY2hpbGRyZW5bdGhpcy5jaGlsZHJlbi5sZW5ndGggLSAxXTsKICAgICAgICAg aWYgKHRoaXMucmVwcmVzZW50ZWRPYmplY3Qubm9kZVR5cGUgPT0gTm9kZS5FTEVNRU5UX05PREUg JiYgKCFsYXN0Q2hpbGQgfHwgIWxhc3RDaGlsZC5lbGVtZW50Q2xvc2VUYWcpKSB7Ci0gICAgICAg ICAgICB2YXIgdGl0bGUgPSAiPHNwYW4gY2xhc3M9XCJ3ZWJraXQtaHRtbC10YWcgY2xvc2VcIj4m bHQ7LyIgKyB0aGlzLnJlcHJlc2VudGVkT2JqZWN0Lm5vZGVOYW1lLnRvTG93ZXJDYXNlKCkuZXNj YXBlSFRNTCgpICsgIiZndDs8L3NwYW4+IjsKKyAgICAgICAgICAgIHZhciB0aXRsZSA9ICI8c3Bh biBjbGFzcz1cIndlYmtpdC1odG1sLXRhZyBjbG9zZVwiPiZsdDsvIiArIHRoaXMudHJlZU91dGxp bmUubm9kZU5hbWVUb0NvcnJlY3RDYXNlKHRoaXMucmVwcmVzZW50ZWRPYmplY3Qubm9kZU5hbWUp LmVzY2FwZUhUTUwoKSArICImZ3Q7PC9zcGFuPiI7CiAgICAgICAgICAgICB2YXIgaXRlbSA9IG5l dyBUcmVlRWxlbWVudCh0aXRsZSwgbnVsbCwgZmFsc2UpOwogICAgICAgICAgICAgaXRlbS5zZWxl Y3RhYmxlID0gZmFsc2U7CiAgICAgICAgICAgICBpdGVtLmVsZW1lbnRDbG9zZVRhZyA9IHRydWU7 CkBAIC0xMDY2LDcgKzEwNzEsNyBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlRWxlbWVudC5w cm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgICAgIGNhc2Ug Tm9kZS5FTEVNRU5UX05PREU6Ci0gICAgICAgICAgICAgICAgdmFyIHRhZ05hbWUgPSBub2RlLm5v ZGVOYW1lLnRvTG93ZXJDYXNlKCkuZXNjYXBlSFRNTCgpOworICAgICAgICAgICAgICAgIHZhciB0 YWdOYW1lID0gdGhpcy50cmVlT3V0bGluZS5ub2RlTmFtZVRvQ29ycmVjdENhc2Uobm9kZS5ub2Rl TmFtZSkuZXNjYXBlSFRNTCgpOwogICAgICAgICAgICAgICAgIGluZm8udGl0bGUgPSAiPHNwYW4g Y2xhc3M9XCJ3ZWJraXQtaHRtbC10YWdcIj4mbHQ7IiArIHRhZ05hbWU7CiAgICAgICAgICAgICAg ICAgCiAgICAgICAgICAgICAgICAgaWYgKG5vZGUuaGFzQXR0cmlidXRlcygpKSB7CkBAIC0xMTEx LDE4ICsxMTE2LDE4IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVFbGVtZW50LnByb3RvdHlw ZSA9IHsKICAgICAgICAgICAgICAgICBpZiAoaXNOb2RlV2hpdGVzcGFjZS5jYWxsKG5vZGUpKQog ICAgICAgICAgICAgICAgICAgICBpbmZvLnRpdGxlID0gIih3aGl0ZXNwYWNlKSI7CiAgICAgICAg ICAgICAgICAgZWxzZSB7Ci0gICAgICAgICAgICAgICAgICAgIGlmIChub2RlLnBhcmVudE5vZGUg JiYgbm9kZS5wYXJlbnROb2RlLm5vZGVOYW1lLnRvTG93ZXJDYXNlKCkgPT0gInNjcmlwdCIpIHsK KyAgICAgICAgICAgICAgICAgICAgaWYgKG5vZGUucGFyZW50Tm9kZSAmJiBub2RlLnBhcmVudE5v ZGUubm9kZU5hbWUudG9Mb3dlckNhc2UoKSA9PT0gInNjcmlwdCIpIHsKICAgICAgICAgICAgICAg ICAgICAgICAgIHZhciBuZXdOb2RlID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIpOwog ICAgICAgICAgICAgICAgICAgICAgICAgbmV3Tm9kZS50ZXh0Q29udGVudCA9IG5vZGUudGV4dENv bnRlbnQ7CiAKICAgICAgICAgICAgICAgICAgICAgICAgIHZhciBqYXZhc2NyaXB0U3ludGF4SGln aGxpZ2h0ZXIgPSBuZXcgV2ViSW5zcGVjdG9yLkRPTVN5bnRheEhpZ2hsaWdodGVyKCJ0ZXh0L2ph dmFzY3JpcHQiKTsKICAgICAgICAgICAgICAgICAgICAgICAgIGphdmFzY3JpcHRTeW50YXhIaWdo bGlnaHRlci5zeW50YXhIaWdobGlnaHROb2RlKG5ld05vZGUpOwotICAgICAgICAgICAgICAgICAg ICAgICAgCisKICAgICAgICAgICAgICAgICAgICAgICAgIGluZm8udGl0bGUgPSAiPHNwYW4gY2xh c3M9XCJ3ZWJraXQtaHRtbC10ZXh0LW5vZGUgd2Via2l0LWh0bWwtanMtbm9kZVwiPiIgKyBuZXdO b2RlLmlubmVySFRNTC5yZXBsYWNlKC9eW1xuXHJdKi8sICIiKS5yZXBsYWNlKC9ccyokLywgIiIp ICsgIjwvc3Bhbj4iOwotICAgICAgICAgICAgICAgICAgICB9IGVsc2UgaWYgKG5vZGUucGFyZW50 Tm9kZSAmJiBub2RlLnBhcmVudE5vZGUubm9kZU5hbWUudG9Mb3dlckNhc2UoKSA9PSAic3R5bGUi KSB7CisgICAgICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAobm9kZS5wYXJlbnROb2RlICYmIG5v ZGUucGFyZW50Tm9kZS5ub2RlTmFtZS50b0xvd2VyQ2FzZSgpID09PSAic3R5bGUiKSB7CiAgICAg ICAgICAgICAgICAgICAgICAgICB2YXIgbmV3Tm9kZSA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQo InNwYW4iKTsKICAgICAgICAgICAgICAgICAgICAgICAgIG5ld05vZGUudGV4dENvbnRlbnQgPSBu b2RlLnRleHRDb250ZW50OwotICAgICAgICAgICAgICAgICAgICAgICAgCisKICAgICAgICAgICAg ICAgICAgICAgICAgIHZhciBjc3NTeW50YXhIaWdobGlnaHRlciA9IG5ldyBXZWJJbnNwZWN0b3Iu RE9NU3ludGF4SGlnaGxpZ2h0ZXIoInRleHQvY3NzIik7CiAgICAgICAgICAgICAgICAgICAgICAg ICBjc3NTeW50YXhIaWdobGlnaHRlci5zeW50YXhIaWdobGlnaHROb2RlKG5ld05vZGUpOwogICAg ICAgICAgICAgICAgICAgICAgICAgCkBAIC0xMTMyLDExICsxMTM3LDExIEBAIFdlYkluc3BlY3Rv ci5FbGVtZW50c1RyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICAgICAg fQogICAgICAgICAgICAgICAgIH0gCiAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAg ICAgICAgCisKICAgICAgICAgICAgIGNhc2UgTm9kZS5DT01NRU5UX05PREU6CiAgICAgICAgICAg ICAgICAgaW5mby50aXRsZSA9ICI8c3BhbiBjbGFzcz1cIndlYmtpdC1odG1sLWNvbW1lbnRcIj4m bHQ7IS0tIiArIG5vZGUubm9kZVZhbHVlLmVzY2FwZUhUTUwoKSArICItLSZndDs8L3NwYW4+IjsK ICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgICAgICAKKwogICAgICAgICAgICAg Y2FzZSBOb2RlLkRPQ1VNRU5UX1RZUEVfTk9ERToKICAgICAgICAgICAgICAgICBpbmZvLnRpdGxl ID0gIjxzcGFuIGNsYXNzPVwid2Via2l0LWh0bWwtZG9jdHlwZVwiPiZsdDshRE9DVFlQRSAiICsg bm9kZS5ub2RlTmFtZTsKICAgICAgICAgICAgICAgICBpZiAobm9kZS5wdWJsaWNJZCkgewpAQCAt MTE1MCw5ICsxMTU1LDkgQEAgV2ViSW5zcGVjdG9yLkVsZW1lbnRzVHJlZUVsZW1lbnQucHJvdG90 eXBlID0gewogICAgICAgICAgICAgICAgIGluZm8udGl0bGUgKz0gIiZndDs8L3NwYW4+IjsKICAg ICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICAg ICAgaW5mby50aXRsZSA9IG5vZGUubm9kZU5hbWUudG9Mb3dlckNhc2UoKS5jb2xsYXBzZVdoaXRl c3BhY2UoKS5lc2NhcGVIVE1MKCk7CisgICAgICAgICAgICAgICAgaW5mby50aXRsZSA9IHRoaXMu dHJlZU91dGxpbmUubm9kZU5hbWVUb0NvcnJlY3RDYXNlKG5vZGUubm9kZU5hbWUpLmNvbGxhcHNl V2hpdGVzcGFjZSgpLmVzY2FwZUhUTUwoKTsKICAgICAgICAgfQotICAgICAgICAKKwogICAgICAg ICByZXR1cm4gaW5mbzsKICAgICB9LAogCkBAIC0xMTY1LDcgKzExNzAsNyBAQCBXZWJJbnNwZWN0 b3IuRWxlbWVudHNUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0KICAgICAgICAg cmV0dXJuIGZhbHNlOwogICAgIH0sCi0gICAgCisKICAgICByZW1vdmU6IGZ1bmN0aW9uKCkKICAg ICB7CiAgICAgICAgIHZhciBwYXJlbnRFbGVtZW50ID0gdGhpcy5wYXJlbnQ7Cg== 51512 2010-03-24 09:19:30 -0700 2010-03-24 09:39:39 -0700 [PATCH] Test altered to cover the change xmlcase.patch text/plain 8429 apavlov ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBhNmUxNjg4Li44M2Q4MmRmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTAtMDMt MjQgIEFsZXhhbmRlciBQYXZsb3YgIDxhcGF2bG92QGNocm9taXVtLm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbnNwZWN0b3I6IFhNTCBUYWdz IHNob3VsZCBub3QgYmUgY29udmVydGVkIHRvIGxvd2VyY2FzZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjg2MDAKKworICAgICAgICAqIGluc3BlY3Rv ci9lbGVtZW50cy1wYW5lbC14aHRtbC1zdHJ1Y3R1cmUtZXhwZWN0ZWQudHh0OgorICAgICAgICAq IGluc3BlY3Rvci9lbGVtZW50cy1wYW5lbC14aHRtbC1zdHJ1Y3R1cmUueGh0bWw6CisKIDIwMTAt MDMtMjQgIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KIAogICAgICAgICBS dWJiZXItc3RhbXBlZCBieSBTaW1vbiBIYXVzbWFubiBhbmQgR3VzdGF2byBOb3JvbmhhIFNpbHZh LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRzLXBhbmVsLXhodG1s LXN0cnVjdHVyZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMt cGFuZWwteGh0bWwtc3RydWN0dXJlLWV4cGVjdGVkLnR4dAppbmRleCBmMDVjZDQwLi4yNDY3N2Yy IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMtcGFuZWwteGh0bWwt c3RydWN0dXJlLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVu dHMtcGFuZWwteGh0bWwtc3RydWN0dXJlLWV4cGVjdGVkLnR4dApAQCAtNSw5ICs1LDkgQEAgTmV4 dCBsaW5lCiAKIAogYXBwbGljYXRpb24veGh0bWwreG1sIAotPGh0bWwgeG1sbnM9Imh0dHA6Ly93 d3cudzMub3JnLzE5OTkveGh0bWwiPgotPGhlYWQ+4oCmCi08L2hlYWQ+Cis8SFRNTCB4bWxucz0i aHR0cDovL3d3dy53My5vcmcvMTk5OS94aHRtbCI+Cis8SGVhZD7igKYKKzwvSGVhZD4KIDxib2R5 IG9ubG9hZD0ib25sb2FkKCkiPgogPHA+IlRlc3RzIHRoYXQgZWxlbWVudHMgcGFuZWwgc2hvd3Mg WE1MIGRvbSB0cmVlIHN0cnVjdHVyZSB3aXRoIGNsb3NpbmcgdGFncyBmb3IgYWxsIGVsZW1lbnRz LiIKIDwvcD4KQEAgLTI0LDUgKzI0LDUgQEAgYXBwbGljYXRpb24veGh0bWwreG1sCiA8ZGl2IGlk PSJvdXRwdXQiPgogPC9kaXY+CiA8L2JvZHk+Ci08L2h0bWw+Cis8L0hUTUw+CiAKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9lbGVtZW50cy1wYW5lbC14aHRtbC1zdHJ1Y3R1cmUu eGh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMtcGFuZWwteGh0bWwtc3RydWN0 dXJlLnhodG1sCmluZGV4IDg4YmZlMjUuLjU5MGNkZjEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L2luc3BlY3Rvci9lbGVtZW50cy1wYW5lbC14aHRtbC1zdHJ1Y3R1cmUueGh0bWwKKysrIGIvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRzLXBhbmVsLXhodG1sLXN0cnVjdHVyZS54aHRtbApA QCAtMSw1ICsxLDUgQEAKLTxodG1sIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hodG1s Ij4KLTxoZWFkPgorPEhUTUwgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGh0bWwiPgor PEhlYWQ+CiA8c2NyaXB0IHNyYz0iLi4vaHR0cC90ZXN0cy9pbnNwZWN0b3IvaW5zcGVjdG9yLXRl c3QuanMiPjwvc2NyaXB0PgogPHNjcmlwdCBzcmM9ImVsZW1lbnRzLXRlc3RzLmpzIj48L3Njcmlw dD4KIDxzY3JpcHQ+CkBAIC0xMDIsNyArMTAyLDcgQEAgZnVuY3Rpb24gZnJvbnRlbmRfbG9hZERP TSh0ZXN0Q29udHJvbGxlcikKIAogXV0+CiA8L3NjcmlwdD4KLTwvaGVhZD4KKzwvSGVhZD4KIAog PGJvZHkgb25sb2FkPSJvbmxvYWQoKSI+CiA8cD4KQEAgLTExOSw0ICsxMTksNCBAQCBUZXN0cyB0 aGF0IGVsZW1lbnRzIHBhbmVsIHNob3dzIFhNTCBkb20gdHJlZSBzdHJ1Y3R1cmUgd2l0aCBjbG9z aW5nIHRhZ3MgZm9yIGFsbAogPC9wcmU+CiAKIDwvYm9keT4KLTwvaHRtbD4KKzwvSFRNTD4KZGlm ZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzgw MDdhNi4uNGU4ZTE2OSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29y ZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0wMy0yNCAgQWxleGFuZGVyIFBhdmxv diAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEluc3BlY3RvcjogWE1MIFRhZ3Mgc2hvdWxkIG5vdCBiZSBjb252 ZXJ0ZWQgdG8gbG93ZXJjYXNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yODYwMAorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50 c1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwucHJvdG90eXBl LnVwZGF0ZUJyZWFkY3J1bWIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwu cHJvdG90eXBlLmRlY29yYXRlTm9kZUxhYmVsKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRWxlbWVu dHNUcmVlT3V0bGluZS5wcm90b3R5cGUubm9kZU5hbWVUb0NvcnJlY3RDYXNlKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVFbGVtZW50LnByb3RvdHlwZS5fdXBkYXRlQ2hpbGRy ZW4pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzVHJlZUVsZW1lbnQucHJvdG90eXBl Ll9ub2RlVGl0bGVJbmZvKToKKwogMjAxMC0wMy0xOSAgTWlpa2thIEhlaWtraW5lbiAgPG1paWtr YS5oZWlra2luZW5AZGlnaWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEhhdXNt YW5uLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzUGFu ZWwuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNQYW5lbC5qcwppbmRl eCA3NWU4ZDA4Li5lMmNhODM4IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvRWxlbWVudHNQYW5lbC5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxl bWVudHNQYW5lbC5qcwpAQCAtNjkyLDcgKzY5Miw3IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1Bh bmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAg ICAgICAgICBkZWZhdWx0OgotICAgICAgICAgICAgICAgICAgICBjcnVtYlRpdGxlID0gY3VycmVu dC5ub2RlTmFtZS50b0xvd2VyQ2FzZSgpOworICAgICAgICAgICAgICAgICAgICBjcnVtYlRpdGxl ID0gdGhpcy50cmVlT3V0bGluZS5ub2RlTmFtZVRvQ29ycmVjdENhc2UoY3VycmVudC5ub2RlTmFt ZSk7CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIGlmICghY3J1bWIuY2hpbGROb2Rlcy5s ZW5ndGgpIHsKQEAgLTcyMCw3ICs3MjAsNyBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbC5w cm90b3R5cGUgPSB7CiAKICAgICBkZWNvcmF0ZU5vZGVMYWJlbDogZnVuY3Rpb24obm9kZSwgcGFy ZW50RWxlbWVudCkKICAgICB7Ci0gICAgICAgIHZhciB0aXRsZSA9IG5vZGUubm9kZU5hbWUudG9M b3dlckNhc2UoKTsKKyAgICAgICAgdmFyIHRpdGxlID0gdGhpcy50cmVlT3V0bGluZS5ub2RlTmFt ZVRvQ29ycmVjdENhc2Uobm9kZS5ub2RlTmFtZSk7CiAKICAgICAgICAgdmFyIG5hbWVFbGVtZW50 ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIpOwogICAgICAgICBuYW1lRWxlbWVudC50 ZXh0Q29udGVudCA9IHRpdGxlOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv RWxlbWVudHNUcmVlT3V0bGluZS5qcwppbmRleCA4Y2EwYjU3Li4yNmExOTQ5IDEwMDY0NAotLS0g YS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNUcmVlT3V0bGluZS5qcworKysg Yi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNUcmVlT3V0bGluZS5qcwpAQCAt NjksNiArNjksMTEgQEAgV2ViSW5zcGVjdG9yLkVsZW1lbnRzVHJlZU91dGxpbmUucHJvdG90eXBl ID0gewogICAgICAgICByZXR1cm4gdGhpcy5faXNYTUxNaW1lVHlwZTsKICAgICB9LAogCisgICAg bm9kZU5hbWVUb0NvcnJlY3RDYXNlOiBmdW5jdGlvbihub2RlTmFtZSkKKyAgICB7CisgICAgICAg IHJldHVybiB0aGlzLmlzWE1MTWltZVR5cGUgPyBub2RlTmFtZSA6IG5vZGVOYW1lLnRvTG93ZXJD YXNlKCk7CisgICAgfSwKKwogICAgIGdldCBmb2N1c2VkRE9NTm9kZSgpCiAgICAgewogICAgICAg ICByZXR1cm4gdGhpcy5fZm9jdXNlZERPTU5vZGU7CkBAIC01NzYsNyArNTgxLDcgQEAgV2ViSW5z cGVjdG9yLkVsZW1lbnRzVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogCiAgICAgICAgIHZhciBs YXN0Q2hpbGQgPSB0aGlzLmNoaWxkcmVuW3RoaXMuY2hpbGRyZW4ubGVuZ3RoIC0gMV07CiAgICAg ICAgIGlmICh0aGlzLnJlcHJlc2VudGVkT2JqZWN0Lm5vZGVUeXBlID09IE5vZGUuRUxFTUVOVF9O T0RFICYmICghbGFzdENoaWxkIHx8ICFsYXN0Q2hpbGQuZWxlbWVudENsb3NlVGFnKSkgewotICAg ICAgICAgICAgdmFyIHRpdGxlID0gIjxzcGFuIGNsYXNzPVwid2Via2l0LWh0bWwtdGFnIGNsb3Nl XCI+Jmx0Oy8iICsgdGhpcy5yZXByZXNlbnRlZE9iamVjdC5ub2RlTmFtZS50b0xvd2VyQ2FzZSgp LmVzY2FwZUhUTUwoKSArICImZ3Q7PC9zcGFuPiI7CisgICAgICAgICAgICB2YXIgdGl0bGUgPSAi PHNwYW4gY2xhc3M9XCJ3ZWJraXQtaHRtbC10YWcgY2xvc2VcIj4mbHQ7LyIgKyB0aGlzLnRyZWVP dXRsaW5lLm5vZGVOYW1lVG9Db3JyZWN0Q2FzZSh0aGlzLnJlcHJlc2VudGVkT2JqZWN0Lm5vZGVO YW1lKS5lc2NhcGVIVE1MKCkgKyAiJmd0Ozwvc3Bhbj4iOwogICAgICAgICAgICAgdmFyIGl0ZW0g PSBuZXcgVHJlZUVsZW1lbnQodGl0bGUsIG51bGwsIGZhbHNlKTsKICAgICAgICAgICAgIGl0ZW0u c2VsZWN0YWJsZSA9IGZhbHNlOwogICAgICAgICAgICAgaXRlbS5lbGVtZW50Q2xvc2VUYWcgPSB0 cnVlOwpAQCAtMTA2Niw3ICsxMDcxLDcgQEAgV2ViSW5zcGVjdG9yLkVsZW1lbnRzVHJlZUVsZW1l bnQucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIGJyZWFrOwogCiAgICAgICAgICAgICBj YXNlIE5vZGUuRUxFTUVOVF9OT0RFOgotICAgICAgICAgICAgICAgIHZhciB0YWdOYW1lID0gbm9k ZS5ub2RlTmFtZS50b0xvd2VyQ2FzZSgpLmVzY2FwZUhUTUwoKTsKKyAgICAgICAgICAgICAgICB2 YXIgdGFnTmFtZSA9IHRoaXMudHJlZU91dGxpbmUubm9kZU5hbWVUb0NvcnJlY3RDYXNlKG5vZGUu bm9kZU5hbWUpLmVzY2FwZUhUTUwoKTsKICAgICAgICAgICAgICAgICBpbmZvLnRpdGxlID0gIjxz cGFuIGNsYXNzPVwid2Via2l0LWh0bWwtdGFnXCI+Jmx0OyIgKyB0YWdOYW1lOwogICAgICAgICAg ICAgICAgIAogICAgICAgICAgICAgICAgIGlmIChub2RlLmhhc0F0dHJpYnV0ZXMoKSkgewpAQCAt MTExMSwxOCArMTExNiwxOCBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlRWxlbWVudC5wcm90 b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgaWYgKGlzTm9kZVdoaXRlc3BhY2UuY2FsbChub2Rl KSkKICAgICAgICAgICAgICAgICAgICAgaW5mby50aXRsZSA9ICIod2hpdGVzcGFjZSkiOwogICAg ICAgICAgICAgICAgIGVsc2UgewotICAgICAgICAgICAgICAgICAgICBpZiAobm9kZS5wYXJlbnRO b2RlICYmIG5vZGUucGFyZW50Tm9kZS5ub2RlTmFtZS50b0xvd2VyQ2FzZSgpID09ICJzY3JpcHQi KSB7CisgICAgICAgICAgICAgICAgICAgIGlmIChub2RlLnBhcmVudE5vZGUgJiYgbm9kZS5wYXJl bnROb2RlLm5vZGVOYW1lLnRvTG93ZXJDYXNlKCkgPT09ICJzY3JpcHQiKSB7CiAgICAgICAgICAg ICAgICAgICAgICAgICB2YXIgbmV3Tm9kZSA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4i KTsKICAgICAgICAgICAgICAgICAgICAgICAgIG5ld05vZGUudGV4dENvbnRlbnQgPSBub2RlLnRl eHRDb250ZW50OwogCiAgICAgICAgICAgICAgICAgICAgICAgICB2YXIgamF2YXNjcmlwdFN5bnRh eEhpZ2hsaWdodGVyID0gbmV3IFdlYkluc3BlY3Rvci5ET01TeW50YXhIaWdobGlnaHRlcigidGV4 dC9qYXZhc2NyaXB0Iik7CiAgICAgICAgICAgICAgICAgICAgICAgICBqYXZhc2NyaXB0U3ludGF4 SGlnaGxpZ2h0ZXIuc3ludGF4SGlnaGxpZ2h0Tm9kZShuZXdOb2RlKTsKLSAgICAgICAgICAgICAg ICAgICAgICAgIAorCiAgICAgICAgICAgICAgICAgICAgICAgICBpbmZvLnRpdGxlID0gIjxzcGFu IGNsYXNzPVwid2Via2l0LWh0bWwtdGV4dC1ub2RlIHdlYmtpdC1odG1sLWpzLW5vZGVcIj4iICsg bmV3Tm9kZS5pbm5lckhUTUwucmVwbGFjZSgvXltcblxyXSovLCAiIikucmVwbGFjZSgvXHMqJC8s ICIiKSArICI8L3NwYW4+IjsKLSAgICAgICAgICAgICAgICAgICAgfSBlbHNlIGlmIChub2RlLnBh cmVudE5vZGUgJiYgbm9kZS5wYXJlbnROb2RlLm5vZGVOYW1lLnRvTG93ZXJDYXNlKCkgPT0gInN0 eWxlIikgeworICAgICAgICAgICAgICAgICAgICB9IGVsc2UgaWYgKG5vZGUucGFyZW50Tm9kZSAm JiBub2RlLnBhcmVudE5vZGUubm9kZU5hbWUudG9Mb3dlckNhc2UoKSA9PT0gInN0eWxlIikgewog ICAgICAgICAgICAgICAgICAgICAgICAgdmFyIG5ld05vZGUgPSBkb2N1bWVudC5jcmVhdGVFbGVt ZW50KCJzcGFuIik7CiAgICAgICAgICAgICAgICAgICAgICAgICBuZXdOb2RlLnRleHRDb250ZW50 ID0gbm9kZS50ZXh0Q29udGVudDsKLSAgICAgICAgICAgICAgICAgICAgICAgIAorCiAgICAgICAg ICAgICAgICAgICAgICAgICB2YXIgY3NzU3ludGF4SGlnaGxpZ2h0ZXIgPSBuZXcgV2ViSW5zcGVj dG9yLkRPTVN5bnRheEhpZ2hsaWdodGVyKCJ0ZXh0L2NzcyIpOwogICAgICAgICAgICAgICAgICAg ICAgICAgY3NzU3ludGF4SGlnaGxpZ2h0ZXIuc3ludGF4SGlnaGxpZ2h0Tm9kZShuZXdOb2RlKTsK ICAgICAgICAgICAgICAgICAgICAgICAgIApAQCAtMTEzMiwxMSArMTEzNywxMSBAQCBXZWJJbnNw ZWN0b3IuRWxlbWVudHNUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAg ICAgIH0KICAgICAgICAgICAgICAgICB9IAogICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAg ICAgICAgICAgIAorCiAgICAgICAgICAgICBjYXNlIE5vZGUuQ09NTUVOVF9OT0RFOgogICAgICAg ICAgICAgICAgIGluZm8udGl0bGUgPSAiPHNwYW4gY2xhc3M9XCJ3ZWJraXQtaHRtbC1jb21tZW50 XCI+Jmx0OyEtLSIgKyBub2RlLm5vZGVWYWx1ZS5lc2NhcGVIVE1MKCkgKyAiLS0mZ3Q7PC9zcGFu PiI7CiAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICAgICAgCisKICAgICAgICAg ICAgIGNhc2UgTm9kZS5ET0NVTUVOVF9UWVBFX05PREU6CiAgICAgICAgICAgICAgICAgaW5mby50 aXRsZSA9ICI8c3BhbiBjbGFzcz1cIndlYmtpdC1odG1sLWRvY3R5cGVcIj4mbHQ7IURPQ1RZUEUg IiArIG5vZGUubm9kZU5hbWU7CiAgICAgICAgICAgICAgICAgaWYgKG5vZGUucHVibGljSWQpIHsK QEAgLTExNTAsOSArMTE1NSw5IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVFbGVtZW50LnBy b3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICBpbmZvLnRpdGxlICs9ICImZ3Q7PC9zcGFuPiI7 CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICBkZWZhdWx0OgotICAgICAgICAg ICAgICAgIGluZm8udGl0bGUgPSBub2RlLm5vZGVOYW1lLnRvTG93ZXJDYXNlKCkuY29sbGFwc2VX aGl0ZXNwYWNlKCkuZXNjYXBlSFRNTCgpOworICAgICAgICAgICAgICAgIGluZm8udGl0bGUgPSB0 aGlzLnRyZWVPdXRsaW5lLm5vZGVOYW1lVG9Db3JyZWN0Q2FzZShub2RlLm5vZGVOYW1lKS5jb2xs YXBzZVdoaXRlc3BhY2UoKS5lc2NhcGVIVE1MKCk7CiAgICAgICAgIH0KLSAgICAgICAgCisKICAg ICAgICAgcmV0dXJuIGluZm87CiAgICAgfSwKIApAQCAtMTE2NSw3ICsxMTcwLDcgQEAgV2ViSW5z cGVjdG9yLkVsZW1lbnRzVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICB9CiAgICAg ICAgIHJldHVybiBmYWxzZTsKICAgICB9LAotICAgIAorCiAgICAgcmVtb3ZlOiBmdW5jdGlvbigp CiAgICAgewogICAgICAgICB2YXIgcGFyZW50RWxlbWVudCA9IHRoaXMucGFyZW50Owo=