63138 2011-06-22 07:23:49 -0700 Web Inspector: split setAttributes and setAttributeValue. 2011-06-22 09:25:10 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 425204 0 pfeldman 2011-06-22 07:23:49 -0700 setAttribute's documentation is confusing. It is actually doing a completely different thing. 425237 1 98173 pfeldman 2011-06-22 08:06:39 -0700 Created attachment 98173 Patch 425263 2 98173 yurys 2011-06-22 08:40:14 -0700 Comment on attachment 98173 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=98173&action=review > Source/WebCore/inspector/Inspector.json:883 > + { "name": "text", "type": "string", "description": "Text with a number of attributes. Will parse this text using HTML parser." } We should be explicit about what should happen to the existing attributes with same names should the text contain such attributes. 425294 3 pfeldman 2011-06-22 09:25:10 -0700 Committed r89439: <http://trac.webkit.org/changeset/89439> 98173 2011-06-22 08:06:39 -0700 2011-06-22 08:40:14 -0700 Patch bug-63138-20110622190637.patch text/plain 13278 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODk0MjkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBmMWFmNjhjYmMzZGE1OTI5YTM0MTJi MDU1YWMyYzQ4MGY5MDk5Yzg1Li5lYTUxYWM3YTlmYjllZjczZThjZTdmZjg4ZjhhNWQ4NDE3NWIy YTIwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDYtMjIgIFBhdmVsIEZlbGRtYW4gIDxw ZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHNwbGl0IHNldEF0dHJpYnV0ZXMgYW5kIHNldEF0 dHJpYnV0ZVZhbHVlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NjMxMzgKKworICAgICAgICAqIGluc3BlY3Rvci9lbGVtZW50cy9zZXQtYXR0cmlidXRl Lmh0bWw6CisgICAgICAgICogaW5zcGVjdG9yL2VsZW1lbnRzL3NldC1hdHRyaWJ1dGUtZXhwZWN0 ZWQudHh0OgorCiAyMDExLTA2LTIyICBZdXRhIEtpdGFtdXJhICA8eXV0YWtAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFVucmV2aWV3ZWQsIGFwcGx5IGEgY291cGxlIG9mIENocm9taXVtIHRlc3Qg ZXhwZWN0YXRpb24gY2hhbmdlcyB0byB0ZXN0X2V4cGVjdGF0aW9ucy50eHQuCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMvc2V0LWF0dHJpYnV0ZS1leHBlY3RlZC50 eHQgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMvc2V0LWF0dHJpYnV0ZS1leHBlY3Rl ZC50eHQKaW5kZXggYjEwNTQ5ZjcyZjUxY2Y1ZDU0NzZiMGUxMGZlNDk1NWY3MDk5YjAxYS4uZGRk Y2ZjNzgwODMwNTY2ZGMwZGJmNmVkODA4ZTQxZTBjNzA2NmNlNSAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRzL3NldC1hdHRyaWJ1dGUtZXhwZWN0ZWQudHh0CisrKyBi L0xheW91dFRlc3RzL2luc3BlY3Rvci9lbGVtZW50cy9zZXQtYXR0cmlidXRlLWV4cGVjdGVkLnR4 dApAQCAtNSwxMSArNSwyMyBAQCBSdW5uaW5nOiB0ZXN0RHVtcEluaXRpYWwKID09PT09PT09PSBP cmlnaW5hbCA9PT09PT09PQogICA8ZGl2IGlkPSJub2RlIj48L2Rpdj4KIAotUnVubmluZzogdGVz dFNldEF0dHJpYnV0ZQotPT09PT0gU2V0IGF0dHJpYnV0ZSA9PT09PQorUnVubmluZzogdGVzdEF0 dHJpYnV0ZVVwZGF0ZWQKKz09PT09IE9uIGF0dHJpYnV0ZSBzZXQgPT09PT0KICAgPGRpdiBpZD0i bm9kZSIgbmFtZT0idmFsdWUiPjwvZGl2PgogCi1SdW5uaW5nOiB0ZXN0UmVtb3ZlQXR0cmlidXRl Ci09PT0gUmVtb3ZlZCBhdHRyaWJ1dGUgPT09CitSdW5uaW5nOiB0ZXN0QXR0cmlidXRlUmVtb3Zl ZAorPT09IE9uIGF0dHJpYnV0ZSByZW1vdmVkID09PQogICA8ZGl2IGlkPSJub2RlIj48L2Rpdj4K IAorUnVubmluZzogdGVzdFNldEF0dHJpYnV0ZVZhbHVlCis9PT0gU2V0IGF0dHJpYnV0ZSB2YWx1 ZSA9PT0KKyAgPGRpdiBpZD0ibm9kZSIgZm9vPSJiYXIiPjwvZGl2PgorCitSdW5uaW5nOiB0ZXN0 U2V0QXR0cmlidXRlVGV4dAorPT09IFNldCBhdHRyaWJ1dGUgYXMgdGV4dCA9PT0KKyAgPGRpdiBp ZD0ibm9kZSIgZm9vMj0iYmF6MiIgZm9vMz0iYmF6MyI+PC9kaXY+CisKK1J1bm5pbmc6IHRlc3RS ZW1vdmVBdHRyaWJ1dGVBc1RleHQKKz09PSBSZW1vdmUgYXR0cmlidXRlIGFzIHRleHQgPT09Cisg IDxkaXYgaWQ9Im5vZGUiIGZvbzI9ImJhejIiPjwvZGl2PgorCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMvc2V0LWF0dHJpYnV0ZS5odG1sIGIvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL2VsZW1lbnRzL3NldC1hdHRyaWJ1dGUuaHRtbAppbmRleCAwYmRkMWM1M2IzNGQw NTI1ZDE5YWU4MGRkOGVhYzE5MGM5Y2U1NjFkLi5lYjc4MDM2Y2Q4M2QxYWMwOTQ0Njk0ZjM3OTY2 N2I3NjAwOTMxZjkyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMv c2V0LWF0dHJpYnV0ZS5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9lbGVtZW50cy9z ZXQtYXR0cmlidXRlLmh0bWwKQEAgLTMzLDI3ICszMyw2OSBAQCBmdW5jdGlvbiB0ZXN0KCkKICAg ICAgICAgICAgIEluc3BlY3RvclRlc3Quc2VsZWN0Tm9kZVdpdGhJZCgibm9kZSIsIGNhbGxiYWNr KTsKICAgICAgICAgfSwKIAotICAgICAgICBmdW5jdGlvbiB0ZXN0U2V0QXR0cmlidXRlKG5leHQp CisgICAgICAgIGZ1bmN0aW9uIHRlc3RBdHRyaWJ1dGVVcGRhdGVkKG5leHQpCiAgICAgICAgIHsK ICAgICAgICAgICAgIGZ1bmN0aW9uIGNhbGxiYWNrKCkKICAgICAgICAgICAgIHsKLSAgICAgICAg ICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiPT09PT0gU2V0IGF0dHJpYnV0ZSA9PT09 PSIpOworICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kb21BZ2VudC5yZW1vdmVFdmVudExp c3RlbmVyKFdlYkluc3BlY3Rvci5ET01BZ2VudC5FdmVudHMuQXR0ck1vZGlmaWVkLCBjYWxsYmFj ayk7CisgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIj09PT09IE9uIGF0 dHJpYnV0ZSBzZXQgPT09PT0iKTsKICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmR1bXBF bGVtZW50c1RyZWUodGFyZ2V0Tm9kZSk7CiAgICAgICAgICAgICAgICAgbmV4dCgpOwogICAgICAg ICAgICAgfQorICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmRvbUFnZW50LmFkZEV2ZW50TGlzdGVu ZXIoV2ViSW5zcGVjdG9yLkRPTUFnZW50LkV2ZW50cy5BdHRyTW9kaWZpZWQsIGNhbGxiYWNrKTsK ICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXZhbHVhdGVJblBhZ2UoInNldEF0dHJpYnV0ZSgn bmFtZScsICd2YWx1ZScpIik7Ci0gICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFNuaWZmZXIo V2ViSW5zcGVjdG9yLlN0eWxlc1NpZGViYXJQYW5lLnByb3RvdHlwZSwgIl9yZWJ1aWxkVXBkYXRl IiwgY2FsbGJhY2spOwogICAgICAgICB9LAogCi0gICAgICAgIGZ1bmN0aW9uIHRlc3RSZW1vdmVB dHRyaWJ1dGUobmV4dCkgeworICAgICAgICBmdW5jdGlvbiB0ZXN0QXR0cmlidXRlUmVtb3ZlZChu ZXh0KQorICAgICAgICB7CiAgICAgICAgICAgICBmdW5jdGlvbiBjYWxsYmFjaygpCiAgICAgICAg ICAgICB7Ci0gICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIj09PSBSZW1v dmVkIGF0dHJpYnV0ZSA9PT0iKTsKKyAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuZG9tQWdl bnQucmVtb3ZlRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRE9NQWdlbnQuRXZlbnRzLkF0dHJN b2RpZmllZCwgY2FsbGJhY2spOworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVz dWx0KCI9PT0gT24gYXR0cmlidXRlIHJlbW92ZWQgPT09Iik7CiAgICAgICAgICAgICAgICAgSW5z cGVjdG9yVGVzdC5kdW1wRWxlbWVudHNUcmVlKHRhcmdldE5vZGUpOwogICAgICAgICAgICAgICAg IG5leHQoKTsKICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kb21BZ2Vu dC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5ET01BZ2VudC5FdmVudHMuQXR0ck1vZGlm aWVkLCBjYWxsYmFjayk7CiAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV2YWx1YXRlSW5QYWdl KCJyZW1vdmVBdHRyaWJ1dGUoJ25hbWUnKSIpOwotICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5h ZGRTbmlmZmVyKFdlYkluc3BlY3Rvci5TdHlsZXNTaWRlYmFyUGFuZS5wcm90b3R5cGUsICJfcmVi dWlsZFVwZGF0ZSIsIGNhbGxiYWNrKTsKKyAgICAgICAgfSwKKworICAgICAgICBmdW5jdGlvbiB0 ZXN0U2V0QXR0cmlidXRlVmFsdWUobmV4dCkKKyAgICAgICAgeworICAgICAgICAgICAgZnVuY3Rp b24gY2FsbGJhY2soKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rv ci5kb21BZ2VudC5yZW1vdmVFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5ET01BZ2VudC5FdmVu dHMuQXR0ck1vZGlmaWVkLCBjYWxsYmFjayk7CisgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVz dC5hZGRSZXN1bHQoIj09PSBTZXQgYXR0cmlidXRlIHZhbHVlID09PSIpOworICAgICAgICAgICAg ICAgIEluc3BlY3RvclRlc3QuZHVtcEVsZW1lbnRzVHJlZSh0YXJnZXROb2RlKTsKKyAgICAgICAg ICAgICAgICBuZXh0KCk7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBXZWJJbnNwZWN0b3Iu ZG9tQWdlbnQuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRE9NQWdlbnQuRXZlbnRzLkF0 dHJNb2RpZmllZCwgY2FsbGJhY2spOworICAgICAgICAgICAgdGFyZ2V0Tm9kZS5zZXRBdHRyaWJ1 dGVWYWx1ZSgiZm9vIiwgImJhciIpOworICAgICAgICB9LAorCisgICAgICAgIGZ1bmN0aW9uIHRl c3RTZXRBdHRyaWJ1dGVUZXh0KG5leHQpCisgICAgICAgIHsKKyAgICAgICAgICAgIGZ1bmN0aW9u IGNhbGxiYWNrKCkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3Iu ZG9tQWdlbnQucmVtb3ZlRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRE9NQWdlbnQuRXZlbnRz LkF0dHJNb2RpZmllZCwgY2FsbGJhY2spOworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3Qu YWRkUmVzdWx0KCI9PT0gU2V0IGF0dHJpYnV0ZSBhcyB0ZXh0ID09PSIpOworICAgICAgICAgICAg ICAgIEluc3BlY3RvclRlc3QuZHVtcEVsZW1lbnRzVHJlZSh0YXJnZXROb2RlKTsKKyAgICAgICAg ICAgICAgICBuZXh0KCk7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBXZWJJbnNwZWN0b3Iu ZG9tQWdlbnQuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRE9NQWdlbnQuRXZlbnRzLkF0 dHJNb2RpZmllZCwgY2FsbGJhY2spOworICAgICAgICAgICAgdGFyZ2V0Tm9kZS5zZXRBdHRyaWJ1 dGUoImZvbyIsICJmb28yPSdiYXoyJyBmb28zPSdiYXozJyIpOworICAgICAgICB9LAorCisgICAg ICAgIGZ1bmN0aW9uIHRlc3RSZW1vdmVBdHRyaWJ1dGVBc1RleHQobmV4dCkKKyAgICAgICAgewor ICAgICAgICAgICAgZnVuY3Rpb24gY2FsbGJhY2soKQorICAgICAgICAgICAgeworICAgICAgICAg ICAgICAgIFdlYkluc3BlY3Rvci5kb21BZ2VudC5yZW1vdmVFdmVudExpc3RlbmVyKFdlYkluc3Bl Y3Rvci5ET01BZ2VudC5FdmVudHMuQXR0ck1vZGlmaWVkLCBjYWxsYmFjayk7CisgICAgICAgICAg ICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIj09PSBSZW1vdmUgYXR0cmlidXRlIGFzIHRl eHQgPT09Iik7CisgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5kdW1wRWxlbWVudHNUcmVl KHRhcmdldE5vZGUpOworICAgICAgICAgICAgICAgIG5leHQoKTsKKyAgICAgICAgICAgIH0KKyAg ICAgICAgICAgIFdlYkluc3BlY3Rvci5kb21BZ2VudC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3Bl Y3Rvci5ET01BZ2VudC5FdmVudHMuQXR0ck1vZGlmaWVkLCBjYWxsYmFjayk7CisgICAgICAgICAg ICB0YXJnZXROb2RlLnNldEF0dHJpYnV0ZSgiZm9vMyIsICIiKTsKICAgICAgICAgfQogICAgIF0p OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCmluZGV4IGM2NjNiZDhlYmVjZmY1MjlhZjUxZmZiMTAzNzljZjExMzc2M2Yw MDkuLjM0MWY4MmM0YzgxZmE3ZGUzZGQwNWFkMDdiYTU1YzQ1MzI2OTY0MDYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cK QEAgLTEsNSArMSwyMSBAQAogMjAxMS0wNi0yMiAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGdv b2dsZS5jb20+CiAKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgV2ViIEluc3BlY3Rvcjogc3BsaXQgc2V0QXR0cmlidXRlcyBhbmQgc2V0QXR0cmlidXRlVmFs dWUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MzEz OAorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uOgorICAgICAgICAqIGluc3Bl Y3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JE T01BZ2VudDo6c2V0QXR0cmlidXRlVmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9y RE9NQWdlbnQ6OnNldEF0dHJpYnV0ZXNUZXh0KToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVj dG9yRE9NQWdlbnQuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50Lmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTU5vZGUucHJvdG90eXBlLnNldEF0dHJpYnV0ZSk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NTm9kZS5wcm90b3R5cGUuc2V0QXR0cmlidXRlVmFs dWUpOgorCisyMDExLTA2LTIyICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4K KwogICAgICAgICBSZXZpZXdlZCBieSBZdXJ5IFNlbWlraGF0c2t5LgogCiAgICAgICAgIFdlYiBJ bnNwZWN0b3I6IERPTUFnZW50LnJlc29sdmVOb2RlIHNob3VsZCByZWNlaXZlIG9iamVjdEdyb3Vw LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCmluZGV4IDQzNDI2YzI2MWMx ZGQ3Mjk2OTM1ZjU1Zjg0YTUyNDg4NmJkYjk0MGYuLjc4OGY3NzdkOTU0ZjdkNjA1NzBkYzcxMTdh NjFmODI4ZmJiNGRlMTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3IuanNvbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24K QEAgLTg2Nyw3ICs4NjcsNyBAQAogICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJSZW1v dmVzIG5vZGUgd2l0aCBnaXZlbiBpZC4iCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgewot ICAgICAgICAgICAgICAgICJuYW1lIjogInNldEF0dHJpYnV0ZSIsCisgICAgICAgICAgICAgICAg Im5hbWUiOiAic2V0QXR0cmlidXRlVmFsdWUiLAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJz IjogWwogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogIm5vZGVJZCIsICJ0eXBlIjogImlu dGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiSWQgb2YgdGhlIGVsZW1lbnQgdG8gc2V0IGF0dHJpYnV0 ZSBmb3IuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogIm5hbWUiLCAidHlwZSI6 ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiQXR0cmlidXRlIG5hbWUuIiB9LApAQCAtODc2LDYg Kzg3NiwxNSBAQAogICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJTZXRzIGF0dHJpYnV0 ZSBmb3IgYW4gZWxlbWVudCB3aXRoIGdpdmVuIGlkLiIKICAgICAgICAgICAgIH0sCiAgICAgICAg ICAgICB7CisgICAgICAgICAgICAgICAgIm5hbWUiOiAic2V0QXR0cmlidXRlc1RleHQiLAorICAg ICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWworICAgICAgICAgICAgICAgICAgICB7ICJuYW1l IjogIm5vZGVJZCIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiSWQgb2YgdGhl IGVsZW1lbnQgdG8gc2V0IGF0dHJpYnV0ZXMgZm9yLiIgfSwKKyAgICAgICAgICAgICAgICAgICAg eyAibmFtZSI6ICJuYW1lIiwgInR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRl c2NyaXB0aW9uIjogIkF0dHJpYnV0ZSBuYW1lIHRvIHJlcGxhY2Ugd2l0aCBuZXcgYXR0cmlidXRl cyBkZXJpdmVkIGZyb20gdGV4dCBpbiBjYXNlIHRleHQgcGFyc2VkIHN1Y2Nlc3NmdWxseS4iIH0s CisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidGV4dCIsICJ0eXBlIjogInN0cmluZyIs ICJkZXNjcmlwdGlvbiI6ICJUZXh0IHdpdGggYSBudW1iZXIgb2YgYXR0cmlidXRlcy4gV2lsbCBw YXJzZSB0aGlzIHRleHQgdXNpbmcgSFRNTCBwYXJzZXIuIiB9CisgICAgICAgICAgICAgICAgXSwK KyAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiU2V0cyBhdHRyaWJ1dGVzIG9uIGVsZW1l bnQgd2l0aCBnaXZlbiBpZC4gVGhpcyBtZXRob2QgaXMgdXNlZnVsIHdoZW4gdXNlciBlZGl0cyBz b21lIGV4aXN0aW5nIGF0dHJpYnV0ZSB2YWx1ZSBhbmQgdHlwZXMgaW4gc2V2ZXJhbCBhdHRyaWJ1 dGUgbmFtZS92YWx1ZSBwYWlycy4iCisgICAgICAgICAgICB9LAorICAgICAgICAgICAgewogICAg ICAgICAgICAgICAgICJuYW1lIjogInJlbW92ZUF0dHJpYnV0ZSIsCiAgICAgICAgICAgICAgICAg InBhcmFtZXRlcnMiOiBbCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibm9kZUlkIiwg InR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJJZCBvZiB0aGUgZWxlbWVudCB0byBy ZW1vdmUgYXR0cmlidXRlIGZyb20uIiB9LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JET01BZ2VudC5jcHAKaW5kZXggOGIyYjZiN2QwM2ZmOGJkM2M5M2I1YTBjMDg0MzVl YjMxNzVhZmJhZS4uMjIzNTg5MDU1ODIxMmEyZGIzZWU5MDBkNjhiOGYwOTgxYmY3YzlhNCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCkBAIC01 NzIsNyArNTcyLDE5IEBAIGludCBJbnNwZWN0b3JET01BZ2VudDo6Ym91bmROb2RlSWQoTm9kZSog bm9kZSkKICAgICByZXR1cm4gbV9kb2N1bWVudE5vZGVUb0lkTWFwLmdldChub2RlKTsKIH0KIAot dm9pZCBJbnNwZWN0b3JET01BZ2VudDo6c2V0QXR0cmlidXRlKEVycm9yU3RyaW5nKiBlcnJvclN0 cmluZywgaW50IGVsZW1lbnRJZCwgY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcmIHZh bHVlKQordm9pZCBJbnNwZWN0b3JET01BZ2VudDo6c2V0QXR0cmlidXRlVmFsdWUoRXJyb3JTdHJp bmcqIGVycm9yU3RyaW5nLCBpbnQgZWxlbWVudElkLCBjb25zdCBTdHJpbmcmIG5hbWUsIGNvbnN0 IFN0cmluZyYgdmFsdWUpCit7CisgICAgRWxlbWVudCogZWxlbWVudCA9IGFzc2VydEVsZW1lbnQo ZXJyb3JTdHJpbmcsIGVsZW1lbnRJZCk7CisgICAgaWYgKCFlbGVtZW50KQorICAgICAgICByZXR1 cm47CisKKyAgICBFeGNlcHRpb25Db2RlIGVjID0gMDsKKyAgICBlbGVtZW50LT5zZXRBdHRyaWJ1 dGUobmFtZSwgdmFsdWUsIGVjKTsKKyAgICBpZiAoZWMpCisgICAgICAgICplcnJvclN0cmluZyA9 ICJJbnRlcm5hbCBlcnJvcjogY291bGQgbm90IHNldCBhdHRyaWJ1dGUgdmFsdWUuIjsKK30KKwor dm9pZCBJbnNwZWN0b3JET01BZ2VudDo6c2V0QXR0cmlidXRlc1RleHQoRXJyb3JTdHJpbmcqIGVy cm9yU3RyaW5nLCBpbnQgZWxlbWVudElkLCBjb25zdCBTdHJpbmcqIGNvbnN0IG5hbWUsIGNvbnN0 IFN0cmluZyYgdGV4dCkKIHsKICAgICBFbGVtZW50KiBlbGVtZW50ID0gYXNzZXJ0RWxlbWVudChl cnJvclN0cmluZywgZWxlbWVudElkKTsKICAgICBpZiAoIWVsZW1lbnQpCkBAIC01ODUsMTUgKzU5 NywxNSBAQCB2b2lkIEluc3BlY3RvckRPTUFnZW50OjpzZXRBdHRyaWJ1dGUoRXJyb3JTdHJpbmcq IGVycm9yU3RyaW5nLCBpbnQgZWxlbWVudElkLCBjbwogICAgICAgICByZXR1cm47CiAgICAgfQog Ci0gICAgdG9IVE1MRWxlbWVudChwYXJzZWRFbGVtZW50LmdldCgpKS0+c2V0SW5uZXJIVE1MKCI8 c3BhbiAiICsgdmFsdWUgKyAiPjwvc3Bhbj4iLCBlYyk7CisgICAgdG9IVE1MRWxlbWVudChwYXJz ZWRFbGVtZW50LmdldCgpKS0+c2V0SW5uZXJIVE1MKCI8c3BhbiAiICsgdGV4dCArICI+PC9zcGFu PiIsIGVjKTsKICAgICBpZiAoZWMpIHsKICAgICAgICAgKmVycm9yU3RyaW5nID0gIkNvdWxkIG5v dCBwYXJzZSB2YWx1ZSBhcyBhdHRyaWJ1dGVzLiI7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAK ICAgICBjb25zdCBOYW1lZE5vZGVNYXAqIGF0dHJNYXAgPSB0b0hUTUxFbGVtZW50KHBhcnNlZEVs ZW1lbnQtPmZpcnN0Q2hpbGQoKSktPmF0dHJpYnV0ZXModHJ1ZSk7Ci0gICAgaWYgKCFhdHRyTWFw KSB7Ci0gICAgICAgIGVsZW1lbnQtPnJlbW92ZUF0dHJpYnV0ZShuYW1lLCBlYyk7CisgICAgaWYg KCFhdHRyTWFwICYmIG5hbWUpIHsKKyAgICAgICAgZWxlbWVudC0+cmVtb3ZlQXR0cmlidXRlKCpu YW1lLCBlYyk7CiAgICAgICAgIGlmIChlYykKICAgICAgICAgICAgICplcnJvclN0cmluZyA9ICJD b3VsZCBub3QgcmVtb3ZlIGF0dHJpYnV0ZS4iOwogICAgICAgICByZXR1cm47CkBAIC02MDQsNyAr NjE2LDcgQEAgdm9pZCBJbnNwZWN0b3JET01BZ2VudDo6c2V0QXR0cmlidXRlKEVycm9yU3RyaW5n KiBlcnJvclN0cmluZywgaW50IGVsZW1lbnRJZCwgY28KICAgICBmb3IgKHVuc2lnbmVkIGkgPSAw OyBpIDwgbnVtQXR0cnM7ICsraSkgewogICAgICAgICAvLyBBZGQgYXR0cmlidXRlIHBhaXIKICAg ICAgICAgY29uc3QgQXR0cmlidXRlICphdHRyaWJ1dGUgPSBhdHRyTWFwLT5hdHRyaWJ1dGVJdGVt KGkpOwotICAgICAgICBmb3VuZE9yaWdpbmFsQXR0cmlidXRlID0gZm91bmRPcmlnaW5hbEF0dHJp YnV0ZSB8fCBhdHRyaWJ1dGUtPm5hbWUoKS50b1N0cmluZygpID09IG5hbWU7CisgICAgICAgIGZv dW5kT3JpZ2luYWxBdHRyaWJ1dGUgPSBmb3VuZE9yaWdpbmFsQXR0cmlidXRlIHx8IChuYW1lICYm IGF0dHJpYnV0ZS0+bmFtZSgpLnRvU3RyaW5nKCkgPT0gKm5hbWUpOwogICAgICAgICBlbGVtZW50 LT5zZXRBdHRyaWJ1dGUoYXR0cmlidXRlLT5uYW1lKCksIGF0dHJpYnV0ZS0+dmFsdWUoKSwgZWMp OwogICAgICAgICBpZiAoZWMpIHsKICAgICAgICAgICAgICplcnJvclN0cmluZyA9ICJJbnRlcm5h bCBlcnJvcjogY291bGQgbm90IHNldCBhdHRyaWJ1dGUgdmFsdWUuIjsKQEAgLTYxMiw4ICs2MjQs OCBAQCB2b2lkIEluc3BlY3RvckRPTUFnZW50OjpzZXRBdHRyaWJ1dGUoRXJyb3JTdHJpbmcqIGVy cm9yU3RyaW5nLCBpbnQgZWxlbWVudElkLCBjbwogICAgICAgICB9CiAgICAgfQogCi0gICAgaWYg KCFmb3VuZE9yaWdpbmFsQXR0cmlidXRlKSB7Ci0gICAgICAgIGVsZW1lbnQtPnJlbW92ZUF0dHJp YnV0ZShuYW1lLCBlYyk7CisgICAgaWYgKCFmb3VuZE9yaWdpbmFsQXR0cmlidXRlICYmIG5hbWUp IHsKKyAgICAgICAgZWxlbWVudC0+cmVtb3ZlQXR0cmlidXRlKCpuYW1lLCBlYyk7CiAgICAgICAg IGlmIChlYykKICAgICAgICAgICAgICplcnJvclN0cmluZyA9ICJDb3VsZCBub3QgcmVtb3ZlIGF0 dHJpYnV0ZS4iOwogICAgICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JET01BZ2VudC5oCmluZGV4IDkwOTdkM2JlZjYzNTJkMWMwMzkxMzIyZTUxMmVlODIz MTAyMjI1NjQuLjBhNDJkYmIyYzFkZGE3N2UwYmFlNjkzN2MwZDgzMjE0MGNmOTEwNjIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5oCkBAIC0xMTUsNyAr MTE1LDggQEAgcHVibGljOgogICAgIHZvaWQgcXVlcnlTZWxlY3RvckFsbChFcnJvclN0cmluZyos IGludCBub2RlSWQsIGNvbnN0IFN0cmluZyYgc2VsZWN0b3JzLCBSZWZQdHI8SW5zcGVjdG9yQXJy YXk+KiByZXN1bHQpOwogICAgIHZvaWQgZ2V0RG9jdW1lbnQoRXJyb3JTdHJpbmcqLCBSZWZQdHI8 SW5zcGVjdG9yT2JqZWN0Piogcm9vdCk7CiAgICAgdm9pZCBnZXRDaGlsZE5vZGVzKEVycm9yU3Ry aW5nKiwgaW50IG5vZGVJZCk7Ci0gICAgdm9pZCBzZXRBdHRyaWJ1dGUoRXJyb3JTdHJpbmcqLCBp bnQgZWxlbWVudElkLCBjb25zdCBTdHJpbmcmIG5hbWUsIGNvbnN0IFN0cmluZyYgdmFsdWUpOwor ICAgIHZvaWQgc2V0QXR0cmlidXRlVmFsdWUoRXJyb3JTdHJpbmcqLCBpbnQgZWxlbWVudElkLCBj b25zdCBTdHJpbmcmIG5hbWUsIGNvbnN0IFN0cmluZyYgdmFsdWUpOworICAgIHZvaWQgc2V0QXR0 cmlidXRlc1RleHQoRXJyb3JTdHJpbmcqLCBpbnQgZWxlbWVudElkLCBjb25zdCBTdHJpbmcqIGNv bnN0IG5hbWUsIGNvbnN0IFN0cmluZyYgdGV4dCk7CiAgICAgdm9pZCByZW1vdmVBdHRyaWJ1dGUo RXJyb3JTdHJpbmcqLCBpbnQgZWxlbWVudElkLCBjb25zdCBTdHJpbmcmIG5hbWUpOwogICAgIHZv aWQgcmVtb3ZlTm9kZShFcnJvclN0cmluZyosIGludCBub2RlSWQpOwogICAgIHZvaWQgc2V0Tm9k ZU5hbWUoRXJyb3JTdHJpbmcqLCBpbnQgbm9kZUlkLCBjb25zdCBTdHJpbmcmIG5hbWUsIGludCog bmV3SWQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9E T01BZ2VudC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQu anMKaW5kZXggMjZjMDhjZGQ1NWU5MzhjNzcwZjEwMWFlMDY1ZjZmODY3ZGM3MzNjNi4uMGFmMzgz NTJmMzAwNmRmYWU2ZDYxZTBhYTM2MjFkMjY0MWRlMmQxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5qcworKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzCkBAIC0xMjcsOSArMTI3LDE0IEBAIFdl Ykluc3BlY3Rvci5ET01Ob2RlLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIGF0dHIgPyBh dHRyLnZhbHVlIDogdW5kZWZpbmVkOwogICAgIH0sCiAKLSAgICBzZXRBdHRyaWJ1dGU6IGZ1bmN0 aW9uKG5hbWUsIHZhbHVlLCBjYWxsYmFjaykKKyAgICBzZXRBdHRyaWJ1dGU6IGZ1bmN0aW9uKG5h bWUsIHRleHQsIGNhbGxiYWNrKQogICAgIHsKLSAgICAgICAgRE9NQWdlbnQuc2V0QXR0cmlidXRl KHRoaXMuaWQsIG5hbWUsIHZhbHVlLCBjYWxsYmFjayk7CisgICAgICAgIERPTUFnZW50LnNldEF0 dHJpYnV0ZXNUZXh0KHRoaXMuaWQsIG5hbWUsIHRleHQsIGNhbGxiYWNrKTsKKyAgICB9LAorCisg ICAgc2V0QXR0cmlidXRlVmFsdWU6IGZ1bmN0aW9uKG5hbWUsIHZhbHVlLCBjYWxsYmFjaykKKyAg ICB7CisgICAgICAgIERPTUFnZW50LnNldEF0dHJpYnV0ZVZhbHVlKHRoaXMuaWQsIG5hbWUsIHZh bHVlLCBjYWxsYmFjayk7CiAgICAgfSwKIAogICAgIGF0dHJpYnV0ZXM6IGZ1bmN0aW9uKCkK