43434 2010-08-03 10:35:49 -0700 Web Inspector: Relative URL Link Tooltips do not respect <base> 2012-09-25 02:01:41 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED HasReduction P2 Normal --- 1 joepeck apavlov apavlov bweinstein joepeck keishi pfeldman pmuellr rik yurys oldest_to_newest 259532 0 63348 joepeck 2010-08-03 10:35:49 -0700 Created attachment 63348 [TEST] Basic base-test.html Tooltips for relative URL links show up incorrectly. They appear to show using the documentURL instead of the <base> if one is defined. The HTML5 spec also mentions that xml:base could affect the real link in the end. Example: (file:///Users/joe/Desktop/base-test.html) <!DOCTYPE html> <html> <head> <title>This is an example for the <base> element</title> <base href="http://www.example.com/news/index.html"> </head> <body> <p>Visit the <a href="archives.html">archives</a>.</p> </body> </html> Hovering the link in the Elements heirarchy gives: [incorrect] file:///Users/joe/Desktop/archives.html Clicking the link gives: [correct] http://www.example.com/news/archives.html Attached test case for a basic page, and another using an iframe. 259534 1 63349 joepeck 2010-08-03 10:37:23 -0700 Created attachment 63349 [TEST] base-test-iframe.html This tests with an <iframe> containing the basic base-test, as it might have its own <base>. 508126 2 apavlov 2011-11-23 07:31:19 -0800 (In reply to comment #1) > Created an attachment (id=63349) [details] > [TEST] base-test-iframe.html > > This tests with an <iframe> containing the basic base-test, as > it might have its own <base>. I've got a patch for this, but it appears that a document's base URL can be updated at any time, and with iframes it happens AFTER the iframed document has been pushed into the frontend (which is the moment its baseURL was retrieved for pushing into the frontend), so we tentatively need to introduce a corresponding notification event. 724485 3 164908 apavlov 2012-09-20 06:39:33 -0700 Created attachment 164908 Patch 725417 4 164908 pfeldman 2012-09-21 04:33:07 -0700 Comment on attachment 164908 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=164908&action=review > Source/WebCore/inspector/Inspector.json:1569 > { "name": "documentURL", "type": "string", "optional": true, "description": "Document URL that <code>Document</code> or <code>FrameOwner</code> node points to." }, Could you look up what we use the documentURL for today? > Source/WebCore/inspector/InspectorDOMAgent.cpp:1182 > + baseURL = ((baseURL.isEmpty() || baseURL == blankURL()) && document->parentDocument()) ? document->parentDocument()->baseURL() : baseURL; Could you use document::completeURL("") to make sure we are consistent with core? > Source/WebCore/inspector/InspectorDOMAgent.cpp:1250 > + String baseURL = documentBaseURLString(document); I'd suggest to always send baseURL for documents. 726581 5 apavlov 2012-09-24 05:43:44 -0700 (In reply to comment #4) > (From update of attachment 164908 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=164908&action=review > > > Source/WebCore/inspector/Inspector.json:1569 > > { "name": "documentURL", "type": "string", "optional": true, "description": "Document URL that <code>Document</code> or <code>FrameOwner</code> node points to." }, > > Could you look up what we use the documentURL for today? Lots of necessary things... > > Source/WebCore/inspector/InspectorDOMAgent.cpp:1182 > > + baseURL = ((baseURL.isEmpty() || baseURL == blankURL()) && document->parentDocument()) ? document->parentDocument()->baseURL() : baseURL; > > Could you use document::completeURL("") to make sure we are consistent with core? Done. > > Source/WebCore/inspector/InspectorDOMAgent.cpp:1250 > > + String baseURL = documentBaseURLString(document); > > I'd suggest to always send baseURL for documents. Done. 726583 6 165360 apavlov 2012-09-24 05:44:03 -0700 Created attachment 165360 Patch 726597 7 165365 apavlov 2012-09-24 06:15:49 -0700 Created attachment 165365 Patch 726750 8 165365 pfeldman 2012-09-24 09:35:41 -0700 Comment on attachment 165365 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=165365&action=review > Source/WebCore/inspector/InspectorDOMAgent.cpp:1247 > + String documentURL = documentURLString(document); Nit: no need for these intermediate variables. 727419 9 apavlov 2012-09-25 02:01:41 -0700 Committed r129477: <http://trac.webkit.org/changeset/129477> 63348 2010-08-03 10:35:49 -0700 2010-08-03 10:35:49 -0700 [TEST] Basic base-test.html base-test.html text/html 244 joepeck PCFET0NUWVBFIGh0bWw+CjxodG1sPgo8aGVhZD4KICAgIDx0aXRsZT5UaGlzIGlzIGFuIGV4YW1w bGUgZm9yIHRoZSAmbHQ7YmFzZSZndDsgZWxlbWVudDwvdGl0bGU+CiAgICA8YmFzZSBocmVmPSJo dHRwOi8vd3d3LmV4YW1wbGUuY29tL25ld3MvaW5kZXguaHRtbCI+CjwvaGVhZD4KPGJvZHk+CiAg ICA8cD5WaXNpdCB0aGUgPGEgaHJlZj0iYXJjaGl2ZXMuaHRtbCI+YXJjaGl2ZXM8L2E+LjwvcD4K PC9ib2R5Pgo8L2h0bWw+Cg== 63349 2010-08-03 10:37:23 -0700 2010-08-03 10:37:23 -0700 [TEST] base-test-iframe.html base-test-iframe.html text/html 221 joepeck PCFET0NUWVBFIGh0bWw+CjxodG1sPgo8aGVhZD4KICAgIDx0aXRsZT5UaGlzIGlzIGFuIGV4YW1w bGUgZm9yIHRoZSAmbHQ7YmFzZSZndDsgZWxlbWVudDwvdGl0bGU+CjwvaGVhZD4KPGJvZHk+CiAg ICA8aWZyYW1lIHNyYz0iaHR0cHM6Ly9idWctNDM0MzQtYXR0YWNobWVudHMud2Via2l0Lm9yZy9h dHRhY2htZW50LmNnaT9pZD02MzM0OCI+PC9pZnJhbWU+CjwvYm9keT4KPC9odG1sPgo= 164908 2012-09-20 06:39:33 -0700 2012-09-24 05:43:58 -0700 Patch bug-43434-20120920173857.patch text/plain 11784 apavlov U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5MTE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWQzYWE4ZjRiYmI2Zjc3 YTc0MzdiMWM1ZTY2MWI5NzEzMTE5Mzk4ZS4uNjczMWJlOTMwMDI0N2VjY2QyZDk1Y2YxOTc4ZTU2 ZjA2YTg1Y2JhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTA5LTIwICBBbGV4 YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogUmVsYXRpdmUgVVJMIExpbmsgVG9vbHRpcHMgZG8gbm90IHJlc3BlY3QgPGJhc2U+Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MzQzNAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5ldyAiYmFzZVVS TCIgZmllbGQgYWRkZWQgaW50byB0aGUgRE9NLk5vZGUgcGF5bG9hZCBmb3IgZG9jdW1lbnQgbm9k ZXMgYW5kIGlzIG1hZGUgdXNlIG9mIHdoaWxlIHJlc29sdmluZyBhbmQgY29tcGxldGluZyBVUkxz LiAKKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3IuanNvbjoKKyAgICAgICAgKiBpbnNw ZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6ZG9jdW1lbnRC YXNlVVJMU3RyaW5nKToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6SW5z cGVjdG9yRE9NQWdlbnQ6OmJ1aWxkT2JqZWN0Rm9yTm9kZSk6CisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9BdWRpdFJ1bGVzLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkF1ZGl0UnVs ZXMuSW1hZ2VEaW1lbnNpb25zUnVsZS5wcm90b3R5cGUuZG9SdW4pOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkF1ZGl0UnVsZXMuQ3NzSW5IZWFkUnVsZS5wcm90b3R5cGUuZG9SdW4uZXh0ZXJuYWxT dHlsZXNoZWV0c1JlY2VpdmVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5BdWRpdFJ1bGVzLlN0 eWxlc1NjcmlwdHNPcmRlclJ1bGUucHJvdG90eXBlLmRvUnVuLmNzc0JlZm9yZUlubGluZVJlY2Vp dmVkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkRPTU5vZGUucHJvdG90eXBlLnJlc29sdmVVUkwpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkRPTURvY3VtZW50KToKKwogMjAxMi0wOS0yMCAgT3R0byBEZXJlayBDaGV1 bmcgIDxvdGNoZXVuZ0ByaW0uY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IENvb2tpZSBp bmZvIGluIE5ldHdvcmsgUmVzb3VyY2VzIENvb2tpZXMgdGFiIGFyZSBpbmNvcnJlY3QKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbiBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgppbmRleCA1YzE4ZGFkOTU1MWVjMjMyODk4 M2FjZjE4MmY5NjYxZmY4ZTc2NjY3Li5jODk3ZTI0NjZiOTZjMmM3MTFiZjhjYzg0OGI3NThiZTll MzEzNDBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpz b24KKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCkBAIC0xNTY3 LDYgKzE1NjcsNyBAQAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImNoaWxkcmVuIiwg InR5cGUiOiAiYXJyYXkiLCAib3B0aW9uYWwiOiB0cnVlLCAiaXRlbXMiOiB7ICIkcmVmIjogIk5v ZGUiIH0sICJkZXNjcmlwdGlvbiI6ICJDaGlsZCBub2RlcyBvZiB0aGlzIG5vZGUgd2hlbiByZXF1 ZXN0ZWQgd2l0aCBjaGlsZHJlbi4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAi YXR0cmlidXRlcyIsICJ0eXBlIjogImFycmF5IiwgIm9wdGlvbmFsIjogdHJ1ZSwgIml0ZW1zIjog eyAidHlwZSI6ICJzdHJpbmciIH0sICJkZXNjcmlwdGlvbiI6ICJBdHRyaWJ1dGVzIG9mIHRoZSA8 Y29kZT5FbGVtZW50PC9jb2RlPiBub2RlIGluIHRoZSBmb3JtIG9mIGZsYXQgYXJyYXkgPGNvZGU+ W25hbWUxLCB2YWx1ZTEsIG5hbWUyLCB2YWx1ZTJdPC9jb2RlPi4iIH0sCiAgICAgICAgICAgICAg ICAgICAgIHsgIm5hbWUiOiAiZG9jdW1lbnRVUkwiLCAidHlwZSI6ICJzdHJpbmciLCAib3B0aW9u YWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiRG9jdW1lbnQgVVJMIHRoYXQgPGNvZGU+RG9jdW1l bnQ8L2NvZGU+IG9yIDxjb2RlPkZyYW1lT3duZXI8L2NvZGU+IG5vZGUgcG9pbnRzIHRvLiIgfSwK KyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJiYXNlVVJMIiwgInR5cGUiOiAic3RyaW5n IiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIkJhc2UgVVJMIHRoYXQgPGNvZGU+ RG9jdW1lbnQ8L2NvZGU+IG9yIDxjb2RlPkZyYW1lT3duZXI8L2NvZGU+IG5vZGUgdXNlcyBmb3Ig VVJMIGNvbXBsZXRpb24uIEFic2VudCBpZiBpdCBpcyB0aGUgc2FtZSBhcyBkb2N1bWVudFVSTC4i IH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicHVibGljSWQiLCAidHlwZSI6ICJz dHJpbmciLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiPGNvZGU+RG9jdW1lbnRU eXBlPC9jb2RlPidzIHB1YmxpY0lkLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6 ICJzeXN0ZW1JZCIsICJ0eXBlIjogInN0cmluZyIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlw dGlvbiI6ICI8Y29kZT5Eb2N1bWVudFR5cGU8L2NvZGU+J3Mgc3lzdGVtSWQuIiB9LAogICAgICAg ICAgICAgICAgICAgICB7ICJuYW1lIjogImludGVybmFsU3Vic2V0IiwgInR5cGUiOiAic3RyaW5n IiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIjxjb2RlPkRvY3VtZW50VHlwZTwv Y29kZT4ncyBpbnRlcm5hbFN1YnNldC4iIH0sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckRPTUFnZW50LmNwcAppbmRleCA0NDkxNDg3YjM2Y2YwOWRlOGUzOTZjMjY3Yjdi NDRmOGY0NDYyOTk2Li4yYjE2NGI0NDBjNDExYWZhMDdmYmIzZDNiNjJhMTYwMDk3NmMwZjhlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAKQEAg LTExNzYsNiArMTE3NiwxMyBAQCBTdHJpbmcgSW5zcGVjdG9yRE9NQWdlbnQ6OmRvY3VtZW50VVJM U3RyaW5nKERvY3VtZW50KiBkb2N1bWVudCkKICAgICByZXR1cm4gZG9jdW1lbnQtPnVybCgpLnN0 cmluZygpOwogfQogCitzdGF0aWMgU3RyaW5nIGRvY3VtZW50QmFzZVVSTFN0cmluZyhEb2N1bWVu dCogZG9jdW1lbnQpCit7CisgICAgS1VSTCBiYXNlVVJMID0gZG9jdW1lbnQtPmJhc2VVUkwoKTsK KyAgICBiYXNlVVJMID0gKChiYXNlVVJMLmlzRW1wdHkoKSB8fCBiYXNlVVJMID09IGJsYW5rVVJM KCkpICYmIGRvY3VtZW50LT5wYXJlbnREb2N1bWVudCgpKSA/IGRvY3VtZW50LT5wYXJlbnREb2N1 bWVudCgpLT5iYXNlVVJMKCkgOiBiYXNlVVJMOworICAgIHJldHVybiBiYXNlVVJMLnN0cmluZygp OworfQorCiBQYXNzUmVmUHRyPFR5cGVCdWlsZGVyOjpET006Ok5vZGU+IEluc3BlY3RvckRPTUFn ZW50OjpidWlsZE9iamVjdEZvck5vZGUoTm9kZSogbm9kZSwgaW50IGRlcHRoLCBOb2RlVG9JZE1h cCogbm9kZXNNYXApCiB7CiAgICAgaW50IGlkID0gYmluZChub2RlLCBub2Rlc01hcCk7CkBAIC0x MjM5LDcgKzEyNDYsMTEgQEAgUGFzc1JlZlB0cjxUeXBlQnVpbGRlcjo6RE9NOjpOb2RlPiBJbnNw ZWN0b3JET01BZ2VudDo6YnVpbGRPYmplY3RGb3JOb2RlKE5vZGUqIG4KICAgICAgICAgfQogICAg IH0gZWxzZSBpZiAobm9kZS0+aXNEb2N1bWVudE5vZGUoKSkgewogICAgICAgICBEb2N1bWVudCog ZG9jdW1lbnQgPSBzdGF0aWNfY2FzdDxEb2N1bWVudCo+KG5vZGUpOwotICAgICAgICB2YWx1ZS0+ c2V0RG9jdW1lbnRVUkwoZG9jdW1lbnRVUkxTdHJpbmcoZG9jdW1lbnQpKTsKKyAgICAgICAgU3Ry aW5nIGRvY3VtZW50VVJMID0gZG9jdW1lbnRVUkxTdHJpbmcoZG9jdW1lbnQpOworICAgICAgICBT dHJpbmcgYmFzZVVSTCA9IGRvY3VtZW50QmFzZVVSTFN0cmluZyhkb2N1bWVudCk7CisgICAgICAg IHZhbHVlLT5zZXREb2N1bWVudFVSTChkb2N1bWVudFVSTCk7CisgICAgICAgIGlmIChiYXNlVVJM ICE9IGRvY3VtZW50VVJMKQorICAgICAgICAgICAgdmFsdWUtPnNldEJhc2VVUkwoYmFzZVVSTCk7 CiAgICAgICAgIHZhbHVlLT5zZXRYbWxWZXJzaW9uKGRvY3VtZW50LT54bWxWZXJzaW9uKCkpOwog ICAgIH0gZWxzZSBpZiAobm9kZS0+bm9kZVR5cGUoKSA9PSBOb2RlOjpET0NVTUVOVF9UWVBFX05P REUpIHsKICAgICAgICAgRG9jdW1lbnRUeXBlKiBkb2NUeXBlID0gc3RhdGljX2Nhc3Q8RG9jdW1l bnRUeXBlKj4obm9kZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0F1ZGl0UnVsZXMuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0F1ZGl0UnVsZXMuanMKaW5kZXggZTkxZjI3MDY0ZjM5MDg3ZjAyOTlkOTI3MmI1Y2E5NjVkNWZj YTlkOC4uMTRiNTlhYzQ3YTMxY2QxNmJhMzcxY2Y0N2U5MDM3YTliYzIxNDMwNyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BdWRpdFJ1bGVzLmpzCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQXVkaXRSdWxlcy5qcwpAQCAtNzU1 LDggKzc1NSw4IEBAIFdlYkluc3BlY3Rvci5BdWRpdFJ1bGVzLkltYWdlRGltZW5zaW9uc1J1bGUu cHJvdG90eXBlID0gewogICAgICAgICAgICAgdmFyIHNyYyA9IG5vZGUuZ2V0QXR0cmlidXRlKCJz cmMiKTsKICAgICAgICAgICAgIGlmICghc3JjLmFzUGFyc2VkVVJMKCkpIHsKICAgICAgICAgICAg ICAgICBmb3IgKHZhciBmcmFtZU93bmVyQ2FuZGlkYXRlID0gbm9kZTsgZnJhbWVPd25lckNhbmRp ZGF0ZTsgZnJhbWVPd25lckNhbmRpZGF0ZSA9IGZyYW1lT3duZXJDYW5kaWRhdGUucGFyZW50Tm9k ZSkgewotICAgICAgICAgICAgICAgICAgICBpZiAoZnJhbWVPd25lckNhbmRpZGF0ZS5kb2N1bWVu dFVSTCkgewotICAgICAgICAgICAgICAgICAgICAgICAgdmFyIGNvbXBsZXRlU3JjID0gV2ViSW5z cGVjdG9yLlBhcnNlZFVSTC5jb21wbGV0ZVVSTChmcmFtZU93bmVyQ2FuZGlkYXRlLmRvY3VtZW50 VVJMLCBzcmMpOworICAgICAgICAgICAgICAgICAgICBpZiAoZnJhbWVPd25lckNhbmRpZGF0ZS5i YXNlVVJMKSB7CisgICAgICAgICAgICAgICAgICAgICAgICB2YXIgY29tcGxldGVTcmMgPSBXZWJJ bnNwZWN0b3IuUGFyc2VkVVJMLmNvbXBsZXRlVVJMKGZyYW1lT3duZXJDYW5kaWRhdGUuYmFzZVVS TCwgc3JjKTsKICAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAg ICAgICB9CiAgICAgICAgICAgICAgICAgfQpAQCAtOTAyLDcgKzkwMiw3IEBAIFdlYkluc3BlY3Rv ci5BdWRpdFJ1bGVzLkNzc0luSGVhZFJ1bGUucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAg IHZhciBleHRlcm5hbFN0eWxlc2hlZXRIcmVmcyA9IFtdOwogICAgICAgICAgICAgICAgIGZvciAo dmFyIGogPSAwOyBqIDwgZXh0ZXJuYWxTdHlsZXNoZWV0Tm9kZUlkcy5sZW5ndGg7ICsraikgewog ICAgICAgICAgICAgICAgICAgICB2YXIgbGlua05vZGUgPSBXZWJJbnNwZWN0b3IuZG9tQWdlbnQu bm9kZUZvcklkKGV4dGVybmFsU3R5bGVzaGVldE5vZGVJZHNbal0pOwotICAgICAgICAgICAgICAg ICAgICB2YXIgY29tcGxldGVIcmVmID0gV2ViSW5zcGVjdG9yLlBhcnNlZFVSTC5jb21wbGV0ZVVS TChsaW5rTm9kZS5vd25lckRvY3VtZW50LmRvY3VtZW50VVJMLCBsaW5rTm9kZS5nZXRBdHRyaWJ1 dGUoImhyZWYiKSk7CisgICAgICAgICAgICAgICAgICAgIHZhciBjb21wbGV0ZUhyZWYgPSBXZWJJ bnNwZWN0b3IuUGFyc2VkVVJMLmNvbXBsZXRlVVJMKGxpbmtOb2RlLm93bmVyRG9jdW1lbnQuYmFz ZVVSTCwgbGlua05vZGUuZ2V0QXR0cmlidXRlKCJocmVmIikpOwogICAgICAgICAgICAgICAgICAg ICBleHRlcm5hbFN0eWxlc2hlZXRIcmVmcy5wdXNoKGNvbXBsZXRlSHJlZiB8fCAiPGVtcHR5PiIp OwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICB1cmxUb1Zpb2xhdGlvbnNBcnJh eVtyb290LmRvY3VtZW50VVJMXSA9IFtpbmxpbmVTdHlsZU5vZGVJZHMubGVuZ3RoLCBleHRlcm5h bFN0eWxlc2hlZXRIcmVmc107CkBAIC05ODksNyArOTg5LDcgQEAgV2ViSW5zcGVjdG9yLkF1ZGl0 UnVsZXMuU3R5bGVzU2NyaXB0c09yZGVyUnVsZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAg ICAgdmFyIGxhdGVTdHlsZVVybHMgPSBbXTsKICAgICAgICAgICAgICAgICBmb3IgKHZhciBpID0g MDsgaSA8IGxhdGVTdHlsZUlkcy5sZW5ndGg7ICsraSkgewogICAgICAgICAgICAgICAgICAgICB2 YXIgbGF0ZVN0eWxlTm9kZSA9IFdlYkluc3BlY3Rvci5kb21BZ2VudC5ub2RlRm9ySWQobGF0ZVN0 eWxlSWRzW2ldKTsKLSAgICAgICAgICAgICAgICAgICAgdmFyIGNvbXBsZXRlSHJlZiA9IFdlYklu c3BlY3Rvci5QYXJzZWRVUkwuY29tcGxldGVVUkwobGF0ZVN0eWxlTm9kZS5vd25lckRvY3VtZW50 LmRvY3VtZW50VVJMLCBsYXRlU3R5bGVOb2RlLmdldEF0dHJpYnV0ZSgiaHJlZiIpKTsKKyAgICAg ICAgICAgICAgICAgICAgdmFyIGNvbXBsZXRlSHJlZiA9IFdlYkluc3BlY3Rvci5QYXJzZWRVUkwu Y29tcGxldGVVUkwobGF0ZVN0eWxlTm9kZS5vd25lckRvY3VtZW50LmJhc2VVUkwsIGxhdGVTdHls ZU5vZGUuZ2V0QXR0cmlidXRlKCJocmVmIikpOwogICAgICAgICAgICAgICAgICAgICBsYXRlU3R5 bGVVcmxzLnB1c2goY29tcGxldGVIcmVmIHx8ICI8ZW1wdHk+Iik7CiAgICAgICAgICAgICAgICAg fQogICAgICAgICAgICAgICAgIHJlc3VsdCA9IFsgbGF0ZVN0eWxlVXJscywgY3NzQmVmb3JlSW5s aW5lQ291bnQgXTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvRE9NQWdlbnQuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFn ZW50LmpzCmluZGV4IDgxMWZkMmU2ZDI0NWZmNmY0YmMxNTE0MmNiZTAzOTMyNTUwMWMxOWQuLmM2 NTUxOWM3NTc4N2I5ZjhmNjdkNmZhYWRiOGE2Yjg1NmFhNDVmZWYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQuanMKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5qcwpAQCAtNzQ3LDggKzc0Nyw4IEBA IFdlYkluc3BlY3Rvci5ET01Ob2RlLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKCF1cmwpCiAg ICAgICAgICAgICByZXR1cm4gdXJsOwogICAgICAgICBmb3IgKHZhciBmcmFtZU93bmVyQ2FuZGlk YXRlID0gdGhpczsgZnJhbWVPd25lckNhbmRpZGF0ZTsgZnJhbWVPd25lckNhbmRpZGF0ZSA9IGZy YW1lT3duZXJDYW5kaWRhdGUucGFyZW50Tm9kZSkgewotICAgICAgICAgICAgaWYgKGZyYW1lT3du ZXJDYW5kaWRhdGUuZG9jdW1lbnRVUkwpCi0gICAgICAgICAgICAgICAgcmV0dXJuIFdlYkluc3Bl Y3Rvci5QYXJzZWRVUkwuY29tcGxldGVVUkwoZnJhbWVPd25lckNhbmRpZGF0ZS5kb2N1bWVudFVS TCwgdXJsKTsKKyAgICAgICAgICAgIGlmIChmcmFtZU93bmVyQ2FuZGlkYXRlLmJhc2VVUkwpCisg ICAgICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5QYXJzZWRVUkwuY29tcGxldGVVUkwo ZnJhbWVPd25lckNhbmRpZGF0ZS5iYXNlVVJMLCB1cmwpOwogICAgICAgICB9CiAgICAgICAgIHJl dHVybiBudWxsOwogICAgIH0KQEAgLTc2NCw2ICs3NjQsNyBAQCBXZWJJbnNwZWN0b3IuRE9NRG9j dW1lbnQgPSBmdW5jdGlvbihkb21BZ2VudCwgcGF5bG9hZCkKIHsKICAgICBXZWJJbnNwZWN0b3Iu RE9NTm9kZS5jYWxsKHRoaXMsIGRvbUFnZW50LCB0aGlzLCBmYWxzZSwgcGF5bG9hZCk7CiAgICAg dGhpcy5kb2N1bWVudFVSTCA9IHBheWxvYWQuZG9jdW1lbnRVUkwgfHwgIiI7CisgICAgdGhpcy5i YXNlVVJMID0gcGF5bG9hZC5iYXNlVVJMIHx8IHRoaXMuZG9jdW1lbnRVUkw7CiAgICAgdGhpcy54 bWxWZXJzaW9uID0gcGF5bG9hZC54bWxWZXJzaW9uOwogICAgIHRoaXMuX2xpc3RlbmVycyA9IHt9 OwogfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCmluZGV4IDJjNTBlNzAxYzZjNTcwZjBmMWNmZTQ5ZWUxMjFlYWM4OGY1OGZhYmQuLjQ2 YmQxYjVkZGRlOGRiMmQ3NGJkODRkZDVlNTk4Y2M3MjNjY2FiY2EgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NiBAQAorMjAxMi0wOS0yMCAgQWxleGFuZGVyIFBhdmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3Jn PgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJlbGF0aXZlIFVSTCBMaW5rIFRvb2x0aXBzIGRv IG5vdCByZXNwZWN0IDxiYXNlPgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NDM0MzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBBZGRlZCBhbiBpZnJhbWUgY29udGFpbmluZyB0aGUgPGJhc2U+IHRhZyB0byB0 ZXN0IERPTU5vZGUucHJvdG90eXBlLnJlc29sdmVVUkwoKSB3aXRoIGEgbm9uLXRyaXZpYWwgYmFz ZVVSTC4KKworICAgICAgICAqIGluc3BlY3Rvci9lbGVtZW50cy9lbGVtZW50cy1wYW5lbC1yZXdy aXRlLWhyZWYuaHRtbDoKKyAgICAgICAgKiBpbnNwZWN0b3IvZWxlbWVudHMvZWxlbWVudHMtcGFu ZWwtcmV3cml0ZS1ocmVmLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBpbnNwZWN0b3IvZWxlbWVu dHMvcmVzb3VyY2VzL2VsZW1lbnRzLXBhbmVsLXJld3JpdGUtaHJlZi1pZnJhbWUuaHRtbDogQWRk ZWQuCisKIDIwMTItMDktMjAgIE90dG8gRGVyZWsgQ2hldW5nICA8b3RjaGV1bmdAcmltLmNvbT4K IAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBDb29raWUgaW5mbyBpbiBOZXR3b3JrIFJlc291cmNl cyBDb29raWVzIHRhYiBhcmUgaW5jb3JyZWN0CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvZWxlbWVudHMvZWxlbWVudHMtcGFuZWwtcmV3cml0ZS1ocmVmLWV4cGVjdGVkLnR4dCBi L0xheW91dFRlc3RzL2luc3BlY3Rvci9lbGVtZW50cy9lbGVtZW50cy1wYW5lbC1yZXdyaXRlLWhy ZWYtZXhwZWN0ZWQudHh0CmluZGV4IDE0NDJhZDhiNjdiY2YyNWE3MjFiMTBlNzBjOTVmYTMzNmRk OTdjOTguLmI2NjdlYWE2MWVhOTdlY2I0MzUxZTIxMWJhZWI3YTNhYThhOWI2NGUgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9lbGVtZW50cy9lbGVtZW50cy1wYW5lbC1yZXdyaXRl LWhyZWYtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9lbGVtZW50cy9l bGVtZW50cy1wYW5lbC1yZXdyaXRlLWhyZWYtZXhwZWN0ZWQudHh0CkBAIC0xLDggKzEsMTIgQEAK IFRlc3RzIHRoYXQgc3JjIGFuZCBocmVmIGVsZW1lbnQgdGFyZ2V0cyBhcmUgcmV3cml0dGVuIHBy b3Blcmx5LgogCisKICBqYXZhc2NyaXB0OmFsZXJ0KCdmb28nKSAKICxib2d1c1NoZWV0MS5jc3MK IGluc3BlY3RvcixlbGVtZW50cyxib2d1c1NoZWV0Mi5jc3MKIHRlc3RzLGluc3BlY3RvcixpbnNw ZWN0b3ItdGVzdC5qcwogdGVzdHMsaW5zcGVjdG9yLGVsZW1lbnRzLXRlc3QuanMKK2h0dHA6Ly8x MjcuMC4wLjEvc3R5bGVzaGVldC5jc3MKK2h0dHA6Ly8xMjcuMC4wLjEvc2NyaXB0LmpzCitodHRw Oi8vMTI3LjAuMC4xL3RhcmdldC5odG1sCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9lbGVtZW50cy9lbGVtZW50cy1wYW5lbC1yZXdyaXRlLWhyZWYuaHRtbCBiL0xheW91dFRl c3RzL2luc3BlY3Rvci9lbGVtZW50cy9lbGVtZW50cy1wYW5lbC1yZXdyaXRlLWhyZWYuaHRtbApp bmRleCAxY2VjMmNhYTBkNTE3MzIyYzU0MDdlZDFjNmUzMTgyMzFlZGVhMDdmLi5kMmQ1ZDM2Y2Zh ZWM3Y2I2MDRlNzVmM2U4ZTEyYWZkYzlmMjdlNDAzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvZWxlbWVudHMvZWxlbWVudHMtcGFuZWwtcmV3cml0ZS1ocmVmLmh0bWwKKysrIGIv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRzL2VsZW1lbnRzLXBhbmVsLXJld3JpdGUtaHJl Zi5odG1sCkBAIC0yNCw2ICsyNCwxMCBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgICAgICAg ICAgICAgc2VnbWVudHMucHVzaCgiPGVtcHR5PiIpOwogICAgICAgICAgICAgICAgICAgICBjb250 aW51ZTsKICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgaWYgKGhyZWYuc3RhcnRz V2l0aCgiaHR0cDoiKSkgeworICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJl c3VsdChocmVmKTsKKyAgICAgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICAg ICAgfQogICAgICAgICAgICAgICAgIHZhciBwYXJzZWRVUkwgPSBocmVmLmFzUGFyc2VkVVJMKCk7 CiAgICAgICAgICAgICAgICAgaWYgKCFwYXJzZWRVUkwpCiAgICAgICAgICAgICAgICAgICAgIHRl c3RDb250cm9sbGVyLm5vdGlmeURvbmUoIkZBSUw6IG5vIFVSTCBtYXRjaCBmb3IgPCIgKyBocmVm ICsgIj4iKTsKQEAgLTQyLDEyICs0NiwxMiBAQCBmdW5jdGlvbiB0ZXN0KCkKIDwvc2NyaXB0Pgog PC9oZWFkPgogCi08Ym9keSBvbmxvYWQ9InJ1blRlc3QoKSI+Cis8Ym9keT4KIDxwPgogVGVzdHMg dGhhdCBzcmMgYW5kIGhyZWYgZWxlbWVudCB0YXJnZXRzIGFyZSByZXdyaXR0ZW4gcHJvcGVybHku CiA8L3A+CiAKIDxhIHN0eWxlPSJkaXNwbGF5Om5vbmUiIGhyZWY9IiBqYXZhc2NyaXB0OmFsZXJ0 KCdmb28nKSAiPjwvYT4KLQorPGlmcmFtZSBzcmM9InJlc291cmNlcy9lbGVtZW50cy1wYW5lbC1y ZXdyaXRlLWhyZWYtaWZyYW1lLmh0bWwiIG9ubG9hZD0icnVuVGVzdCgpIj48L2lmcmFtZT4KIDwv Ym9keT4KIDwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9lbGVtZW50 cy9yZXNvdXJjZXMvZWxlbWVudHMtcGFuZWwtcmV3cml0ZS1ocmVmLWlmcmFtZS5odG1sIGIvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRzL3Jlc291cmNlcy9lbGVtZW50cy1wYW5lbC1yZXdy aXRlLWhyZWYtaWZyYW1lLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMDliYjUzZjJkYTQ3NWM2MzMwZGIzOTlj NzJmYTFjYzIwNzkxMGQwOAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rv ci9lbGVtZW50cy9yZXNvdXJjZXMvZWxlbWVudHMtcGFuZWwtcmV3cml0ZS1ocmVmLWlmcmFtZS5o dG1sCkBAIC0wLDAgKzEsMTAgQEAKKzxodG1sPgorPGhlYWQ+Cis8YmFzZSBocmVmPSJodHRwOi8v MTI3LjAuMC4xIj4KKzxsaW5rIHJlbD0ic3R5bGVzaGVldCIgc3JjPSJzdHlsZXNoZWV0LmNzcyI+ Cis8c2NyaXB0IHNyYz0ic2NyaXB0LmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorPGEg aHJlZj0idGFyZ2V0Lmh0bWwiPjwvYT4KKzwvYm9keT4KKzwvaHRtbD4K 165360 2012-09-24 05:44:03 -0700 2012-09-24 06:15:43 -0700 Patch bug-43434-20120924164324.patch text/plain 11528 apavlov U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5MzUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzNkYjVlZjRjYWRmMTY0 MWMwYzUzMTg4MWZmZDI0OGRhNGI1NjgxNy4uMDA0MWI2NzMzOWQ4NzUxYzM4NDBlODM1NjUyMjli N2I4YzE2ODI5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTA5LTIwICBBbGV4 YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogUmVsYXRpdmUgVVJMIExpbmsgVG9vbHRpcHMgZG8gbm90IHJlc3BlY3QgPGJhc2U+Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MzQzNAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5ldyAiYmFzZVVS TCIgZmllbGQgYWRkZWQgaW50byB0aGUgRE9NLk5vZGUgcGF5bG9hZCBmb3IgZG9jdW1lbnQgbm9k ZXMgYW5kIGlzIG1hZGUgdXNlIG9mIHdoaWxlIHJlc29sdmluZyBhbmQgY29tcGxldGluZyBVUkxz LgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uOgorICAgICAgICAqIGluc3Bl Y3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpkb2N1bWVudEJh c2VVUkxTdHJpbmcpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNw ZWN0b3JET01BZ2VudDo6YnVpbGRPYmplY3RGb3JOb2RlKToKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZnJvbnQtZW5kL0F1ZGl0UnVsZXMuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQXVkaXRSdWxl cy5JbWFnZURpbWVuc2lvbnNSdWxlLnByb3RvdHlwZS5kb1J1bik6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuQXVkaXRSdWxlcy5Dc3NJbkhlYWRSdWxlLnByb3RvdHlwZS5kb1J1bi5leHRlcm5hbFN0 eWxlc2hlZXRzUmVjZWl2ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZXMuU3R5 bGVzU2NyaXB0c09yZGVyUnVsZS5wcm90b3R5cGUuZG9SdW4uY3NzQmVmb3JlSW5saW5lUmVjZWl2 ZWQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuRE9NTm9kZS5wcm90b3R5cGUucmVzb2x2ZVVSTCk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuRE9NRG9jdW1lbnQpOgorCiAyMDEyLTA5LTI0ICBQYXZlbCBGZWxkbWFuICA8 cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6RVhDX0JBRF9B Q0NFU1MgdXBvbiBjbG9zaW5nIHBhZ2Ugd2l0aCBub2RlIGhpZ2hsaWdodGVkCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24gYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KaW5kZXggNWMxOGRhZDk1NTFlYzIzMjg5ODNhY2Yx ODJmOTY2MWZmOGU3NjY2Ny4uYzg5N2UyNDY2Yjk2YzJjNzExYmY4Y2M4NDhiNzU4YmU5ZTMxMzQw ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgpAQCAtMTU2Nyw2ICsx NTY3LDcgQEAKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJjaGlsZHJlbiIsICJ0eXBl IjogImFycmF5IiwgIm9wdGlvbmFsIjogdHJ1ZSwgIml0ZW1zIjogeyAiJHJlZiI6ICJOb2RlIiB9 LCAiZGVzY3JpcHRpb24iOiAiQ2hpbGQgbm9kZXMgb2YgdGhpcyBub2RlIHdoZW4gcmVxdWVzdGVk IHdpdGggY2hpbGRyZW4uIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImF0dHJp YnV0ZXMiLCAidHlwZSI6ICJhcnJheSIsICJvcHRpb25hbCI6IHRydWUsICJpdGVtcyI6IHsgInR5 cGUiOiAic3RyaW5nIiB9LCAiZGVzY3JpcHRpb24iOiAiQXR0cmlidXRlcyBvZiB0aGUgPGNvZGU+ RWxlbWVudDwvY29kZT4gbm9kZSBpbiB0aGUgZm9ybSBvZiBmbGF0IGFycmF5IDxjb2RlPltuYW1l MSwgdmFsdWUxLCBuYW1lMiwgdmFsdWUyXTwvY29kZT4uIiB9LAogICAgICAgICAgICAgICAgICAg ICB7ICJuYW1lIjogImRvY3VtZW50VVJMIiwgInR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFsIjog dHJ1ZSwgImRlc2NyaXB0aW9uIjogIkRvY3VtZW50IFVSTCB0aGF0IDxjb2RlPkRvY3VtZW50PC9j b2RlPiBvciA8Y29kZT5GcmFtZU93bmVyPC9jb2RlPiBub2RlIHBvaW50cyB0by4iIH0sCisgICAg ICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiYmFzZVVSTCIsICJ0eXBlIjogInN0cmluZyIsICJv cHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJCYXNlIFVSTCB0aGF0IDxjb2RlPkRvY3Vt ZW50PC9jb2RlPiBvciA8Y29kZT5GcmFtZU93bmVyPC9jb2RlPiBub2RlIHVzZXMgZm9yIFVSTCBj b21wbGV0aW9uLiBBYnNlbnQgaWYgaXQgaXMgdGhlIHNhbWUgYXMgZG9jdW1lbnRVUkwuIiB9LAog ICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInB1YmxpY0lkIiwgInR5cGUiOiAic3RyaW5n IiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIjxjb2RlPkRvY3VtZW50VHlwZTwv Y29kZT4ncyBwdWJsaWNJZC4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic3lz dGVtSWQiLCAidHlwZSI6ICJzdHJpbmciLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24i OiAiPGNvZGU+RG9jdW1lbnRUeXBlPC9jb2RlPidzIHN5c3RlbUlkLiIgfSwKICAgICAgICAgICAg ICAgICAgICAgeyAibmFtZSI6ICJpbnRlcm5hbFN1YnNldCIsICJ0eXBlIjogInN0cmluZyIsICJv cHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICI8Y29kZT5Eb2N1bWVudFR5cGU8L2NvZGU+ J3MgaW50ZXJuYWxTdWJzZXQuIiB9LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvckRPTUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JET01BZ2VudC5jcHAKaW5kZXggNDQ5MTQ4N2IzNmNmMDlkZThlMzk2YzI2N2I3YjQ0Zjhm NDQ2Mjk5Ni4uYzE2Y2Y2NjYyNGYxNGVlZDc0YTQ3ODk0ZTZlMmM4NjgyMWY5YjVjYSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCkBAIC0xMTc2 LDYgKzExNzYsMTEgQEAgU3RyaW5nIEluc3BlY3RvckRPTUFnZW50Ojpkb2N1bWVudFVSTFN0cmlu ZyhEb2N1bWVudCogZG9jdW1lbnQpCiAgICAgcmV0dXJuIGRvY3VtZW50LT51cmwoKS5zdHJpbmco KTsKIH0KIAorc3RhdGljIFN0cmluZyBkb2N1bWVudEJhc2VVUkxTdHJpbmcoRG9jdW1lbnQqIGRv Y3VtZW50KQoreworICAgIHJldHVybiBkb2N1bWVudC0+Y29tcGxldGVVUkwoIiIpLnN0cmluZygp OworfQorCiBQYXNzUmVmUHRyPFR5cGVCdWlsZGVyOjpET006Ok5vZGU+IEluc3BlY3RvckRPTUFn ZW50OjpidWlsZE9iamVjdEZvck5vZGUoTm9kZSogbm9kZSwgaW50IGRlcHRoLCBOb2RlVG9JZE1h cCogbm9kZXNNYXApCiB7CiAgICAgaW50IGlkID0gYmluZChub2RlLCBub2Rlc01hcCk7CkBAIC0x MjM5LDcgKzEyNDQsMTAgQEAgUGFzc1JlZlB0cjxUeXBlQnVpbGRlcjo6RE9NOjpOb2RlPiBJbnNw ZWN0b3JET01BZ2VudDo6YnVpbGRPYmplY3RGb3JOb2RlKE5vZGUqIG4KICAgICAgICAgfQogICAg IH0gZWxzZSBpZiAobm9kZS0+aXNEb2N1bWVudE5vZGUoKSkgewogICAgICAgICBEb2N1bWVudCog ZG9jdW1lbnQgPSBzdGF0aWNfY2FzdDxEb2N1bWVudCo+KG5vZGUpOwotICAgICAgICB2YWx1ZS0+ c2V0RG9jdW1lbnRVUkwoZG9jdW1lbnRVUkxTdHJpbmcoZG9jdW1lbnQpKTsKKyAgICAgICAgU3Ry aW5nIGRvY3VtZW50VVJMID0gZG9jdW1lbnRVUkxTdHJpbmcoZG9jdW1lbnQpOworICAgICAgICBT dHJpbmcgYmFzZVVSTCA9IGRvY3VtZW50QmFzZVVSTFN0cmluZyhkb2N1bWVudCk7CisgICAgICAg IHZhbHVlLT5zZXREb2N1bWVudFVSTChkb2N1bWVudFVSTCk7CisgICAgICAgIHZhbHVlLT5zZXRC YXNlVVJMKGJhc2VVUkwpOwogICAgICAgICB2YWx1ZS0+c2V0WG1sVmVyc2lvbihkb2N1bWVudC0+ eG1sVmVyc2lvbigpKTsKICAgICB9IGVsc2UgaWYgKG5vZGUtPm5vZGVUeXBlKCkgPT0gTm9kZTo6 RE9DVU1FTlRfVFlQRV9OT0RFKSB7CiAgICAgICAgIERvY3VtZW50VHlwZSogZG9jVHlwZSA9IHN0 YXRpY19jYXN0PERvY3VtZW50VHlwZSo+KG5vZGUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BdWRpdFJ1bGVzLmpzIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9BdWRpdFJ1bGVzLmpzCmluZGV4IGU5MWYyNzA2NGYzOTA4N2YwMjk5 ZDkyNzJiNWNhOTY1ZDVmY2E5ZDguLjE0YjU5YWM0N2EzMWNkMTZiYTM3MWNmNDdlOTAzN2E5YmMy MTQzMDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQXVk aXRSdWxlcy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0F1ZGl0 UnVsZXMuanMKQEAgLTc1NSw4ICs3NTUsOCBAQCBXZWJJbnNwZWN0b3IuQXVkaXRSdWxlcy5JbWFn ZURpbWVuc2lvbnNSdWxlLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHZhciBzcmMgPSBub2Rl LmdldEF0dHJpYnV0ZSgic3JjIik7CiAgICAgICAgICAgICBpZiAoIXNyYy5hc1BhcnNlZFVSTCgp KSB7CiAgICAgICAgICAgICAgICAgZm9yICh2YXIgZnJhbWVPd25lckNhbmRpZGF0ZSA9IG5vZGU7 IGZyYW1lT3duZXJDYW5kaWRhdGU7IGZyYW1lT3duZXJDYW5kaWRhdGUgPSBmcmFtZU93bmVyQ2Fu ZGlkYXRlLnBhcmVudE5vZGUpIHsKLSAgICAgICAgICAgICAgICAgICAgaWYgKGZyYW1lT3duZXJD YW5kaWRhdGUuZG9jdW1lbnRVUkwpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIHZhciBjb21w bGV0ZVNyYyA9IFdlYkluc3BlY3Rvci5QYXJzZWRVUkwuY29tcGxldGVVUkwoZnJhbWVPd25lckNh bmRpZGF0ZS5kb2N1bWVudFVSTCwgc3JjKTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKGZyYW1l T3duZXJDYW5kaWRhdGUuYmFzZVVSTCkgeworICAgICAgICAgICAgICAgICAgICAgICAgdmFyIGNv bXBsZXRlU3JjID0gV2ViSW5zcGVjdG9yLlBhcnNlZFVSTC5jb21wbGV0ZVVSTChmcmFtZU93bmVy Q2FuZGlkYXRlLmJhc2VVUkwsIHNyYyk7CiAgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsK ICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIH0KQEAgLTkwMiw3ICs5MDIs NyBAQCBXZWJJbnNwZWN0b3IuQXVkaXRSdWxlcy5Dc3NJbkhlYWRSdWxlLnByb3RvdHlwZSA9IHsK ICAgICAgICAgICAgICAgICB2YXIgZXh0ZXJuYWxTdHlsZXNoZWV0SHJlZnMgPSBbXTsKICAgICAg ICAgICAgICAgICBmb3IgKHZhciBqID0gMDsgaiA8IGV4dGVybmFsU3R5bGVzaGVldE5vZGVJZHMu bGVuZ3RoOyArK2opIHsKICAgICAgICAgICAgICAgICAgICAgdmFyIGxpbmtOb2RlID0gV2ViSW5z cGVjdG9yLmRvbUFnZW50Lm5vZGVGb3JJZChleHRlcm5hbFN0eWxlc2hlZXROb2RlSWRzW2pdKTsK LSAgICAgICAgICAgICAgICAgICAgdmFyIGNvbXBsZXRlSHJlZiA9IFdlYkluc3BlY3Rvci5QYXJz ZWRVUkwuY29tcGxldGVVUkwobGlua05vZGUub3duZXJEb2N1bWVudC5kb2N1bWVudFVSTCwgbGlu a05vZGUuZ2V0QXR0cmlidXRlKCJocmVmIikpOworICAgICAgICAgICAgICAgICAgICB2YXIgY29t cGxldGVIcmVmID0gV2ViSW5zcGVjdG9yLlBhcnNlZFVSTC5jb21wbGV0ZVVSTChsaW5rTm9kZS5v d25lckRvY3VtZW50LmJhc2VVUkwsIGxpbmtOb2RlLmdldEF0dHJpYnV0ZSgiaHJlZiIpKTsKICAg ICAgICAgICAgICAgICAgICAgZXh0ZXJuYWxTdHlsZXNoZWV0SHJlZnMucHVzaChjb21wbGV0ZUhy ZWYgfHwgIjxlbXB0eT4iKTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgdXJs VG9WaW9sYXRpb25zQXJyYXlbcm9vdC5kb2N1bWVudFVSTF0gPSBbaW5saW5lU3R5bGVOb2RlSWRz Lmxlbmd0aCwgZXh0ZXJuYWxTdHlsZXNoZWV0SHJlZnNdOwpAQCAtOTg5LDcgKzk4OSw3IEBAIFdl Ykluc3BlY3Rvci5BdWRpdFJ1bGVzLlN0eWxlc1NjcmlwdHNPcmRlclJ1bGUucHJvdG90eXBlID0g ewogICAgICAgICAgICAgICAgIHZhciBsYXRlU3R5bGVVcmxzID0gW107CiAgICAgICAgICAgICAg ICAgZm9yICh2YXIgaSA9IDA7IGkgPCBsYXRlU3R5bGVJZHMubGVuZ3RoOyArK2kpIHsKICAgICAg ICAgICAgICAgICAgICAgdmFyIGxhdGVTdHlsZU5vZGUgPSBXZWJJbnNwZWN0b3IuZG9tQWdlbnQu bm9kZUZvcklkKGxhdGVTdHlsZUlkc1tpXSk7Ci0gICAgICAgICAgICAgICAgICAgIHZhciBjb21w bGV0ZUhyZWYgPSBXZWJJbnNwZWN0b3IuUGFyc2VkVVJMLmNvbXBsZXRlVVJMKGxhdGVTdHlsZU5v ZGUub3duZXJEb2N1bWVudC5kb2N1bWVudFVSTCwgbGF0ZVN0eWxlTm9kZS5nZXRBdHRyaWJ1dGUo ImhyZWYiKSk7CisgICAgICAgICAgICAgICAgICAgIHZhciBjb21wbGV0ZUhyZWYgPSBXZWJJbnNw ZWN0b3IuUGFyc2VkVVJMLmNvbXBsZXRlVVJMKGxhdGVTdHlsZU5vZGUub3duZXJEb2N1bWVudC5i YXNlVVJMLCBsYXRlU3R5bGVOb2RlLmdldEF0dHJpYnV0ZSgiaHJlZiIpKTsKICAgICAgICAgICAg ICAgICAgICAgbGF0ZVN0eWxlVXJscy5wdXNoKGNvbXBsZXRlSHJlZiB8fCAiPGVtcHR5PiIpOwog ICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICByZXN1bHQgPSBbIGxhdGVTdHlsZVVy bHMsIGNzc0JlZm9yZUlubGluZUNvdW50IF07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9ET01BZ2VudC5qcwppbmRleCA4MTFmZDJlNmQyNDVmZjZmNGJjMTUxNDJjYmUw MzkzMjU1MDFjMTlkLi41ZjRmMDYxNjIwYzVlOWE2NzhkODkxNjUzMTNiNTRlYmY0MDI0ZDcyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50Lmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQuanMKQEAg LTc0Nyw4ICs3NDcsOCBAQCBXZWJJbnNwZWN0b3IuRE9NTm9kZS5wcm90b3R5cGUgPSB7CiAgICAg ICAgIGlmICghdXJsKQogICAgICAgICAgICAgcmV0dXJuIHVybDsKICAgICAgICAgZm9yICh2YXIg ZnJhbWVPd25lckNhbmRpZGF0ZSA9IHRoaXM7IGZyYW1lT3duZXJDYW5kaWRhdGU7IGZyYW1lT3du ZXJDYW5kaWRhdGUgPSBmcmFtZU93bmVyQ2FuZGlkYXRlLnBhcmVudE5vZGUpIHsKLSAgICAgICAg ICAgIGlmIChmcmFtZU93bmVyQ2FuZGlkYXRlLmRvY3VtZW50VVJMKQotICAgICAgICAgICAgICAg IHJldHVybiBXZWJJbnNwZWN0b3IuUGFyc2VkVVJMLmNvbXBsZXRlVVJMKGZyYW1lT3duZXJDYW5k aWRhdGUuZG9jdW1lbnRVUkwsIHVybCk7CisgICAgICAgICAgICBpZiAoZnJhbWVPd25lckNhbmRp ZGF0ZS5iYXNlVVJMKQorICAgICAgICAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuUGFyc2Vk VVJMLmNvbXBsZXRlVVJMKGZyYW1lT3duZXJDYW5kaWRhdGUuYmFzZVVSTCwgdXJsKTsKICAgICAg ICAgfQogICAgICAgICByZXR1cm4gbnVsbDsKICAgICB9CkBAIC03NjQsNiArNzY0LDcgQEAgV2Vi SW5zcGVjdG9yLkRPTURvY3VtZW50ID0gZnVuY3Rpb24oZG9tQWdlbnQsIHBheWxvYWQpCiB7CiAg ICAgV2ViSW5zcGVjdG9yLkRPTU5vZGUuY2FsbCh0aGlzLCBkb21BZ2VudCwgdGhpcywgZmFsc2Us IHBheWxvYWQpOwogICAgIHRoaXMuZG9jdW1lbnRVUkwgPSBwYXlsb2FkLmRvY3VtZW50VVJMIHx8 ICIiOworICAgIHRoaXMuYmFzZVVSTCA9IHBheWxvYWQuYmFzZVVSTDsKICAgICB0aGlzLnhtbFZl cnNpb24gPSBwYXlsb2FkLnhtbFZlcnNpb247CiAgICAgdGhpcy5fbGlzdGVuZXJzID0ge307CiB9 CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKaW5kZXggZDk3OTM0MmNlNDhjZDM2OTRiMWQ5NzhjMWZiMDg0ZDU0NmY5NDU1Ni4uZmJhN2Uw ODIzNzBiZmY4N2ZlNjBkODg2NGE5NDlhNDAzYzk4ZTRmYyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBA CisyMDEyLTA5LTIwICBBbGV4YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgV2ViIEluc3BlY3RvcjogUmVsYXRpdmUgVVJMIExpbmsgVG9vbHRpcHMgZG8gbm90 IHJlc3BlY3QgPGJhc2U+CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD00MzQzNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEFkZGVkIGFuIGlmcmFtZSBjb250YWluaW5nIHRoZSA8YmFzZT4gdGFnIHRvIHRlc3Qg RE9NTm9kZS5wcm90b3R5cGUucmVzb2x2ZVVSTCgpIHdpdGggYSBub24tdHJpdmlhbCBiYXNlVVJM LgorCisgICAgICAgICogaW5zcGVjdG9yL2VsZW1lbnRzL2VsZW1lbnRzLXBhbmVsLXJld3JpdGUt aHJlZi5odG1sOgorICAgICAgICAqIGluc3BlY3Rvci9lbGVtZW50cy9lbGVtZW50cy1wYW5lbC1y ZXdyaXRlLWhyZWYtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGluc3BlY3Rvci9lbGVtZW50cy9y ZXNvdXJjZXMvZWxlbWVudHMtcGFuZWwtcmV3cml0ZS1ocmVmLWlmcmFtZS5odG1sOiBBZGRlZC4K KwogMjAxMi0wOS0yNCAgQ2hyaXN0b3BoZSBEdW1leiAgPGNocmlzdG9waGUuZHVtZXpAaW50ZWwu Y29tPgogCiAgICAgICAgIFtFRkxdIFVuc2tpcCBwcm9wZXIgc2hhZG93IGRvbSB0ZXN0IGNhc2UK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9lbGVtZW50cy9lbGVtZW50cy1wYW5l bC1yZXdyaXRlLWhyZWYtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2VsZW1l bnRzL2VsZW1lbnRzLXBhbmVsLXJld3JpdGUtaHJlZi1leHBlY3RlZC50eHQKaW5kZXggMTQ0MmFk OGI2N2JjZjI1YTcyMWIxMGU3MGM5NWZhMzM2ZGQ5N2M5OC4uYjY2N2VhYTYxZWE5N2VjYjQzNTFl MjExYmFlYjdhM2FhOGE5YjY0ZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Vs ZW1lbnRzL2VsZW1lbnRzLXBhbmVsLXJld3JpdGUtaHJlZi1leHBlY3RlZC50eHQKKysrIGIvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRzL2VsZW1lbnRzLXBhbmVsLXJld3JpdGUtaHJlZi1l eHBlY3RlZC50eHQKQEAgLTEsOCArMSwxMiBAQAogVGVzdHMgdGhhdCBzcmMgYW5kIGhyZWYgZWxl bWVudCB0YXJnZXRzIGFyZSByZXdyaXR0ZW4gcHJvcGVybHkuCiAKKwogIGphdmFzY3JpcHQ6YWxl cnQoJ2ZvbycpIAogLGJvZ3VzU2hlZXQxLmNzcwogaW5zcGVjdG9yLGVsZW1lbnRzLGJvZ3VzU2hl ZXQyLmNzcwogdGVzdHMsaW5zcGVjdG9yLGluc3BlY3Rvci10ZXN0LmpzCiB0ZXN0cyxpbnNwZWN0 b3IsZWxlbWVudHMtdGVzdC5qcworaHR0cDovLzEyNy4wLjAuMS9zdHlsZXNoZWV0LmNzcworaHR0 cDovLzEyNy4wLjAuMS9zY3JpcHQuanMKK2h0dHA6Ly8xMjcuMC4wLjEvdGFyZ2V0Lmh0bWwKIApk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRzL2VsZW1lbnRzLXBhbmVs LXJld3JpdGUtaHJlZi5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRzL2VsZW1l bnRzLXBhbmVsLXJld3JpdGUtaHJlZi5odG1sCmluZGV4IDFjZWMyY2FhMGQ1MTczMjJjNTQwN2Vk MWM2ZTMxODIzMWVkZWEwN2YuLmQyZDVkMzZjZmFlYzdjYjYwNGU3NWYzZThlMTJhZmRjOWYyN2U0 MDMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9lbGVtZW50cy9lbGVtZW50cy1w YW5lbC1yZXdyaXRlLWhyZWYuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVu dHMvZWxlbWVudHMtcGFuZWwtcmV3cml0ZS1ocmVmLmh0bWwKQEAgLTI0LDYgKzI0LDEwIEBAIGZ1 bmN0aW9uIHRlc3QoKQogICAgICAgICAgICAgICAgICAgICBzZWdtZW50cy5wdXNoKCI8ZW1wdHk+ Iik7CiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgICAgIH0KKyAg ICAgICAgICAgICAgICBpZiAoaHJlZi5zdGFydHNXaXRoKCJodHRwOiIpKSB7CisgICAgICAgICAg ICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KGhyZWYpOworICAgICAgICAgICAgICAg ICAgICBjb250aW51ZTsKKyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgdmFyIHBh cnNlZFVSTCA9IGhyZWYuYXNQYXJzZWRVUkwoKTsKICAgICAgICAgICAgICAgICBpZiAoIXBhcnNl ZFVSTCkKICAgICAgICAgICAgICAgICAgICAgdGVzdENvbnRyb2xsZXIubm90aWZ5RG9uZSgiRkFJ TDogbm8gVVJMIG1hdGNoIGZvciA8IiArIGhyZWYgKyAiPiIpOwpAQCAtNDIsMTIgKzQ2LDEyIEBA IGZ1bmN0aW9uIHRlc3QoKQogPC9zY3JpcHQ+CiA8L2hlYWQ+CiAKLTxib2R5IG9ubG9hZD0icnVu VGVzdCgpIj4KKzxib2R5PgogPHA+CiBUZXN0cyB0aGF0IHNyYyBhbmQgaHJlZiBlbGVtZW50IHRh cmdldHMgYXJlIHJld3JpdHRlbiBwcm9wZXJseS4KIDwvcD4KIAogPGEgc3R5bGU9ImRpc3BsYXk6 bm9uZSIgaHJlZj0iIGphdmFzY3JpcHQ6YWxlcnQoJ2ZvbycpICI+PC9hPgotCis8aWZyYW1lIHNy Yz0icmVzb3VyY2VzL2VsZW1lbnRzLXBhbmVsLXJld3JpdGUtaHJlZi1pZnJhbWUuaHRtbCIgb25s b2FkPSJydW5UZXN0KCkiPjwvaWZyYW1lPgogPC9ib2R5PgogPC9odG1sPgpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRzL3Jlc291cmNlcy9lbGVtZW50cy1wYW5lbC1y ZXdyaXRlLWhyZWYtaWZyYW1lLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMv cmVzb3VyY2VzL2VsZW1lbnRzLXBhbmVsLXJld3JpdGUtaHJlZi1pZnJhbWUuaHRtbApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi4wOWJiNTNmMmRhNDc1YzYzMzBkYjM5OWM3MmZhMWNjMjA3OTEwZDA4Ci0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRzL3Jlc291cmNlcy9lbGVtZW50 cy1wYW5lbC1yZXdyaXRlLWhyZWYtaWZyYW1lLmh0bWwKQEAgLTAsMCArMSwxMCBAQAorPGh0bWw+ Cis8aGVhZD4KKzxiYXNlIGhyZWY9Imh0dHA6Ly8xMjcuMC4wLjEiPgorPGxpbmsgcmVsPSJzdHls ZXNoZWV0IiBzcmM9InN0eWxlc2hlZXQuY3NzIj4KKzxzY3JpcHQgc3JjPSJzY3JpcHQuanMiPjwv c2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8YSBocmVmPSJ0YXJnZXQuaHRtbCI+PC9hPgorPC9i b2R5PgorPC9odG1sPgo= 165365 2012-09-24 06:15:49 -0700 2012-09-24 09:35:41 -0700 Patch bug-43434-20120924171509.patch text/plain 11487 apavlov U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5MzUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzNkYjVlZjRjYWRmMTY0 MWMwYzUzMTg4MWZmZDI0OGRhNGI1NjgxNy4uMDA0MWI2NzMzOWQ4NzUxYzM4NDBlODM1NjUyMjli N2I4YzE2ODI5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTA5LTIwICBBbGV4 YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogUmVsYXRpdmUgVVJMIExpbmsgVG9vbHRpcHMgZG8gbm90IHJlc3BlY3QgPGJhc2U+Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MzQzNAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5ldyAiYmFzZVVS TCIgZmllbGQgYWRkZWQgaW50byB0aGUgRE9NLk5vZGUgcGF5bG9hZCBmb3IgZG9jdW1lbnQgbm9k ZXMgYW5kIGlzIG1hZGUgdXNlIG9mIHdoaWxlIHJlc29sdmluZyBhbmQgY29tcGxldGluZyBVUkxz LgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uOgorICAgICAgICAqIGluc3Bl Y3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpkb2N1bWVudEJh c2VVUkxTdHJpbmcpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNw ZWN0b3JET01BZ2VudDo6YnVpbGRPYmplY3RGb3JOb2RlKToKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZnJvbnQtZW5kL0F1ZGl0UnVsZXMuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQXVkaXRSdWxl cy5JbWFnZURpbWVuc2lvbnNSdWxlLnByb3RvdHlwZS5kb1J1bik6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuQXVkaXRSdWxlcy5Dc3NJbkhlYWRSdWxlLnByb3RvdHlwZS5kb1J1bi5leHRlcm5hbFN0 eWxlc2hlZXRzUmVjZWl2ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZXMuU3R5 bGVzU2NyaXB0c09yZGVyUnVsZS5wcm90b3R5cGUuZG9SdW4uY3NzQmVmb3JlSW5saW5lUmVjZWl2 ZWQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuRE9NTm9kZS5wcm90b3R5cGUucmVzb2x2ZVVSTCk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuRE9NRG9jdW1lbnQpOgorCiAyMDEyLTA5LTI0ICBQYXZlbCBGZWxkbWFuICA8 cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6RVhDX0JBRF9B Q0NFU1MgdXBvbiBjbG9zaW5nIHBhZ2Ugd2l0aCBub2RlIGhpZ2hsaWdodGVkCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24gYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KaW5kZXggNWMxOGRhZDk1NTFlYzIzMjg5ODNhY2Yx ODJmOTY2MWZmOGU3NjY2Ny4uNzRlYTcxMWU1ODYwN2Q2NTc0ODFjZDFiOGJiNTlmZmY1NGRiNTc5 ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgpAQCAtMTU2Nyw2ICsx NTY3LDcgQEAKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJjaGlsZHJlbiIsICJ0eXBl IjogImFycmF5IiwgIm9wdGlvbmFsIjogdHJ1ZSwgIml0ZW1zIjogeyAiJHJlZiI6ICJOb2RlIiB9 LCAiZGVzY3JpcHRpb24iOiAiQ2hpbGQgbm9kZXMgb2YgdGhpcyBub2RlIHdoZW4gcmVxdWVzdGVk IHdpdGggY2hpbGRyZW4uIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImF0dHJp YnV0ZXMiLCAidHlwZSI6ICJhcnJheSIsICJvcHRpb25hbCI6IHRydWUsICJpdGVtcyI6IHsgInR5 cGUiOiAic3RyaW5nIiB9LCAiZGVzY3JpcHRpb24iOiAiQXR0cmlidXRlcyBvZiB0aGUgPGNvZGU+ RWxlbWVudDwvY29kZT4gbm9kZSBpbiB0aGUgZm9ybSBvZiBmbGF0IGFycmF5IDxjb2RlPltuYW1l MSwgdmFsdWUxLCBuYW1lMiwgdmFsdWUyXTwvY29kZT4uIiB9LAogICAgICAgICAgICAgICAgICAg ICB7ICJuYW1lIjogImRvY3VtZW50VVJMIiwgInR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFsIjog dHJ1ZSwgImRlc2NyaXB0aW9uIjogIkRvY3VtZW50IFVSTCB0aGF0IDxjb2RlPkRvY3VtZW50PC9j b2RlPiBvciA8Y29kZT5GcmFtZU93bmVyPC9jb2RlPiBub2RlIHBvaW50cyB0by4iIH0sCisgICAg ICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiYmFzZVVSTCIsICJ0eXBlIjogInN0cmluZyIsICJv cHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJCYXNlIFVSTCB0aGF0IDxjb2RlPkRvY3Vt ZW50PC9jb2RlPiBvciA8Y29kZT5GcmFtZU93bmVyPC9jb2RlPiBub2RlIHVzZXMgZm9yIFVSTCBj b21wbGV0aW9uLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJwdWJsaWNJZCIs ICJ0eXBlIjogInN0cmluZyIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICI8Y29k ZT5Eb2N1bWVudFR5cGU8L2NvZGU+J3MgcHVibGljSWQuIiB9LAogICAgICAgICAgICAgICAgICAg ICB7ICJuYW1lIjogInN5c3RlbUlkIiwgInR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFsIjogdHJ1 ZSwgImRlc2NyaXB0aW9uIjogIjxjb2RlPkRvY3VtZW50VHlwZTwvY29kZT4ncyBzeXN0ZW1JZC4i IH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiaW50ZXJuYWxTdWJzZXQiLCAidHlw ZSI6ICJzdHJpbmciLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiPGNvZGU+RG9j dW1lbnRUeXBlPC9jb2RlPidzIGludGVybmFsU3Vic2V0LiIgfSwKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCmluZGV4IDQ0OTE0ODdiMzZjZjA5ZGU4 ZTM5NmMyNjdiN2I0NGY4ZjQ0NjI5OTYuLmMxNmNmNjY2MjRmMTRlZWQ3NGE0Nzg5NGU2ZTJjODY4 MjFmOWI1Y2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JE T01BZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFn ZW50LmNwcApAQCAtMTE3Niw2ICsxMTc2LDExIEBAIFN0cmluZyBJbnNwZWN0b3JET01BZ2VudDo6 ZG9jdW1lbnRVUkxTdHJpbmcoRG9jdW1lbnQqIGRvY3VtZW50KQogICAgIHJldHVybiBkb2N1bWVu dC0+dXJsKCkuc3RyaW5nKCk7CiB9CiAKK3N0YXRpYyBTdHJpbmcgZG9jdW1lbnRCYXNlVVJMU3Ry aW5nKERvY3VtZW50KiBkb2N1bWVudCkKK3sKKyAgICByZXR1cm4gZG9jdW1lbnQtPmNvbXBsZXRl VVJMKCIiKS5zdHJpbmcoKTsKK30KKwogUGFzc1JlZlB0cjxUeXBlQnVpbGRlcjo6RE9NOjpOb2Rl PiBJbnNwZWN0b3JET01BZ2VudDo6YnVpbGRPYmplY3RGb3JOb2RlKE5vZGUqIG5vZGUsIGludCBk ZXB0aCwgTm9kZVRvSWRNYXAqIG5vZGVzTWFwKQogewogICAgIGludCBpZCA9IGJpbmQobm9kZSwg bm9kZXNNYXApOwpAQCAtMTIzOSw3ICsxMjQ0LDEwIEBAIFBhc3NSZWZQdHI8VHlwZUJ1aWxkZXI6 OkRPTTo6Tm9kZT4gSW5zcGVjdG9yRE9NQWdlbnQ6OmJ1aWxkT2JqZWN0Rm9yTm9kZShOb2RlKiBu CiAgICAgICAgIH0KICAgICB9IGVsc2UgaWYgKG5vZGUtPmlzRG9jdW1lbnROb2RlKCkpIHsKICAg ICAgICAgRG9jdW1lbnQqIGRvY3VtZW50ID0gc3RhdGljX2Nhc3Q8RG9jdW1lbnQqPihub2RlKTsK LSAgICAgICAgdmFsdWUtPnNldERvY3VtZW50VVJMKGRvY3VtZW50VVJMU3RyaW5nKGRvY3VtZW50 KSk7CisgICAgICAgIFN0cmluZyBkb2N1bWVudFVSTCA9IGRvY3VtZW50VVJMU3RyaW5nKGRvY3Vt ZW50KTsKKyAgICAgICAgU3RyaW5nIGJhc2VVUkwgPSBkb2N1bWVudEJhc2VVUkxTdHJpbmcoZG9j dW1lbnQpOworICAgICAgICB2YWx1ZS0+c2V0RG9jdW1lbnRVUkwoZG9jdW1lbnRVUkwpOworICAg ICAgICB2YWx1ZS0+c2V0QmFzZVVSTChiYXNlVVJMKTsKICAgICAgICAgdmFsdWUtPnNldFhtbFZl cnNpb24oZG9jdW1lbnQtPnhtbFZlcnNpb24oKSk7CiAgICAgfSBlbHNlIGlmIChub2RlLT5ub2Rl VHlwZSgpID09IE5vZGU6OkRPQ1VNRU5UX1RZUEVfTk9ERSkgewogICAgICAgICBEb2N1bWVudFR5 cGUqIGRvY1R5cGUgPSBzdGF0aWNfY2FzdDxEb2N1bWVudFR5cGUqPihub2RlKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQXVkaXRSdWxlcy5qcyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQXVkaXRSdWxlcy5qcwppbmRleCBlOTFm MjcwNjRmMzkwODdmMDI5OWQ5MjcyYjVjYTk2NWQ1ZmNhOWQ4Li4xNGI1OWFjNDdhMzFjZDE2YmEz NzFjZjQ3ZTkwMzdhOWJjMjE0MzA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0F1ZGl0UnVsZXMuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9BdWRpdFJ1bGVzLmpzCkBAIC03NTUsOCArNzU1LDggQEAgV2ViSW5zcGVjdG9y LkF1ZGl0UnVsZXMuSW1hZ2VEaW1lbnNpb25zUnVsZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAg ICB2YXIgc3JjID0gbm9kZS5nZXRBdHRyaWJ1dGUoInNyYyIpOwogICAgICAgICAgICAgaWYgKCFz cmMuYXNQYXJzZWRVUkwoKSkgewogICAgICAgICAgICAgICAgIGZvciAodmFyIGZyYW1lT3duZXJD YW5kaWRhdGUgPSBub2RlOyBmcmFtZU93bmVyQ2FuZGlkYXRlOyBmcmFtZU93bmVyQ2FuZGlkYXRl ID0gZnJhbWVPd25lckNhbmRpZGF0ZS5wYXJlbnROb2RlKSB7Ci0gICAgICAgICAgICAgICAgICAg IGlmIChmcmFtZU93bmVyQ2FuZGlkYXRlLmRvY3VtZW50VVJMKSB7Ci0gICAgICAgICAgICAgICAg ICAgICAgICB2YXIgY29tcGxldGVTcmMgPSBXZWJJbnNwZWN0b3IuUGFyc2VkVVJMLmNvbXBsZXRl VVJMKGZyYW1lT3duZXJDYW5kaWRhdGUuZG9jdW1lbnRVUkwsIHNyYyk7CisgICAgICAgICAgICAg ICAgICAgIGlmIChmcmFtZU93bmVyQ2FuZGlkYXRlLmJhc2VVUkwpIHsKKyAgICAgICAgICAgICAg ICAgICAgICAgIHZhciBjb21wbGV0ZVNyYyA9IFdlYkluc3BlY3Rvci5QYXJzZWRVUkwuY29tcGxl dGVVUkwoZnJhbWVPd25lckNhbmRpZGF0ZS5iYXNlVVJMLCBzcmMpOwogICAgICAgICAgICAgICAg ICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICB9 CkBAIC05MDIsNyArOTAyLDcgQEAgV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZXMuQ3NzSW5IZWFkUnVs ZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgdmFyIGV4dGVybmFsU3R5bGVzaGVldEhy ZWZzID0gW107CiAgICAgICAgICAgICAgICAgZm9yICh2YXIgaiA9IDA7IGogPCBleHRlcm5hbFN0 eWxlc2hlZXROb2RlSWRzLmxlbmd0aDsgKytqKSB7CiAgICAgICAgICAgICAgICAgICAgIHZhciBs aW5rTm9kZSA9IFdlYkluc3BlY3Rvci5kb21BZ2VudC5ub2RlRm9ySWQoZXh0ZXJuYWxTdHlsZXNo ZWV0Tm9kZUlkc1tqXSk7Ci0gICAgICAgICAgICAgICAgICAgIHZhciBjb21wbGV0ZUhyZWYgPSBX ZWJJbnNwZWN0b3IuUGFyc2VkVVJMLmNvbXBsZXRlVVJMKGxpbmtOb2RlLm93bmVyRG9jdW1lbnQu ZG9jdW1lbnRVUkwsIGxpbmtOb2RlLmdldEF0dHJpYnV0ZSgiaHJlZiIpKTsKKyAgICAgICAgICAg ICAgICAgICAgdmFyIGNvbXBsZXRlSHJlZiA9IFdlYkluc3BlY3Rvci5QYXJzZWRVUkwuY29tcGxl dGVVUkwobGlua05vZGUub3duZXJEb2N1bWVudC5iYXNlVVJMLCBsaW5rTm9kZS5nZXRBdHRyaWJ1 dGUoImhyZWYiKSk7CiAgICAgICAgICAgICAgICAgICAgIGV4dGVybmFsU3R5bGVzaGVldEhyZWZz LnB1c2goY29tcGxldGVIcmVmIHx8ICI8ZW1wdHk+Iik7CiAgICAgICAgICAgICAgICAgfQogICAg ICAgICAgICAgICAgIHVybFRvVmlvbGF0aW9uc0FycmF5W3Jvb3QuZG9jdW1lbnRVUkxdID0gW2lu bGluZVN0eWxlTm9kZUlkcy5sZW5ndGgsIGV4dGVybmFsU3R5bGVzaGVldEhyZWZzXTsKQEAgLTk4 OSw3ICs5ODksNyBAQCBXZWJJbnNwZWN0b3IuQXVkaXRSdWxlcy5TdHlsZXNTY3JpcHRzT3JkZXJS dWxlLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICB2YXIgbGF0ZVN0eWxlVXJscyA9IFtd OwogICAgICAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgbGF0ZVN0eWxlSWRzLmxlbmd0 aDsgKytpKSB7CiAgICAgICAgICAgICAgICAgICAgIHZhciBsYXRlU3R5bGVOb2RlID0gV2ViSW5z cGVjdG9yLmRvbUFnZW50Lm5vZGVGb3JJZChsYXRlU3R5bGVJZHNbaV0pOwotICAgICAgICAgICAg ICAgICAgICB2YXIgY29tcGxldGVIcmVmID0gV2ViSW5zcGVjdG9yLlBhcnNlZFVSTC5jb21wbGV0 ZVVSTChsYXRlU3R5bGVOb2RlLm93bmVyRG9jdW1lbnQuZG9jdW1lbnRVUkwsIGxhdGVTdHlsZU5v ZGUuZ2V0QXR0cmlidXRlKCJocmVmIikpOworICAgICAgICAgICAgICAgICAgICB2YXIgY29tcGxl dGVIcmVmID0gV2ViSW5zcGVjdG9yLlBhcnNlZFVSTC5jb21wbGV0ZVVSTChsYXRlU3R5bGVOb2Rl Lm93bmVyRG9jdW1lbnQuYmFzZVVSTCwgbGF0ZVN0eWxlTm9kZS5nZXRBdHRyaWJ1dGUoImhyZWYi KSk7CiAgICAgICAgICAgICAgICAgICAgIGxhdGVTdHlsZVVybHMucHVzaChjb21wbGV0ZUhyZWYg fHwgIjxlbXB0eT4iKTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgcmVzdWx0 ID0gWyBsYXRlU3R5bGVVcmxzLCBjc3NCZWZvcmVJbmxpbmVDb3VudCBdOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5qcyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQuanMKaW5kZXggODExZmQyZTZkMjQ1 ZmY2ZjRiYzE1MTQyY2JlMDM5MzI1NTAxYzE5ZC4uNWY0ZjA2MTYyMGM1ZTlhNjc4ZDg5MTY1MzEz YjU0ZWJmNDAyNGQ3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9ET01BZ2VudC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0RPTUFnZW50LmpzCkBAIC03NDcsOCArNzQ3LDggQEAgV2ViSW5zcGVjdG9yLkRPTU5vZGUucHJv dG90eXBlID0gewogICAgICAgICBpZiAoIXVybCkKICAgICAgICAgICAgIHJldHVybiB1cmw7CiAg ICAgICAgIGZvciAodmFyIGZyYW1lT3duZXJDYW5kaWRhdGUgPSB0aGlzOyBmcmFtZU93bmVyQ2Fu ZGlkYXRlOyBmcmFtZU93bmVyQ2FuZGlkYXRlID0gZnJhbWVPd25lckNhbmRpZGF0ZS5wYXJlbnRO b2RlKSB7Ci0gICAgICAgICAgICBpZiAoZnJhbWVPd25lckNhbmRpZGF0ZS5kb2N1bWVudFVSTCkK LSAgICAgICAgICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlBhcnNlZFVSTC5jb21wbGV0ZVVS TChmcmFtZU93bmVyQ2FuZGlkYXRlLmRvY3VtZW50VVJMLCB1cmwpOworICAgICAgICAgICAgaWYg KGZyYW1lT3duZXJDYW5kaWRhdGUuYmFzZVVSTCkKKyAgICAgICAgICAgICAgICByZXR1cm4gV2Vi SW5zcGVjdG9yLlBhcnNlZFVSTC5jb21wbGV0ZVVSTChmcmFtZU93bmVyQ2FuZGlkYXRlLmJhc2VV UkwsIHVybCk7CiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuIG51bGw7CiAgICAgfQpAQCAtNzY0 LDYgKzc2NCw3IEBAIFdlYkluc3BlY3Rvci5ET01Eb2N1bWVudCA9IGZ1bmN0aW9uKGRvbUFnZW50 LCBwYXlsb2FkKQogewogICAgIFdlYkluc3BlY3Rvci5ET01Ob2RlLmNhbGwodGhpcywgZG9tQWdl bnQsIHRoaXMsIGZhbHNlLCBwYXlsb2FkKTsKICAgICB0aGlzLmRvY3VtZW50VVJMID0gcGF5bG9h ZC5kb2N1bWVudFVSTCB8fCAiIjsKKyAgICB0aGlzLmJhc2VVUkwgPSBwYXlsb2FkLmJhc2VVUkw7 CiAgICAgdGhpcy54bWxWZXJzaW9uID0gcGF5bG9hZC54bWxWZXJzaW9uOwogICAgIHRoaXMuX2xp c3RlbmVycyA9IHt9OwogfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGQ5NzkzNDJjZTQ4Y2QzNjk0YjFkOTc4YzFmYjA4NGQ1 NDZmOTQ1NTYuLmZiYTdlMDgyMzcwYmZmODdmZTYwZDg4NjRhOTQ5YTQwM2M5OGU0ZmMgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxNiBAQAorMjAxMi0wOS0yMCAgQWxleGFuZGVyIFBhdmxvdiAgPGFwYXZsb3ZA Y2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJlbGF0aXZlIFVSTCBMaW5r IFRvb2x0aXBzIGRvIG5vdCByZXNwZWN0IDxiYXNlPgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDM0MzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCBhbiBpZnJhbWUgY29udGFpbmluZyB0aGUgPGJh c2U+IHRhZyB0byB0ZXN0IERPTU5vZGUucHJvdG90eXBlLnJlc29sdmVVUkwoKSB3aXRoIGEgbm9u LXRyaXZpYWwgYmFzZVVSTC4KKworICAgICAgICAqIGluc3BlY3Rvci9lbGVtZW50cy9lbGVtZW50 cy1wYW5lbC1yZXdyaXRlLWhyZWYuaHRtbDoKKyAgICAgICAgKiBpbnNwZWN0b3IvZWxlbWVudHMv ZWxlbWVudHMtcGFuZWwtcmV3cml0ZS1ocmVmLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBpbnNw ZWN0b3IvZWxlbWVudHMvcmVzb3VyY2VzL2VsZW1lbnRzLXBhbmVsLXJld3JpdGUtaHJlZi1pZnJh bWUuaHRtbDogQWRkZWQuCisKIDIwMTItMDktMjQgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3Rv cGhlLmR1bWV6QGludGVsLmNvbT4KIAogICAgICAgICBbRUZMXSBVbnNraXAgcHJvcGVyIHNoYWRv dyBkb20gdGVzdCBjYXNlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVu dHMvZWxlbWVudHMtcGFuZWwtcmV3cml0ZS1ocmVmLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3Rz L2luc3BlY3Rvci9lbGVtZW50cy9lbGVtZW50cy1wYW5lbC1yZXdyaXRlLWhyZWYtZXhwZWN0ZWQu dHh0CmluZGV4IDE0NDJhZDhiNjdiY2YyNWE3MjFiMTBlNzBjOTVmYTMzNmRkOTdjOTguLmI2Njdl YWE2MWVhOTdlY2I0MzUxZTIxMWJhZWI3YTNhYThhOWI2NGUgMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL2luc3BlY3Rvci9lbGVtZW50cy9lbGVtZW50cy1wYW5lbC1yZXdyaXRlLWhyZWYtZXhwZWN0 ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9lbGVtZW50cy9lbGVtZW50cy1wYW5l bC1yZXdyaXRlLWhyZWYtZXhwZWN0ZWQudHh0CkBAIC0xLDggKzEsMTIgQEAKIFRlc3RzIHRoYXQg c3JjIGFuZCBocmVmIGVsZW1lbnQgdGFyZ2V0cyBhcmUgcmV3cml0dGVuIHByb3Blcmx5LgogCisK ICBqYXZhc2NyaXB0OmFsZXJ0KCdmb28nKSAKICxib2d1c1NoZWV0MS5jc3MKIGluc3BlY3Rvcixl bGVtZW50cyxib2d1c1NoZWV0Mi5jc3MKIHRlc3RzLGluc3BlY3RvcixpbnNwZWN0b3ItdGVzdC5q cwogdGVzdHMsaW5zcGVjdG9yLGVsZW1lbnRzLXRlc3QuanMKK2h0dHA6Ly8xMjcuMC4wLjEvc3R5 bGVzaGVldC5jc3MKK2h0dHA6Ly8xMjcuMC4wLjEvc2NyaXB0LmpzCitodHRwOi8vMTI3LjAuMC4x L3RhcmdldC5odG1sCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9lbGVtZW50 cy9lbGVtZW50cy1wYW5lbC1yZXdyaXRlLWhyZWYuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rv ci9lbGVtZW50cy9lbGVtZW50cy1wYW5lbC1yZXdyaXRlLWhyZWYuaHRtbAppbmRleCAxY2VjMmNh YTBkNTE3MzIyYzU0MDdlZDFjNmUzMTgyMzFlZGVhMDdmLi5kMmQ1ZDM2Y2ZhZWM3Y2I2MDRlNzVm M2U4ZTEyYWZkYzlmMjdlNDAzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZWxl bWVudHMvZWxlbWVudHMtcGFuZWwtcmV3cml0ZS1ocmVmLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL2VsZW1lbnRzL2VsZW1lbnRzLXBhbmVsLXJld3JpdGUtaHJlZi5odG1sCkBAIC0y NCw2ICsyNCwxMCBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgICAgICAgICAgICAgc2VnbWVu dHMucHVzaCgiPGVtcHR5PiIpOwogICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAg ICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgaWYgKGhyZWYuc3RhcnRzV2l0aCgiaHR0cDoi KSkgeworICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdChocmVmKTsK KyAgICAgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICAgICAgfQogICAgICAg ICAgICAgICAgIHZhciBwYXJzZWRVUkwgPSBocmVmLmFzUGFyc2VkVVJMKCk7CiAgICAgICAgICAg ICAgICAgaWYgKCFwYXJzZWRVUkwpCiAgICAgICAgICAgICAgICAgICAgIHRlc3RDb250cm9sbGVy Lm5vdGlmeURvbmUoIkZBSUw6IG5vIFVSTCBtYXRjaCBmb3IgPCIgKyBocmVmICsgIj4iKTsKQEAg LTQyLDEyICs0NiwxMiBAQCBmdW5jdGlvbiB0ZXN0KCkKIDwvc2NyaXB0PgogPC9oZWFkPgogCi08 Ym9keSBvbmxvYWQ9InJ1blRlc3QoKSI+Cis8Ym9keT4KIDxwPgogVGVzdHMgdGhhdCBzcmMgYW5k IGhyZWYgZWxlbWVudCB0YXJnZXRzIGFyZSByZXdyaXR0ZW4gcHJvcGVybHkuCiA8L3A+CiAKIDxh IHN0eWxlPSJkaXNwbGF5Om5vbmUiIGhyZWY9IiBqYXZhc2NyaXB0OmFsZXJ0KCdmb28nKSAiPjwv YT4KLQorPGlmcmFtZSBzcmM9InJlc291cmNlcy9lbGVtZW50cy1wYW5lbC1yZXdyaXRlLWhyZWYt aWZyYW1lLmh0bWwiIG9ubG9hZD0icnVuVGVzdCgpIj48L2lmcmFtZT4KIDwvYm9keT4KIDwvaHRt bD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9lbGVtZW50cy9yZXNvdXJjZXMv ZWxlbWVudHMtcGFuZWwtcmV3cml0ZS1ocmVmLWlmcmFtZS5odG1sIGIvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL2VsZW1lbnRzL3Jlc291cmNlcy9lbGVtZW50cy1wYW5lbC1yZXdyaXRlLWhyZWYtaWZy YW1lLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMC4uMDliYjUzZjJkYTQ3NWM2MzMwZGIzOTljNzJmYTFjYzIwNzkx MGQwOAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9lbGVtZW50cy9y ZXNvdXJjZXMvZWxlbWVudHMtcGFuZWwtcmV3cml0ZS1ocmVmLWlmcmFtZS5odG1sCkBAIC0wLDAg KzEsMTAgQEAKKzxodG1sPgorPGhlYWQ+Cis8YmFzZSBocmVmPSJodHRwOi8vMTI3LjAuMC4xIj4K KzxsaW5rIHJlbD0ic3R5bGVzaGVldCIgc3JjPSJzdHlsZXNoZWV0LmNzcyI+Cis8c2NyaXB0IHNy Yz0ic2NyaXB0LmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorPGEgaHJlZj0idGFyZ2V0 Lmh0bWwiPjwvYT4KKzwvYm9keT4KKzwvaHRtbD4K