169285 2017-03-07 09:51:26 -0800 XMLHttpRequest: make setRequestHeader() use `, ` as separator (including a space) 2017-03-11 22:07:13 -0800 1 1 1 Unclassified WebKit DOM Safari Technology Preview Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=168115 P2 Normal --- 1 annevk youennf achristensen ap cdumez cgarcia commit-queue youennf oldest_to_newest 1284372 0 annevk 2017-03-07 09:51:26 -0800 See https://github.com/whatwg/xhr/issues/108. web-platform-tests at: XMLHttpRequest/setrequestheader-case-insensitive.htm XMLHttpRequest/setrequestheader-header-allowed.htm 1284459 1 ap 2017-03-07 11:52:41 -0800 We just changed it to never add a space, in part because doing otherwise would be complicated for CFNetwork based ports. 1284513 2 youennf 2017-03-07 13:02:43 -0800 If we change XHR to use ', ', we will also change it to fetch. Currently we are using ',' for both, except when CFNetwork is changing that behind the scene, which it should really not. 1284791 3 annevk 2017-03-08 00:44:33 -0800 I have been trying to get your input in the issue, but am glad filing bugs is working out better. It sounds like the preference from WebKit is that we only have a single separator style, used by: XMLHttpRequest WebSocket Fetch API CORS Knowing that makes it easier to talk with the other browsers. I suspect what we want to do is use `, ` and also change Fetch to use that and any Fetch API tests. `Access-Control-Request-Headers` seems tricky though, as I believe no browser uses a space after the commas there now. Is that problematic? 1284862 4 youennf 2017-03-08 08:18:46 -0800 (In reply to comment #3) > I have been trying to get your input in the issue, but am glad filing bugs > is working out better. Sorry about that, I plan to get back to fetch/XHR soon. I should probably improve my GitHub notification filter. > It sounds like the preference from WebKit is that we only have a single > separator style, used by: > > XMLHttpRequest > WebSocket > Fetch API > CORS Right. > Knowing that makes it easier to talk with the other browsers. I suspect what > we want to do is use `, ` and also change Fetch to use that and any Fetch > API tests. Yes, that is probably the most interoperable choice. > `Access-Control-Request-Headers` seems tricky though, as I believe no > browser uses a space after the commas there now. Is that problematic? WebKit is already using `,` here so no problem, except the small inconsistency. 1285796 5 annevk 2017-03-10 07:28:00 -0800 It seems Mozilla is tentatively okay with making this change. I prepared three pull requests to make this setup work: https://github.com/whatwg/fetch/pull/504 https://github.com/whatwg/xhr/pull/130 https://github.com/w3c/web-platform-tests/pull/5115 If I missed tests that need updating I'd appreciate your help with that. I'd also appreciate any review. 1285829 6 youennf 2017-03-10 09:46:48 -0800 Sure, I'll update WebKit side and upstream any needed change to WPT 1285832 7 annevk 2017-03-10 09:53:58 -0800 (To be clear, I don't know if Mozilla is okay with lowercasing header names and reordering them for getAllResponseHeaders(). Those two items still need to be battle-tested somehow, but aligning on `, ` seems okay.) 1285900 8 304069 youennf 2017-03-10 13:51:50 -0800 Created attachment 304069 Patch 1286877 9 304069 commit-queue 2017-03-11 22:07:08 -0800 Comment on attachment 304069 Patch Clearing flags on attachment: 304069 Committed r213766: <http://trac.webkit.org/changeset/213766> 1286878 10 commit-queue 2017-03-11 22:07:13 -0800 All reviewed patches have been landed. Closing bug. 304069 2017-03-10 13:51:50 -0800 2017-03-11 22:07:08 -0800 Patch bug-169285-20170310135150.patch text/plain 10267 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjEzNjU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTIzYjI4YTE0MGE5MWRj NjhlYmI4MzM4OGFiMjUzMmZjNzA3YjBmYy4uNTEyNDc1ZTRiMjQ4MmMxNTNlYjk3ODIzMzAxNTQ2 MzQwZjhiOGExYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE3IEBACiAyMDE3LTAzLTEwICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAorICAgICAgICBYTUxIdHRwUmVxdWVzdDog bWFrZSBzZXRSZXF1ZXN0SGVhZGVyKCkgdXNlIGAsIGAgYXMgc2VwYXJhdG9yIChpbmNsdWRpbmcg YSBzcGFjZSkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE2OTI4NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IENvdmVyZWQgYnkgdXBkYXRlZCB0ZXN0cy4KKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsv SFRUUEhlYWRlck1hcC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVFRQSGVhZGVyTWFwOjphZGQp OiBSZXZlcnRpbmcgYmFjayB0byAnLCAnLgorCisyMDE3LTAzLTEwICBZb3Vlbm4gRmFibGV0ICA8 eW91ZW5uQGFwcGxlLmNvbT4KKwogICAgICAgICBNb3ZlIGxpYndlYnJ0YyBiYWNrZW5kIHRvIHVz aW5nIHRyYWNrcwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTY5NDcyCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv SFRUUEhlYWRlck1hcC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0hUVFBI ZWFkZXJNYXAuY3BwCmluZGV4IDE5Njk0ODAxMDg2M2M3ZTQyNWIyOWFjN2U1OTgzZjAwNzUwNzk0 YTYuLjZiZjFjZjU1YWQyNTY4Nzg0YWM0Yzg2YjBmMzFiMTZlNjAyMjA1ZmQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvSFRUUEhlYWRlck1hcC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9IVFRQSGVhZGVyTWFwLmNwcApAQCAtOTcs NyArOTcsNyBAQCB2b2lkIEhUVFBIZWFkZXJNYXA6OmFkZChjb25zdCBTdHJpbmcmIG5hbWUsIGNv bnN0IFN0cmluZyYgdmFsdWUpCiAgICAgaWYgKCFmaW5kSFRUUEhlYWRlck5hbWUobmFtZSwgaGVh ZGVyTmFtZSkpIHsKICAgICAgICAgYXV0byByZXN1bHQgPSBtX3VuY29tbW9uSGVhZGVycy5hZGQo bmFtZSwgdmFsdWUpOwogICAgICAgICBpZiAoIXJlc3VsdC5pc05ld0VudHJ5KQotICAgICAgICAg ICAgcmVzdWx0Lml0ZXJhdG9yLT52YWx1ZSA9IHJlc3VsdC5pdGVyYXRvci0+dmFsdWUgKyAnLCcg KyB2YWx1ZTsKKyAgICAgICAgICAgIHJlc3VsdC5pdGVyYXRvci0+dmFsdWUgPSByZXN1bHQuaXRl cmF0b3ItPnZhbHVlICsgIiwgIiArIHZhbHVlOwogICAgICAgICByZXR1cm47CiAgICAgfQogICAg IGFkZChoZWFkZXJOYW1lLCB2YWx1ZSk7CkBAIC0xNDgsNyArMTQ4LDcgQEAgdm9pZCBIVFRQSGVh ZGVyTWFwOjphZGQoSFRUUEhlYWRlck5hbWUgbmFtZSwgY29uc3QgU3RyaW5nJiB2YWx1ZSkKIHsK ICAgICBhdXRvIHJlc3VsdCA9IG1fY29tbW9uSGVhZGVycy5hZGQobmFtZSwgdmFsdWUpOwogICAg IGlmICghcmVzdWx0LmlzTmV3RW50cnkpCi0gICAgICAgIHJlc3VsdC5pdGVyYXRvci0+dmFsdWUg PSByZXN1bHQuaXRlcmF0b3ItPnZhbHVlICsgJywnICsgdmFsdWU7CisgICAgICAgIHJlc3VsdC5p dGVyYXRvci0+dmFsdWUgPSByZXN1bHQuaXRlcmF0b3ItPnZhbHVlICsgIiwgIiArIHZhbHVlOwog fQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNmVmZmQxYjA4Yzc0MGY5ZWFhOTYw ODlhZWYzOWRiYmExOTFlOGM3Ny4uMDZlMjBmNTRhZGVjMzI3NTJkMjFkZTQxZDU3ODA0MTQ1ZmVi Y2Q1MSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE2IEBACiAyMDE3LTAzLTEwICBZb3Vlbm4gRmFibGV0ICA8 eW91ZW5uQGFwcGxlLmNvbT4KIAorICAgICAgICBYTUxIdHRwUmVxdWVzdDogbWFrZSBzZXRSZXF1 ZXN0SGVhZGVyKCkgdXNlIGAsIGAgYXMgc2VwYXJhdG9yIChpbmNsdWRpbmcgYSBzcGFjZSkKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2OTI4NQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaHR0cC90ZXN0 cy94bWxodHRwcmVxdWVzdC9jaGVjay1jb21iaW5pbmctaGVhZGVycy1leHBlY3RlZC50eHQ6Cisg ICAgICAgICogaHR0cC90ZXN0cy94bWxodHRwcmVxdWVzdC9jaGVjay1jb21iaW5pbmctaGVhZGVy cy5odG1sOgorICAgICAgICAqIGh0dHAvdGVzdHMveG1saHR0cHJlcXVlc3Qvd2ViLWFwcHMvMDA1 Lmh0bWw6CisKKzIwMTctMDMtMTAgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgor CiAgICAgICAgIE1vdmUgbGlid2VicnRjIGJhY2tlbmQgdG8gdXNpbmcgdHJhY2tzCiAgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjk0NzIKIApkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL2lt cG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXggNWMxZWM5MTFjYjdlNDQ1MWM4MmI0NzI5OTMwOTZj NWI4MmY5ZDdiZS4uZmM1OGQxNjYyNGY2NzI2NGE3OWQ5NjkwMmM3YjIxY2I5NzNkZWE5YyAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZworKysgYi9MYXlvdXRU ZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTctMDMtMTAg IFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIFhNTEh0dHBSZXF1 ZXN0OiBtYWtlIHNldFJlcXVlc3RIZWFkZXIoKSB1c2UgYCwgYCBhcyBzZXBhcmF0b3IgKGluY2x1 ZGluZyBhIHNwYWNlKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTY5Mjg1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvWE1MSHR0cFJlcXVlc3Qvc2V0cmVxdWVzdGhlYWRl ci1jYXNlLWluc2Vuc2l0aXZlLmh0bToKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvWE1M SHR0cFJlcXVlc3Qvc2V0cmVxdWVzdGhlYWRlci1oZWFkZXItYWxsb3dlZC5odG06CisgICAgICAg ICogd2ViLXBsYXRmb3JtLXRlc3RzL2ZldGNoL2FwaS9oZWFkZXJzL2hlYWRlcnMtY29tYmluZS5o dG1sOgorCiAyMDE3LTAzLTA4ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAg ICAgICAgRHJvcCBzdXBwb3J0IGZvciBub24tc3RhbmRhcmQgZG9jdW1lbnQuYWxsLnRhZ3MoKQpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy94bWxodHRwcmVxdWVzdC9jaGVjay1j b21iaW5pbmctaGVhZGVycy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3ht bGh0dHByZXF1ZXN0L2NoZWNrLWNvbWJpbmluZy1oZWFkZXJzLWV4cGVjdGVkLnR4dAppbmRleCBm ZGMzYjRlZjVlZWIyMzc5NjQ1YzA4N2EyNzMwNTdhNjVkMWYyZTJjLi5hNWFkYzYzNjRiYWZkNWJl ZWI3YjQyMTFlNDJmZmE2YTA3ZTZlNzhlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rl c3RzL3htbGh0dHByZXF1ZXN0L2NoZWNrLWNvbWJpbmluZy1oZWFkZXJzLWV4cGVjdGVkLnR4dAor KysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3htbGh0dHByZXF1ZXN0L2NoZWNrLWNvbWJpbmlu Zy1oZWFkZXJzLWV4cGVjdGVkLnR4dApAQCAtNSw4ICs1LDggQEAgQ09OU09MRSBNRVNTQUdFOiBs aW5lIDE3OiBSZWZ1c2VkIHRvIHNldCB1bnNhZmUgaGVhZGVyICJDb250ZW50LVRyYW5zZmVyLUVu Y29kaW4KIAogUEFTUyBYTUxIdHRwUmVxdWVzdDogc2V0UmVxdWVzdEhlYWRlcigpIC0gY29tYmlu aW5nIGhlYWRlcnMgKEF1dGhvcml6YXRpb24pIAogUEFTUyBYTUxIdHRwUmVxdWVzdDogc2V0UmVx dWVzdEhlYWRlcigpIC0gY29tYmluaW5nIGhlYWRlcnMgKFByYWdtYSkgCi1GQUlMIFhNTEh0dHBS ZXF1ZXN0OiBzZXRSZXF1ZXN0SGVhZGVyKCkgLSBjb21iaW5pbmcgaGVhZGVycyAoVXNlci1BZ2Vu dCkgYXNzZXJ0X3RydWU6IENvbWJpbmVkIGhlYWRlciB2YWx1ZSBzaG91bGQgYmUgdDEsdDIgZXhw ZWN0ZWQgdHJ1ZSBnb3QgZmFsc2UKLUZBSUwgWE1MSHR0cFJlcXVlc3Q6IHNldFJlcXVlc3RIZWFk ZXIoKSAtIGNvbWJpbmluZyBoZWFkZXJzIChDb250ZW50LVRyYW5zZmVyLUVuY29kaW5nKSBhc3Nl cnRfZXF1YWxzOiBDb21iaW5lZCBoZWFkZXIgdmFsdWUgc2hvdWxkIGJlIHQxLHQyIGV4cGVjdGVk IChzdHJpbmcpICJ0MSx0MiIgYnV0IGdvdCAodW5kZWZpbmVkKSB1bmRlZmluZWQKK0ZBSUwgWE1M SHR0cFJlcXVlc3Q6IHNldFJlcXVlc3RIZWFkZXIoKSAtIGNvbWJpbmluZyBoZWFkZXJzIChVc2Vy LUFnZW50KSBhc3NlcnRfdHJ1ZTogQ29tYmluZWQgaGVhZGVyIHZhbHVlIHNob3VsZCBiZSB0MSwg dDIgZXhwZWN0ZWQgdHJ1ZSBnb3QgZmFsc2UKK0ZBSUwgWE1MSHR0cFJlcXVlc3Q6IHNldFJlcXVl c3RIZWFkZXIoKSAtIGNvbWJpbmluZyBoZWFkZXJzIChDb250ZW50LVRyYW5zZmVyLUVuY29kaW5n KSBhc3NlcnRfZXF1YWxzOiBDb21iaW5lZCBoZWFkZXIgdmFsdWUgc2hvdWxkIGJlIHQxLCB0MiBl eHBlY3RlZCAoc3RyaW5nKSAidDEsIHQyIiBidXQgZ290ICh1bmRlZmluZWQpIHVuZGVmaW5lZAog UEFTUyBYTUxIdHRwUmVxdWVzdDogc2V0UmVxdWVzdEhlYWRlcigpIC0gY29tYmluaW5nIGhlYWRl cnMgKENvbnRlbnQtVHlwZSkgCiBQQVNTIFhNTEh0dHBSZXF1ZXN0OiBzZXRSZXF1ZXN0SGVhZGVy KCkgLSBjb21iaW5pbmcgaGVhZGVycyAoT3ZlcndyaXRlKSAKIFBBU1MgWE1MSHR0cFJlcXVlc3Q6 IHNldFJlcXVlc3RIZWFkZXIoKSAtIGNvbWJpbmluZyBoZWFkZXJzIChJZikgCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3htbGh0dHByZXF1ZXN0L2NoZWNrLWNvbWJpbmluZy1o ZWFkZXJzLmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3htbGh0dHByZXF1ZXN0L2NoZWNr LWNvbWJpbmluZy1oZWFkZXJzLmh0bWwKaW5kZXggNTRiZDkxY2QyMWY5NzQxMzhiODMzYzAxZWYy ZTFhYmQ3MDgyYjcxOS4uODNlN2EzYjgyMTMwMDIyNGVlMzhkNTY5YWM4OTc4NDUyZmE2N2UyNyAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy94bWxodHRwcmVxdWVzdC9jaGVjay1j b21iaW5pbmctaGVhZGVycy5odG1sCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMveG1saHR0 cHJlcXVlc3QvY2hlY2stY29tYmluaW5nLWhlYWRlcnMuaHRtbApAQCAtMTcsOSArMTcsOSBAQAog ICAgICAgICAgIGNsaWVudC5zZXRSZXF1ZXN0SGVhZGVyKGhlYWRlciwgInQyIikKICAgICAgICAg ICBjbGllbnQuc2VuZChudWxsKQogICAgICAgICAgIGlmICghZG9Ob3RzaG93RnVsbFZhbHVlSW5F cnJvcikKLSAgICAgICAgICAgICAgYXNzZXJ0X2VxdWFscyhKU09OLnBhcnNlKGNsaWVudC5yZXNw b25zZSlbaGVhZGVyLnRvTG93ZXJDYXNlKCldLCAidDEsdDIiLCAiQ29tYmluZWQgaGVhZGVyIHZh bHVlIHNob3VsZCBiZSB0MSx0MiIpCisgICAgICAgICAgICAgIGFzc2VydF9lcXVhbHMoSlNPTi5w YXJzZShjbGllbnQucmVzcG9uc2UpW2hlYWRlci50b0xvd2VyQ2FzZSgpXSwgInQxLCB0MiIsICJD b21iaW5lZCBoZWFkZXIgdmFsdWUgc2hvdWxkIGJlIHQxLCB0MiIpCiAgICAgICAgICAgZWxzZQot ICAgICAgICAgICAgICBhc3NlcnRfdHJ1ZShKU09OLnBhcnNlKGNsaWVudC5yZXNwb25zZSlbaGVh ZGVyLnRvTG93ZXJDYXNlKCldID09ICJ0MSx0MiIsICJDb21iaW5lZCBoZWFkZXIgdmFsdWUgc2hv dWxkIGJlIHQxLHQyIikKKyAgICAgICAgICAgICAgYXNzZXJ0X3RydWUoSlNPTi5wYXJzZShjbGll bnQucmVzcG9uc2UpW2hlYWRlci50b0xvd2VyQ2FzZSgpXSA9PSAidDEsIHQyIiwgIkNvbWJpbmVk IGhlYWRlciB2YWx1ZSBzaG91bGQgYmUgdDEsIHQyIikKICAgICAgICAgfSwgZG9jdW1lbnQudGl0 bGUgKyAiICgiICsgaGVhZGVyICsgIikiKQogICAgICAgfQogICAgICAgcmVxdWVzdCgiQXV0aG9y aXphdGlvbiIpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3htbGh0dHByZXF1 ZXN0L3dlYi1hcHBzLzAwNS5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy94bWxodHRwcmVx dWVzdC93ZWItYXBwcy8wMDUuaHRtbAppbmRleCBhNjMxOGU1ODkyZGI4MGVkNzU3YTIyMjFkOGM3 YWU4OWQ2ZTJhZWRmLi5kZGI2NDU2YTU3NDYyMjJmNjI1NjJkZWY0OWM1M2UyMWJhMWIxYzJlIDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3htbGh0dHByZXF1ZXN0L3dlYi1hcHBz LzAwNS5odG1sCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMveG1saHR0cHJlcXVlc3Qvd2Vi LWFwcHMvMDA1Lmh0bWwKQEAgLTE5LDcgKzE5LDcgQEAKICAgIHIuc2V0UmVxdWVzdEhlYWRlcign WC1UZXN0LUhlYWRlcicsICdPTkUnKTsKICAgIHIuc2V0UmVxdWVzdEhlYWRlcignWC1UZXN0LUhl YWRlcicsICdUV08nKTsKICAgIHIuc2VuZChudWxsKTsKLSAgIGlmIChyLnJlc3BvbnNlVGV4dCA9 PSAnUkVTVUxUOltPTkUsVFdPXScpIHsKKyAgIGlmIChyLnJlc3BvbnNlVGV4dCA9PSAnUkVTVUxU OltPTkUsIFRXT10nKSB7CiAgICAgIHAuZmlyc3RDaGlsZC5kYXRhID0gJ1BBU1MnOwogICAgfSBl bHNlIHsKICAgICAgcC5maXJzdENoaWxkLmRhdGEgPSAnRkFJTCAoJyArIHIucmVzcG9uc2VUZXh0 ICsgJyknOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy9YTUxIdHRwUmVxdWVzdC9zZXRyZXF1ZXN0aGVhZGVyLWNhc2UtaW5zZW5zaXRpdmUu aHRtIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9YTUxIdHRw UmVxdWVzdC9zZXRyZXF1ZXN0aGVhZGVyLWNhc2UtaW5zZW5zaXRpdmUuaHRtCmluZGV4IDI0ODMw NmZjZTRhZTAxNGEyNmIyYjBlYWNmYjExZTA3Mzk1MmRkZDcuLmNmODgxMGQwZmI2MjkxYjQ2NDBm NTcxNmU1MzdjNGJjMzY2NThjNWIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3cz Yy93ZWItcGxhdGZvcm0tdGVzdHMvWE1MSHR0cFJlcXVlc3Qvc2V0cmVxdWVzdGhlYWRlci1jYXNl LWluc2Vuc2l0aXZlLmh0bQorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL1hNTEh0dHBSZXF1ZXN0L3NldHJlcXVlc3RoZWFkZXItY2FzZS1pbnNlbnNpdGl2 ZS5odG0KQEAgLTExLDcgKzExLDcgQEAKICAgICA8c2NyaXB0PgogICAgICAgdGVzdChmdW5jdGlv bigpIHsKICAgICAgICAgdmFyIGNsaWVudCA9IG5ldyBYTUxIdHRwUmVxdWVzdCgpCi0gICAgICAg IGNsaWVudC5vcGVuKCJQT1NUIiwgInJlc291cmNlcy9pbnNwZWN0LWhlYWRlcnMucHk/ZmlsdGVy X3ZhbHVlPXQxLHQyLHQzIiwgZmFsc2UpCisgICAgICAgIGNsaWVudC5vcGVuKCJQT1NUIiwgInJl c291cmNlcy9pbnNwZWN0LWhlYWRlcnMucHk/ZmlsdGVyX3ZhbHVlPXQxLCB0MiwgdDMiLCBmYWxz ZSkKICAgICAgICAgY2xpZW50LnNldFJlcXVlc3RIZWFkZXIoIngtdGVzdCIsICJ0MSIpCiAgICAg ICAgIGNsaWVudC5zZXRSZXF1ZXN0SGVhZGVyKCJYLVRFU1QiLCAidDIiKQogICAgICAgICBjbGll bnQuc2V0UmVxdWVzdEhlYWRlcigiWC10ZVNUIiwgInQzIikKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvWE1MSHR0cFJlcXVlc3Qvc2V0cmVx dWVzdGhlYWRlci1oZWFkZXItYWxsb3dlZC5odG0gYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL1hNTEh0dHBSZXF1ZXN0L3NldHJlcXVlc3RoZWFkZXItaGVhZGVy LWFsbG93ZWQuaHRtCmluZGV4IDMxZTQwZGYxNmY0NTE5YjhiMDBjODE5OTU2ZmEwMjFhMWZjMzli MGIuLjNhZWJiMWQyY2JiOWZmZDRlNzFjZWU2NTQyNTRkNGRiMDA5YjYzMjIgMTAwNjQ0Ci0tLSBh L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvWE1MSHR0cFJlcXVl c3Qvc2V0cmVxdWVzdGhlYWRlci1oZWFkZXItYWxsb3dlZC5odG0KKysrIGIvTGF5b3V0VGVzdHMv aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9YTUxIdHRwUmVxdWVzdC9zZXRyZXF1ZXN0 aGVhZGVyLWhlYWRlci1hbGxvd2VkLmh0bQpAQCAtMTIsNyArMTIsNyBAQAogICAgICAgZnVuY3Rp b24gcmVxdWVzdChoZWFkZXIpIHsKICAgICAgICAgdGVzdChmdW5jdGlvbigpIHsKICAgICAgICAg ICB2YXIgY2xpZW50ID0gbmV3IFhNTEh0dHBSZXF1ZXN0KCkKLSAgICAgICAgICBjbGllbnQub3Bl bigiUE9TVCIsICJyZXNvdXJjZXMvaW5zcGVjdC1oZWFkZXJzLnB5P2ZpbHRlcl92YWx1ZT10MSx0 MiIsIGZhbHNlKQorICAgICAgICAgIGNsaWVudC5vcGVuKCJQT1NUIiwgInJlc291cmNlcy9pbnNw ZWN0LWhlYWRlcnMucHk/ZmlsdGVyX3ZhbHVlPXQxLCB0MiIsIGZhbHNlKQogICAgICAgICAgIGNs aWVudC5zZXRSZXF1ZXN0SGVhZGVyKGhlYWRlciwgInQxIikKICAgICAgICAgICBjbGllbnQuc2V0 UmVxdWVzdEhlYWRlcihoZWFkZXIsICJ0MiIpCiAgICAgICAgICAgY2xpZW50LnNlbmQobnVsbCkK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv ZmV0Y2gvYXBpL2hlYWRlcnMvaGVhZGVycy1jb21iaW5lLmh0bWwgYi9MYXlvdXRUZXN0cy9pbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2ZldGNoL2FwaS9oZWFkZXJzL2hlYWRlcnMtY29t YmluZS5odG1sCmluZGV4IGEwYzE1YjBmZWQ3NTkwNDg5ZjFlMTY4MWFjMDljOTFhMmU0MWM2YzMu LmRkY2ZkYmVlNmViOTcyOTVjZTk2ZTljNTUzMTc0NDQ0ODg5MjZjZDIgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvZmV0Y2gvYXBpL2hlYWRl cnMvaGVhZGVycy1jb21iaW5lLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy9mZXRjaC9hcGkvaGVhZGVycy9oZWFkZXJzLWNvbWJpbmUuaHRtbApA QCAtMTgsOCArMTgsOCBAQAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgWyJ0cmlwbGUi LCAidHJpcGxlVmFsdWUzIl0KICAgICAgIF07CiAgICAgICB2YXIgZXhwZWN0ZWREaWN0ID0geyJz aW5nbGUiOiAic2luZ2xlVmFsdWUiLAotICAgICAgICAgICAgICAgICAgICAgICAgICAiZG91Ymxl IjogImRvdWJsZVZhbHVlMSxkb3VibGVWYWx1ZTIiLAotICAgICAgICAgICAgICAgICAgICAgICAg ICAidHJpcGxlIjogInRyaXBsZVZhbHVlMSx0cmlwbGVWYWx1ZTIsdHJpcGxlVmFsdWUzIgorICAg ICAgICAgICAgICAgICAgICAgICAgICAiZG91YmxlIjogImRvdWJsZVZhbHVlMSwgZG91YmxlVmFs dWUyIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgInRyaXBsZSI6ICJ0cmlwbGVWYWx1ZTEs IHRyaXBsZVZhbHVlMiwgdHJpcGxlVmFsdWUzIgogICAgICAgfTsKIAogICAgICAgdGVzdChmdW5j dGlvbigpIHsKQEAgLTUxLDcgKzUxLDcgQEAKICAgICAgICAgZm9yIChuYW1lIGluIGV4cGVjdGVk RGljdCkgewogICAgICAgICAgIHZhciB2YWx1ZSA9IGhlYWRlcnMuZ2V0KG5hbWUpOwogICAgICAg ICAgIGhlYWRlcnMuYXBwZW5kKG5hbWUsIm5ld1NpbmdsZVZhbHVlIik7Ci0gICAgICAgICAgYXNz ZXJ0X2VxdWFscyhoZWFkZXJzLmdldChuYW1lKSwgKHZhbHVlICsgIiwiICsgIm5ld1NpbmdsZVZh bHVlIiksCisgICAgICAgICAgYXNzZXJ0X2VxdWFscyhoZWFkZXJzLmdldChuYW1lKSwgKHZhbHVl ICsgIiwgIiArICJuZXdTaW5nbGVWYWx1ZSIpLAogICAgICAgICAgICAgIm5hbWU6ICIgKyBuYW1l ICsgIiBoYXMgdmFsdWU6ICIgKyBoZWFkZXJzLmdldChuYW1lKSk7CiAgICAgICAgIH0KICAgICAg IH0sICJDaGVjayBhcHBlbmQgbWV0aG9kcyB3aGVuIGNhbGxlZCB3aXRoIGFscmVhZHkgdXNlZCBu YW1lIik7Cg==