236938 2022-02-20 03:28:35 -0800 Python3 for lighttpd 2022-02-28 09:38:34 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Other RESOLVED FIXED InRadar P2 Normal --- 1 nep-webkit webkit-unassigned darin ews-watchlist glenn jbedard pulkomandy webkit-bug-importer oldest_to_newest 1844046 0 nep-webkit 2022-02-20 03:28:35 -0800 Python3 support should be enabled for lighttpd, the Haiku port currently uses lighttpd to run the tests. 1844047 1 452689 nep-webkit 2022-02-20 03:30:40 -0800 Created attachment 452689 Patch 1844108 2 452689 jbedard 2022-02-20 22:27:14 -0800 Comment on attachment 452689 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=452689&action=review > Tools/Scripts/webkitpy/layout_tests/servers/http_server.py:114 > + ' ".php" => "%s"\n' Worth noting that we won’t be adding PHP tests, and all existing tests have been replaced with Python. You should be able to remove PHP entirely, should you desire. 1844533 3 nep-webkit 2022-02-21 20:34:01 -0800 Good day, I don't mind much either way, I can submit a patch that replaces php instead. 1844577 4 pulkomandy 2022-02-22 00:07:59 -0800 Yes, replacing php seems better and makes it clearer that it is not needed anymore. 1846323 5 453304 nep-webkit 2022-02-26 12:01:20 -0800 Created attachment 453304 Patch 1846334 6 453304 darin 2022-02-26 13:34:04 -0800 Comment on attachment 453304 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=453304&action=review > Tools/Scripts/webkitpy/layout_tests/servers/http_server.py:-115 > - ' ".php" => "%s" )\n\n') % > - self._port_obj._path_to_lighttpd_php()) Change log doesn’t mention why we’re removing ".php". Maybe a good idea, but why? Also, why not remove the _path_to_lighttpd_php function too? > Tools/Scripts/webkitpy/layout_tests/servers/lighttpd.conf:41 > -static-file.exclude-extensions = ( ".php", ".pl", ".cgi" ) > +static-file.exclude-extensions = ( ".py", ".pl", ".cgi" ) Same question: What’s the rationale for removing ".php"? Also, not great to leave the mention of it in the comment on the line above. 1846335 7 453304 darin 2022-02-26 13:34:50 -0800 Comment on attachment 453304 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=453304&action=review >> Tools/Scripts/webkitpy/layout_tests/servers/http_server.py:-115 >> - self._port_obj._path_to_lighttpd_php()) > > Change log doesn’t mention why we’re removing ".php". Maybe a good idea, but why? Also, why not remove the _path_to_lighttpd_php function too? I see Jonathan Bedard advising you to remove php, so all you need to do is to mention this in the change log. And I do think we should remove the _path_to_lighttpd_php function and any other php-only code. 1846340 8 453308 nep-webkit 2022-02-26 13:54:42 -0800 Created attachment 453308 Patch 1846341 9 nep-webkit 2022-02-26 13:56:12 -0800 I've updated the patch, it should be clearer now. 1846342 10 453308 darin 2022-02-26 13:59:28 -0800 Comment on attachment 453308 Patch r=me, but as usual, best to wait for EWS results before we set commit-queue+ 1846343 11 nep-webkit 2022-02-26 14:03:06 -0800 I don't think any port but haiku uses lighttpd for tests currently, so it may be broken even if EWS passes. I don't currently have a reference to test against for this. (The haiku port already patches this file differently so not a straightforward replacement to test with) 1846345 12 darin 2022-02-26 14:06:04 -0800 OK, we’ll just use EWS to verify that this change, which should not affect the ports in EWS, does not affect them. 1846408 13 webkit-bug-importer 2022-02-27 03:29:16 -0800 <rdar://problem/89525957> 1846634 14 nep-webkit 2022-02-28 07:37:32 -0800 EWS passed, it should be ready to commit now. 1846650 15 jbedard 2022-02-28 09:05:35 -0800 (In reply to Pascal Abresch from comment #14) > EWS passed, it should be ready to commit now. Ok! Sending through commit-queue now. 1846664 16 ews-feeder 2022-02-28 09:38:30 -0800 Committed r290599 (247875@main): <https://commits.webkit.org/247875@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 453308. 452689 2022-02-20 03:30:40 -0800 2022-02-26 12:01:14 -0800 Patch bug-236938-20220220123036.patch text/plain 2426 nep-webkit U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMjIzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjI2NDAyZTA4OGNlZmRmYWUxOGJmN2I1OGVkY2E5NWIx NGJiZDk0Ni4uYTAwNWQ2NTY0YzA3MzVkMDhjNzUzNDdkM2QzMTBkMTQ5ZjU4YzFjMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDIyLTAyLTIwICBQYXNjYWwgQWJyZXNjaCAgPG5lcEBwYWNrYWdlbG9zcy5ldT4KKwor ICAgICAgICBFbmFibGUgcHl0aG9uMyBmb3IgbGlnaHR0cGQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjkzOAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgbmVlZGVkIGZvciB0aGUgSGFpa3Ug cG9ydCB0byB1c2UgdGhlIHB5dGhvbjMgdGVzdHMuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvc2VydmVycy9odHRwX3NlcnZlci5weToKKyAgICAgICAgKExpZ2h0dHBk Ll9wcmVwYXJlX2NvbmZpZyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvc2VydmVycy9saWdodHRwZC5jb25mOgorCiAyMDIyLTAyLTE5ICBTaWh1aSBMaXUgIDxzaWh1 aV9saXVAYXBwbGUuY29tPgogCiAgICAgICAgIFNldCBjdXN0b20gZ2VuZXJhbCBzdG9yYWdlIGRp cmVjdG9yeSBmb3IgY3VzdG9tIFdlYnNpdGVEYXRhU3RvcmUgaW4gVGVzdENvbnRyb2xsZXIKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMvaHR0 cF9zZXJ2ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9zZXJ2ZXJz L2h0dHBfc2VydmVyLnB5CmluZGV4IDc2ZTI3MTk2MjQ4MjVkM2ZkYWE2ZDcyYWMwNzNiZWJmZmQ4 OGE5NTguLjY2NjQ5MjUxOWNiMDlhNjdiNmIyOGM5ZTFiOGUxZGU5ZjZiYTM0OGEgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMvaHR0cF9zZXJ2 ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvc2VydmVycy9o dHRwX3NlcnZlci5weQpAQCAtMTExLDcgKzExMSw4IEBAIGNsYXNzIExpZ2h0dHBkKGh0dHBfc2Vy dmVyX2Jhc2UuSHR0cFNlcnZlckJhc2UpOgogICAgICAgICBmLndyaXRlKCgnY2dpLmFzc2lnbiA9 ICggIi5jZ2kiICA9PiAiL3Vzci9iaW4vZW52IixcbicKICAgICAgICAgICAgICAgICAgJyAgICAg ICAgICAgICAgICIucGwiICAgPT4gIi91c3IvYmluL2VudiIsXG4nCiAgICAgICAgICAgICAgICAg ICcgICAgICAgICAgICAgICAiLmFzaXMiID0+ICIvYmluL2NhdCIsXG4nCi0gICAgICAgICAgICAg ICAgICcgICAgICAgICAgICAgICAiLnBocCIgID0+ICIlcyIgKVxuXG4nKSAlCisgICAgICAgICAg ICAgICAgICcgICAgICAgICAgICAgICAiLnBocCIgID0+ICIlcyJcbicKKyAgICAgICAgICAgICAg ICAgJyAgICAgICAgICAgICAgICIucHkiICA9PiAiL2Jpbi9weXRob24zIiApXG5cbicpICUKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLl9wb3J0X29iai5fcGF0aF90 b19saWdodHRwZF9waHAoKSkKIAogICAgICAgICAjIFNldHVwIGxvZyBmaWxlcwpkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvc2VydmVycy9saWdodHRwZC5j b25mIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvc2VydmVycy9saWdodHRw ZC5jb25mCmluZGV4IDVhYzRhMjYzMzFhNDYwZjg1NWExNGUwYjk5NGU5ZTkxMDVlNjY4ZjYuLjhm ZDhjMDlkMjY1NzMxZjFlNzM3ZDcxZjhjMjY1OTMxYmNlYmViZmIgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMvbGlnaHR0cGQuY29uZgorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9zZXJ2ZXJzL2xpZ2h0dHBkLmNv bmYKQEAgLTM4LDcgKzM4LDcgQEAgbWltZXR5cGUudXNlLXhhdHRyICAgICAgICAgID0gImVuYWJs ZSIKICMgd2hpY2ggZXh0ZW5zaW9ucyBzaG91bGQgbm90IGJlIGhhbmRsZSB2aWEgc3RhdGljLWZp bGUgdHJhbnNmZXIKICMKICMgLnBocCwgLnBsLCAuZmNnaSBhcmUgbW9zdCBvZnRlbiBoYW5kbGVk IGJ5IG1vZF9mYXN0Y2dpIG9yIG1vZF9jZ2kKLXN0YXRpYy1maWxlLmV4Y2x1ZGUtZXh0ZW5zaW9u cyA9ICggIi5waHAiLCAiLnBsIiwgIi5jZ2kiICkKK3N0YXRpYy1maWxlLmV4Y2x1ZGUtZXh0ZW5z aW9ucyA9ICggIi5waHAiLCAiLnBsIiwgIi5weSIsICIuY2dpIiApCiAKIHNlcnZlci5iaW5kID0g ImxvY2FsaG9zdCIKIHNlcnZlci5wb3J0ID0gODAwMQo= 453304 2022-02-26 12:01:20 -0800 2022-02-26 13:54:36 -0800 Patch bug-236938-20220226210115.patch text/plain 2693 nep-webkit U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMjIzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjI2NDAyZTA4OGNlZmRmYWUxOGJmN2I1OGVkY2E5NWIx NGJiZDk0Ni4uYTAwNWQ2NTY0YzA3MzVkMDhjNzUzNDdkM2QzMTBkMTQ5ZjU4YzFjMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDIyLTAyLTIwICBQYXNjYWwgQWJyZXNjaCAgPG5lcEBwYWNrYWdlbG9zcy5ldT4KKwor ICAgICAgICBFbmFibGUgcHl0aG9uMyBmb3IgbGlnaHR0cGQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjkzOAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgbmVlZGVkIGZvciB0aGUgSGFpa3Ug cG9ydCB0byB1c2UgdGhlIHB5dGhvbjMgdGVzdHMuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvc2VydmVycy9odHRwX3NlcnZlci5weToKKyAgICAgICAgKExpZ2h0dHBk Ll9wcmVwYXJlX2NvbmZpZyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvc2VydmVycy9saWdodHRwZC5jb25mOgorCiAyMDIyLTAyLTE5ICBTaWh1aSBMaXUgIDxzaWh1 aV9saXVAYXBwbGUuY29tPgogCiAgICAgICAgIFNldCBjdXN0b20gZ2VuZXJhbCBzdG9yYWdlIGRp cmVjdG9yeSBmb3IgY3VzdG9tIFdlYnNpdGVEYXRhU3RvcmUgaW4gVGVzdENvbnRyb2xsZXIKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMvaHR0 cF9zZXJ2ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9zZXJ2ZXJz L2h0dHBfc2VydmVyLnB5CmluZGV4IDc2ZTI3MTk2MjQ4MjVkM2ZkYWE2ZDcyYWMwNzNiZWJmZmQ4 OGE5NTguLmNlMGM3YmRjOGQ0NDFmMzA2NDc5ODQyOGY2ZGE4OTlkZThiMmVjNzcgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMvaHR0cF9zZXJ2 ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvc2VydmVycy9o dHRwX3NlcnZlci5weQpAQCAtMTA4LDExICsxMDgsMTAgQEAgY2xhc3MgTGlnaHR0cGQoaHR0cF9z ZXJ2ZXJfYmFzZS5IdHRwU2VydmVyQmFzZSk6CiAgICAgICAgICMgV3JpdGUgb3V0IG91ciBjZ2kg aGFuZGxlcnMuICBSdW4gcGVybCB0aHJvdWdoIGVudiBzbyB0aGF0IGl0CiAgICAgICAgICMgcHJv Y2Vzc2VzIHRoZSAjISBsaW5lIGFuZCBydW5zIHBlcmwgd2l0aCB0aGUgcHJvcGVyIGNvbW1hbmQK ICAgICAgICAgIyBsaW5lIGFyZ3VtZW50cy4gRW11bGF0ZSBhcGFjaGUncyBtb2RfYXNpcyB3aXRo IGEgY2F0IGNnaSBoYW5kbGVyLgotICAgICAgICBmLndyaXRlKCgnY2dpLmFzc2lnbiA9ICggIi5j Z2kiICA9PiAiL3Vzci9iaW4vZW52IixcbicKKyAgICAgICAgZi53cml0ZSgnY2dpLmFzc2lnbiA9 ICggIi5jZ2kiICA9PiAiL3Vzci9iaW4vZW52IixcbicKICAgICAgICAgICAgICAgICAgJyAgICAg ICAgICAgICAgICIucGwiICAgPT4gIi91c3IvYmluL2VudiIsXG4nCiAgICAgICAgICAgICAgICAg ICcgICAgICAgICAgICAgICAiLmFzaXMiID0+ICIvYmluL2NhdCIsXG4nCi0gICAgICAgICAgICAg ICAgICcgICAgICAgICAgICAgICAiLnBocCIgID0+ICIlcyIgKVxuXG4nKSAlCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5fcG9ydF9vYmouX3BhdGhfdG9fbGlnaHR0 cGRfcGhwKCkpCisgICAgICAgICAgICAgICAgICcgICAgICAgICAgICAgICAiLnB5IiAgPT4gIi9i aW4vcHl0aG9uMyIgKVxuXG4nKQogCiAgICAgICAgICMgU2V0dXAgbG9nIGZpbGVzCiAgICAgICAg IGYud3JpdGUoKCdzZXJ2ZXIuZXJyb3Jsb2cgPSAiJXMiXG4nCmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9zZXJ2ZXJzL2xpZ2h0dHBkLmNvbmYgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9zZXJ2ZXJzL2xpZ2h0dHBkLmNvbmYKaW5k ZXggNWFjNGEyNjMzMWE0NjBmODU1YTE0ZTBiOTk0ZTllOTEwNWU2NjhmNi4uYzkxZTg3YWJhMzYw NjBiODg4NTY2Njc0ZWFjZDA1YjA5MzVlZDA4YiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvc2VydmVycy9saWdodHRwZC5jb25mCisrKyBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMvbGlnaHR0cGQuY29uZgpAQCAtMzgs NyArMzgsNyBAQCBtaW1ldHlwZS51c2UteGF0dHIgICAgICAgICAgPSAiZW5hYmxlIgogIyB3aGlj aCBleHRlbnNpb25zIHNob3VsZCBub3QgYmUgaGFuZGxlIHZpYSBzdGF0aWMtZmlsZSB0cmFuc2Zl cgogIwogIyAucGhwLCAucGwsIC5mY2dpIGFyZSBtb3N0IG9mdGVuIGhhbmRsZWQgYnkgbW9kX2Zh c3RjZ2kgb3IgbW9kX2NnaQotc3RhdGljLWZpbGUuZXhjbHVkZS1leHRlbnNpb25zID0gKCAiLnBo cCIsICIucGwiLCAiLmNnaSIgKQorc3RhdGljLWZpbGUuZXhjbHVkZS1leHRlbnNpb25zID0gKCAi LnB5IiwgIi5wbCIsICIuY2dpIiApCiAKIHNlcnZlci5iaW5kID0gImxvY2FsaG9zdCIKIHNlcnZl ci5wb3J0ID0gODAwMQo= 453308 2022-02-26 13:54:42 -0800 2022-02-28 09:38:32 -0800 Patch bug-236938-20220226225437.patch text/plain 4914 nep-webkit U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMjIzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjI2NDAyZTA4OGNlZmRmYWUxOGJmN2I1OGVkY2E5NWIx NGJiZDk0Ni4uZDA3MTk5OWFlYjEzNzQ0ZWZhZjE3YTFkNzU4MDc4ZTg4Y2VhMGU4NyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDIyLTAyLTIwICBQYXNjYWwgQWJyZXNjaCAgPG5lcEBwYWNrYWdlbG9zcy5ldT4KKwor ICAgICAgICBFbmFibGUgcHl0aG9uMyBmb3IgbGlnaHR0cGQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjkzOAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgbmVlZGVkIGZvciB0aGUgSGFpa3Ug cG9ydCB0byB1c2UgdGhlIHB5dGhvbjMgdGVzdHMuCisgICAgICAgIFRoaXMgcGF0Y2ggYWxzbyBy ZW1vdmVzIHRoZSBQSFAgc3VwcG9ydCBzaW5jZSBhbGwgUEhQIHRlc3RzIGhhdmUgYmVlbiByZW1v dmVkIGFuZCB0aGVyZSBhcmUKKyAgICAgICAgY3VycmVudGx5IG5vIHBsYW5zIHRvIGluY2x1ZGUg bmV3IG9uZXMgaW4gdGhlIGZ1dHVyZS4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9zZXJ2ZXJzL2h0dHBfc2VydmVyLnB5OgorICAgICAgICAoTGlnaHR0cGQuX3ByZXBh cmVfY29uZmlnKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9zZXJ2 ZXJzL2xpZ2h0dHBkLmNvbmY6CisKIDIwMjItMDItMTkgIFNpaHVpIExpdSAgPHNpaHVpX2xpdUBh cHBsZS5jb20+CiAKICAgICAgICAgU2V0IGN1c3RvbSBnZW5lcmFsIHN0b3JhZ2UgZGlyZWN0b3J5 IGZvciBjdXN0b20gV2Vic2l0ZURhdGFTdG9yZSBpbiBUZXN0Q29udHJvbGxlcgpkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvc2VydmVycy9odHRwX3NlcnZl ci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMvaHR0cF9z ZXJ2ZXIucHkKaW5kZXggNzZlMjcxOTYyNDgyNWQzZmRhYTZkNzJhYzA3M2JlYmZmZDg4YTk1OC4u Y2UwYzdiZGM4ZDQ0MWYzMDY0Nzk4NDI4ZjZkYTg5OWRlOGIyZWM3NyAxMDA2NDQKLS0tIGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvc2VydmVycy9odHRwX3NlcnZlci5weQor KysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9zZXJ2ZXJzL2h0dHBfc2Vy dmVyLnB5CkBAIC0xMDgsMTEgKzEwOCwxMCBAQCBjbGFzcyBMaWdodHRwZChodHRwX3NlcnZlcl9i YXNlLkh0dHBTZXJ2ZXJCYXNlKToKICAgICAgICAgIyBXcml0ZSBvdXQgb3VyIGNnaSBoYW5kbGVy cy4gIFJ1biBwZXJsIHRocm91Z2ggZW52IHNvIHRoYXQgaXQKICAgICAgICAgIyBwcm9jZXNzZXMg dGhlICMhIGxpbmUgYW5kIHJ1bnMgcGVybCB3aXRoIHRoZSBwcm9wZXIgY29tbWFuZAogICAgICAg ICAjIGxpbmUgYXJndW1lbnRzLiBFbXVsYXRlIGFwYWNoZSdzIG1vZF9hc2lzIHdpdGggYSBjYXQg Y2dpIGhhbmRsZXIuCi0gICAgICAgIGYud3JpdGUoKCdjZ2kuYXNzaWduID0gKCAiLmNnaSIgID0+ ICIvdXNyL2Jpbi9lbnYiLFxuJworICAgICAgICBmLndyaXRlKCdjZ2kuYXNzaWduID0gKCAiLmNn aSIgID0+ICIvdXNyL2Jpbi9lbnYiLFxuJwogICAgICAgICAgICAgICAgICAnICAgICAgICAgICAg ICAgIi5wbCIgICA9PiAiL3Vzci9iaW4vZW52IixcbicKICAgICAgICAgICAgICAgICAgJyAgICAg ICAgICAgICAgICIuYXNpcyIgPT4gIi9iaW4vY2F0IixcbicKLSAgICAgICAgICAgICAgICAgJyAg ICAgICAgICAgICAgICIucGhwIiAgPT4gIiVzIiApXG5cbicpICUKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBzZWxmLl9wb3J0X29iai5fcGF0aF90b19saWdodHRwZF9waHAo KSkKKyAgICAgICAgICAgICAgICAgJyAgICAgICAgICAgICAgICIucHkiICA9PiAiL2Jpbi9weXRo b24zIiApXG5cbicpCiAKICAgICAgICAgIyBTZXR1cCBsb2cgZmlsZXMKICAgICAgICAgZi53cml0 ZSgoJ3NlcnZlci5lcnJvcmxvZyA9ICIlcyJcbicKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMvbGlnaHR0cGQuY29uZiBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMvbGlnaHR0cGQuY29uZgppbmRleCA1YWM0 YTI2MzMxYTQ2MGY4NTVhMTRlMGI5OTRlOWU5MTA1ZTY2OGY2Li5jZTVjYjY0MzkxZDUyYmRhMzIx NzEwZjEwMTcyNDJlYmIxNDQzZmUwIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9zZXJ2ZXJzL2xpZ2h0dHBkLmNvbmYKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvc2VydmVycy9saWdodHRwZC5jb25mCkBAIC0zNyw4ICszNyw5 IEBAIG1pbWV0eXBlLnVzZS14YXR0ciAgICAgICAgICA9ICJlbmFibGUiCiAjIwogIyB3aGljaCBl eHRlbnNpb25zIHNob3VsZCBub3QgYmUgaGFuZGxlIHZpYSBzdGF0aWMtZmlsZSB0cmFuc2Zlcgog IwotIyAucGhwLCAucGwsIC5mY2dpIGFyZSBtb3N0IG9mdGVuIGhhbmRsZWQgYnkgbW9kX2Zhc3Rj Z2kgb3IgbW9kX2NnaQotc3RhdGljLWZpbGUuZXhjbHVkZS1leHRlbnNpb25zID0gKCAiLnBocCIs ICIucGwiLCAiLmNnaSIgKQorIyAucGwsIC5mY2dpIGFyZSBtb3N0IG9mdGVuIGhhbmRsZWQgYnkg bW9kX2Zhc3RjZ2kgb3IgbW9kX2NnaQorIyAucHkgaXMgbmVlZGVkIGZvciBweXRob24gYmFzZWQg bGF5b3V0IHRlc3RzCitzdGF0aWMtZmlsZS5leGNsdWRlLWV4dGVuc2lvbnMgPSAoICIucHkiLCAi LnBsIiwgIi5jZ2kiICkKIAogc2VydmVyLmJpbmQgPSAibG9jYWxob3N0Igogc2VydmVyLnBvcnQg PSA4MDAxCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weSBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5CmluZGV4IDZjNWNjMzU3MmYyNzU3 ZTcwYTQwOGQ3NWY3YTk5ZjUzMDIwOGUwMWMuLmJkNjRjMzc5YjFjZWFkYzhjMjliZjVkODRiNmU2 YjM4OGY1YTlkODUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNl LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5CkBAIC0xMjc3LDEy ICsxMjc3LDYgQEAgY2xhc3MgUG9ydChvYmplY3QpOgogICAgICAgICBUaGlzIGlzIG5lZWRlZCBv bmx5IGJ5IHBvcnRzIHRoYXQgdXNlIHRoZSBodHRwX3NlcnZlci5weSBtb2R1bGUuIiIiCiAgICAg ICAgIHJhaXNlIE5vdEltcGxlbWVudGVkRXJyb3IoJ1BvcnQuX3BhdGhfdG9fbGlnaHR0cGRfbW9k dWxlcycpCiAKLSAgICBkZWYgX3BhdGhfdG9fbGlnaHR0cGRfcGhwKHNlbGYpOgotICAgICAgICAi IiJSZXR1cm5zIHRoZSBwYXRoIHRvIHRoZSBMaWdIVFRQZCBQSFAgZXhlY3V0YWJsZS4KLQotICAg ICAgICBUaGlzIGlzIG5lZWRlZCBvbmx5IGJ5IHBvcnRzIHRoYXQgdXNlIHRoZSBodHRwX3NlcnZl ci5weSBtb2R1bGUuIiIiCi0gICAgICAgIHJhaXNlIE5vdEltcGxlbWVudGVkRXJyb3IoJ1BvcnQu X3BhdGhfdG9fbGlnaHR0cGRfcGhwJykKLQogICAgIGRlZiBfd2Via2l0X2Jhc2VsaW5lX3BhdGgo c2VsZiwgcGxhdGZvcm0pOgogICAgICAgICAiIiJSZXR1cm4gdGhlICBmdWxsIHBhdGggdG8gdGhl IHRvcCBvZiB0aGUgYmFzZWxpbmUgdHJlZSBmb3IgYQogICAgICAgICBnaXZlbiBwbGF0Zm9ybS4i IiIKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC90ZXN0LnB5IGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3Rlc3QucHkKaW5kZXggYTFiOGY2Y2UyMTc3NzY3M2Q1 NGRiMTMzOTU1ZWZmYTkwY2NmODY3MS4uZThkNGM1ZjY4ZjM4Zjk2OGI5ZGJlOTgxN2VkZDFmNGY1 ODFlNzAwZiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3Rlc3QucHkK KysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3Rlc3QucHkKQEAgLTQ4OSw5ICs0ODks NiBAQCBjbGFzcyBUZXN0UG9ydChQb3J0KToKICAgICBkZWYgX3BhdGhfdG9fbGlnaHR0cGRfbW9k dWxlcyhzZWxmKToKICAgICAgICAgcmV0dXJuICIvdXNyL2xpYi9saWdodHRwZCIKIAotICAgIGRl ZiBfcGF0aF90b19saWdodHRwZF9waHAoc2VsZik6Ci0gICAgICAgIHJldHVybiAiL3Vzci9iaW4v cGhwLWNnaSIKLQogICAgIGRlZiBfcGF0aF90b19hcGFjaGUoc2VsZik6CiAgICAgICAgIHJldHVy biAiL3Vzci9zYmluL2h0dHBkIgogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3BvcnQvd2luLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3dpbi5weQppbmRleCBj YjI1NjYzYTMxOTJjOTMwMGZlNTA5YzUyZDNkNjQwMDViOTBjNGVjLi4xZThmMWQyYjc3NDg3YjU3 Mjg1YTYwODJlYjE2ZmFmODA4M2Y4NGJlIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L3BvcnQvd2luLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93aW4ucHkK QEAgLTE5OCw5ICsxOTgsNiBAQCBjbGFzcyBXaW5Qb3J0KEFwcGxlUG9ydCk6CiAgICAgZGVmIF9w YXRoX3RvX2xpZ2h0dHBkX21vZHVsZXMoc2VsZik6CiAgICAgICAgIHJldHVybiAiL3Vzci9saWIv bGlnaHR0cGQiCiAKLSAgICBkZWYgX3BhdGhfdG9fbGlnaHR0cGRfcGhwKHNlbGYpOgotICAgICAg ICByZXR1cm4gIi91c3IvYmluL3BocC1jZ2kiCi0KICAgICBkZWYgX3BhdGhfdG9fZGVmYXVsdF9p bWFnZV9kaWZmKHNlbGYpOgogICAgICAgICByZXR1cm4gc2VsZi5fYnVpbGRfcGF0aCgnSW1hZ2VE aWZmLmV4ZScpCiAK