78528 2012-02-13 13:52:29 -0800 NRWT's HTTP servers should support additional directories for resources 2012-02-13 14:40:02 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 78524 1 abarth abarth eric ojan webkit.review.bot oldest_to_newest 555547 0 abarth 2012-02-13 13:52:29 -0800 NRWT's HTTP servers should support additional directories for resources 555548 1 126823 abarth 2012-02-13 13:53:06 -0800 Created attachment 126823 Patch 555551 2 126823 eric 2012-02-13 13:54:16 -0800 Comment on attachment 126823 Patch Could you please add a unittest? 555612 3 126838 abarth 2012-02-13 14:35:33 -0800 Created attachment 126838 Patch 555616 4 abarth 2012-02-13 14:40:02 -0800 Committed r107614: <http://trac.webkit.org/changeset/107614> 126823 2012-02-13 13:53:06 -0800 2012-02-13 14:35:29 -0800 Patch bug-78528-20120213135311.patch text/plain 5204 abarth SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDEwNzYwMSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDEyLTAyLTEzICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisK KyAgICAgICAgTlJXVCdzIEhUVFAgc2VydmVycyBzaG91bGQgc3VwcG9ydCBhZGRpdGlvbmFsIGRp cmVjdG9yaWVzIGZvciByZXNvdXJjZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTc4NTI4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVGhpcyBmdW5jdGlvbmFsaXR5IHdpbGwgYmUgdXNlZCBieSB0aGUgQ2hy b21pdW0tQW5kcm9pZCBwb3J0LgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9iYXNlLnB5OgorICAgICAgICAoUG9ydC50by5zdGFydF9odHRwX3NlcnZlcik6 CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvc2VydmVycy9hcGFjaGVf aHR0cF9zZXJ2ZXIucHk6CisgICAgICAgIChMYXlvdXRUZXN0QXBhY2hlSHR0cGQuX19pbml0X18p OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMvaHR0cF9z ZXJ2ZXIucHk6CisgICAgICAgIChMaWdodHRwZC5fX2luaXRfXyk6CisgICAgICAgIChMaWdodHRw ZC5fcHJlcGFyZV9jb25maWcpOgorCiAyMDEyLTAyLTEzICBBbWkgRmlzY2htYW4gIDxmaXNjaG1h bkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQWRkIGZpc2NobWFuIGFzIGNvbW1pdHRlci4KSW5k ZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2Uu cHkJKHJldmlzaW9uIDEwNzU4OCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvYmFzZS5weQkod29ya2luZyBjb3B5KQpAQCAtNzUwLDE2ICs3NTAsMTYgQEAgY2xh c3MgUG9ydChvYmplY3QpOgogICAgICAgICBtZXRob2QuIiIiCiAgICAgICAgIHBhc3MKIAotICAg IGRlZiBzdGFydF9odHRwX3NlcnZlcihzZWxmKToKKyAgICBkZWYgc3RhcnRfaHR0cF9zZXJ2ZXIo c2VsZiwgYWRkaXRpb25hbF9kaXJzPU5vbmUpOgogICAgICAgICAiIiJTdGFydCBhIHdlYiBzZXJ2 ZXIuIFJhaXNlIGFuIGVycm9yIGlmIGl0IGNhbid0IHN0YXJ0IG9yIGlzIGFscmVhZHkgcnVubmlu Zy4KIAogICAgICAgICBQb3J0cyBjYW4gc3R1YiB0aGlzIG91dCBpZiB0aGV5IGRvbid0IG5lZWQg YSB3ZWIgc2VydmVyIHRvIGJlIHJ1bm5pbmcuIiIiCiAgICAgICAgIGFzc2VydCBub3Qgc2VsZi5f aHR0cF9zZXJ2ZXIsICdBbHJlYWR5IHJ1bm5pbmcgYW4gaHR0cCBzZXJ2ZXIuJwogCiAgICAgICAg IGlmIHNlbGYuX3VzZXNfYXBhY2hlKCk6Ci0gICAgICAgICAgICBzZXJ2ZXIgPSBhcGFjaGVfaHR0 cF9zZXJ2ZXIuTGF5b3V0VGVzdEFwYWNoZUh0dHBkKHNlbGYsIHNlbGYucmVzdWx0c19kaXJlY3Rv cnkoKSkKKyAgICAgICAgICAgIHNlcnZlciA9IGFwYWNoZV9odHRwX3NlcnZlci5MYXlvdXRUZXN0 QXBhY2hlSHR0cGQoc2VsZiwgc2VsZi5yZXN1bHRzX2RpcmVjdG9yeSgpLCBhZGRpdGlvbmFsX2Rp cnM9YWRkaXRpb25hbF9kaXJzKQogICAgICAgICBlbHNlOgotICAgICAgICAgICAgc2VydmVyID0g aHR0cF9zZXJ2ZXIuTGlnaHR0cGQoc2VsZiwgc2VsZi5yZXN1bHRzX2RpcmVjdG9yeSgpKQorICAg ICAgICAgICAgc2VydmVyID0gaHR0cF9zZXJ2ZXIuTGlnaHR0cGQoc2VsZiwgc2VsZi5yZXN1bHRz X2RpcmVjdG9yeSgpLCBhZGRpdGlvbmFsX2RpcnM9YWRkaXRpb25hbF9kaXJzKQogCiAgICAgICAg IHNlcnZlci5zdGFydCgpCiAgICAgICAgIHNlbGYuX2h0dHBfc2VydmVyID0gc2VydmVyCkluZGV4 OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9zZXJ2ZXJzL2FwYWNoZV9odHRw X3NlcnZlci5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9zZXJ2ZXJzL2FwYWNoZV9odHRwX3NlcnZlci5weQkocmV2aXNpb24gMTA3NTg4KQorKysg VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvc2VydmVycy9hcGFjaGVfaHR0cF9z ZXJ2ZXIucHkJKHdvcmtpbmcgY29weSkKQEAgLTQzLDcgKzQzLDcgQEAgX2xvZyA9IGxvZ2dpbmcu Z2V0TG9nZ2VyKF9fbmFtZV9fKQogCiBjbGFzcyBMYXlvdXRUZXN0QXBhY2hlSHR0cGQoaHR0cF9z ZXJ2ZXJfYmFzZS5IdHRwU2VydmVyQmFzZSk6CiAKLSAgICBkZWYgX19pbml0X18oc2VsZiwgcG9y dF9vYmosIG91dHB1dF9kaXIpOgorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwb3J0X29iaiwgb3V0 cHV0X2RpciwgYWRkaXRpb25hbF9kaXJzPU5vbmUpOgogICAgICAgICAiIiJBcmdzOgogICAgICAg ICAgIHBvcnRfb2JqOiBoYW5kbGUgdG8gdGhlIHBsYXRmb3JtLXNwZWNpZmljIHJvdXRpbmVzCiAg ICAgICAgICAgb3V0cHV0X2RpcjogdGhlIGFic29sdXRlIHBhdGggdG8gdGhlIGxheW91dCB0ZXN0 IHJlc3VsdCBkaXJlY3RvcnkKQEAgLTg3LDYgKzg3LDE0IEBAIGNsYXNzIExheW91dFRlc3RBcGFj aGVIdHRwZChodHRwX3NlcnZlcl8KICAgICAgICAgICAgICctYycsICJcJ1BpZEZpbGUgJXMnIiAl IHNlbGYuX3BpZF9maWxlLAogICAgICAgICAgICAgJy1rJywgInN0YXJ0Il0KIAorICAgICAgICBp ZiBhZGRpdGlvbmFsX2RpcnM6CisgICAgICAgICAgICBmb3IgYWxpYXMsIHBhdGggaW4gYWRkaXRp b25hbF9kaXJzLml0ZXJpdGVtcygpOgorICAgICAgICAgICAgICAgIHN0YXJ0X2NtZCArPSBbJy1j JywgIlwnQWxpYXMgJXMgXCIlc1wiXCciICUgKGFsaWFzLCBwYXRoKSwKKyAgICAgICAgICAgICAg ICAgICAgICAgICMgRGlzYWJsZSBDR0kgaGFuZGxlciBmb3IgYWRkaXRpb25hbCBkaXJzLgorICAg ICAgICAgICAgICAgICAgICAgICAgJy1jJywgIlwnPExvY2F0aW9uICVzPlwnIiAlIGFsaWFzLAor ICAgICAgICAgICAgICAgICAgICAgICAgJy1jJywgIlwnUmVtb3ZlSGFuZGxlciAuY2dpIC5wbFwn IiwKKyAgICAgICAgICAgICAgICAgICAgICAgICctYycsICJcJzwvTG9jYXRpb24+XCciXQorCiAg ICAgICAgIHN0b3BfY21kID0gW2V4ZWN1dGFibGUsCiAgICAgICAgICAgICAnLWYnLCAiXCIlc1wi IiAlIHNlbGYuX2dldF9hcGFjaGVfY29uZmlnX2ZpbGVfcGF0aCh0ZXN0X2Rpciwgb3V0cHV0X2Rp ciksCiAgICAgICAgICAgICAnLWMnLCAiXCdQaWRGaWxlICVzJyIgJSBzZWxmLl9waWRfZmlsZSwK SW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMvaHR0cF9z ZXJ2ZXIucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvc2VydmVycy9odHRwX3NlcnZlci5weQkocmV2aXNpb24gMTA3NTg4KQorKysgVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvc2VydmVycy9odHRwX3NlcnZlci5weQkod29ya2lu ZyBjb3B5KQpAQCAtNDMsNyArNDMsOCBAQCBfbG9nID0gbG9nZ2luZy5nZXRMb2dnZXIoX19uYW1l X18pCiBjbGFzcyBMaWdodHRwZChodHRwX3NlcnZlcl9iYXNlLkh0dHBTZXJ2ZXJCYXNlKToKIAog ICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwb3J0X29iaiwgb3V0cHV0X2RpciwgYmFja2dyb3VuZD1G YWxzZSwgcG9ydD1Ob25lLAotICAgICAgICAgICAgICAgICByb290PU5vbmUsIHJ1bl9iYWNrZ3Jv dW5kPU5vbmUsIGxheW91dF90ZXN0c19kaXI9Tm9uZSk6CisgICAgICAgICAgICAgICAgIHJvb3Q9 Tm9uZSwgcnVuX2JhY2tncm91bmQ9Tm9uZSwgYWRkaXRpb25hbF9kaXJzPU5vbmUsCisgICAgICAg ICAgICAgICAgIGxheW91dF90ZXN0c19kaXI9Tm9uZSk6CiAgICAgICAgICIiIkFyZ3M6CiAgICAg ICAgICAgb3V0cHV0X2RpcjogdGhlIGFic29sdXRlIHBhdGggdG8gdGhlIGxheW91dCB0ZXN0IHJl c3VsdCBkaXJlY3RvcnkKICAgICAgICAgIiIiCkBAIC01NCw2ICs1NSw3IEBAIGNsYXNzIExpZ2h0 dHBkKGh0dHBfc2VydmVyX2Jhc2UuSHR0cFNlcnYKICAgICAgICAgc2VsZi5fcG9ydCA9IHBvcnQK ICAgICAgICAgc2VsZi5fcm9vdCA9IHJvb3QKICAgICAgICAgc2VsZi5fcnVuX2JhY2tncm91bmQg PSBydW5fYmFja2dyb3VuZAorICAgICAgICBzZWxmLl9hZGRpdGlvbmFsX2RpcnMgPSBhZGRpdGlv bmFsX2RpcnMKICAgICAgICAgc2VsZi5fbGF5b3V0X3Rlc3RzX2RpciA9IGxheW91dF90ZXN0c19k aXIKIAogICAgICAgICBzZWxmLl9waWRfZmlsZSA9IHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihzZWxm Ll9ydW50aW1lX3BhdGgsICclcy5waWQnICUgc2VsZi5fbmFtZSkKQEAgLTEyNCw2ICsxMjYsMTAg QEAgY2xhc3MgTGlnaHR0cGQoaHR0cF9zZXJ2ZXJfYmFzZS5IdHRwU2VydgogICAgICAgICBmLndy aXRlKCgnYWxpYXMudXJsID0gKCAiL2pzLXRlc3QtcmVzb3VyY2VzIiA9PiAiJXMiIClcblxuJykg JQogICAgICAgICAgICAgICAgICAgICAoc2VsZi5fanNfdGVzdF9yZXNvdXJjZSkpCiAKKyAgICAg ICAgaWYgc2VsZi5fYWRkaXRpb25hbF9kaXJzOgorICAgICAgICAgICAgZm9yIGFsaWFzLCBwYXRo IGluIHNlbGYuX2FkZGl0aW9uYWxfZGlycy5pdGVyaXRlbXMoKToKKyAgICAgICAgICAgICAgICBm LndyaXRlKCgnYWxpYXMudXJsICs9ICggIiVzIiA9PiAiJXMiIClcblxuJykgJSAoYWxpYXMsIHBh dGgpKQorCiAgICAgICAgICMgU2V0dXAgYSBsaW5rIHRvIHdoZXJlIHRoZSBtZWRpYSByZXNvdXJj ZXMgYXJlIHN0b3JlZC4KICAgICAgICAgZi53cml0ZSgoJ2FsaWFzLnVybCArPSAoICIvbWVkaWEt cmVzb3VyY2VzIiA9PiAiJXMiIClcblxuJykgJQogICAgICAgICAgICAgICAgICAgICAoc2VsZi5f bWVkaWFfcmVzb3VyY2UpKQo= 126838 2012-02-13 14:35:33 -0800 2012-02-13 14:38:10 -0800 Patch bug-78528-20120213143539.patch text/plain 10797 abarth SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDEwNzYwMSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDEyLTAyLTEzICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisK KyAgICAgICAgTlJXVCdzIEhUVFAgc2VydmVycyBzaG91bGQgc3VwcG9ydCBhZGRpdGlvbmFsIGRp cmVjdG9yaWVzIGZvciByZXNvdXJjZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTc4NTI4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVGhpcyBmdW5jdGlvbmFsaXR5IHdpbGwgYmUgdXNlZCBieSB0aGUgQ2hy b21pdW0tQW5kcm9pZCBwb3J0LgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9iYXNlLnB5OgorICAgICAgICAoUG9ydC50by5zdGFydF9odHRwX3NlcnZlcik6 CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvc2VydmVycy9hcGFjaGVf aHR0cF9zZXJ2ZXIucHk6CisgICAgICAgIChMYXlvdXRUZXN0QXBhY2hlSHR0cGQuX19pbml0X18p OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMvaHR0cF9z ZXJ2ZXIucHk6CisgICAgICAgIChMaWdodHRwZC5fX2luaXRfXyk6CisgICAgICAgIChMaWdodHRw ZC5fcHJlcGFyZV9jb25maWcpOgorCiAyMDEyLTAyLTEzICBBbWkgRmlzY2htYW4gIDxmaXNjaG1h bkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQWRkIGZpc2NobWFuIGFzIGNvbW1pdHRlci4KSW5k ZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9leGVjdXRpdmVfbW9jay5w eQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZXhl Y3V0aXZlX21vY2sucHkJKHJldmlzaW9uIDEwNzU4OCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL3N5c3RlbS9leGVjdXRpdmVfbW9jay5weQkod29ya2luZyBjb3B5KQpAQCAtMzIs OCArMzIsMTYgQEAgZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmRlcHJlY2F0ZWRfbAogZnJv bSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmV4ZWN1dGl2ZSBpbXBvcnQgU2NyaXB0RXJyb3IKIAog CitjbGFzcyBNb2NrUHJvY2VzcyhvYmplY3QpOgorICAgIGRlZiBfX2luaXRfXyhzZWxmKToKKyAg ICAgICAgc2VsZi5waWQgPSA0MgorCisKICMgRklYTUU6IFRoaXMgc2hvdWxkIGJlIHVuaWZpZWQg d2l0aCBNb2NrRXhlY3V0aXZlMgogY2xhc3MgTW9ja0V4ZWN1dGl2ZShvYmplY3QpOgorICAgIFBJ UEUgPSAiTU9DSyBQSVBFIgorICAgIFNURE9VVCA9ICJNT0NLIFNURE9VVCIKKwogICAgIEBzdGF0 aWNtZXRob2QKICAgICBkZWYgaWdub3JlX2Vycm9yKGVycm9yKToKICAgICAgICAgcGFzcwpAQCAt ODEsNiArODksMTAgQEAgY2xhc3MgTW9ja0V4ZWN1dGl2ZShvYmplY3QpOgogICAgIGRlZiBjcHVf Y291bnQoc2VsZik6CiAgICAgICAgIHJldHVybiAyCiAKKyAgICBkZWYgcG9wZW4oc2VsZiwgKmFy Z3MsICoqa3dhcmdzKToKKyAgICAgICAgIyBGSVhNRTogSW1wbGVtZW50IGxvZ2dpbmcgd2hlbiBz ZWxmLl9zaG91bGRfbG9nIGlzIHNldC4KKyAgICAgICAgcmV0dXJuIE1vY2tQcm9jZXNzKCkKKwog CiBjbGFzcyBNb2NrRXhlY3V0aXZlMihvYmplY3QpOgogICAgIEBzdGF0aWNtZXRob2QKSW5kZXg6 IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkJ KHJldmlzaW9uIDEwNzU4OCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvYmFzZS5weQkod29ya2luZyBjb3B5KQpAQCAtNzUwLDE2ICs3NTAsMTYgQEAgY2xhc3Mg UG9ydChvYmplY3QpOgogICAgICAgICBtZXRob2QuIiIiCiAgICAgICAgIHBhc3MKIAotICAgIGRl ZiBzdGFydF9odHRwX3NlcnZlcihzZWxmKToKKyAgICBkZWYgc3RhcnRfaHR0cF9zZXJ2ZXIoc2Vs ZiwgYWRkaXRpb25hbF9kaXJzPU5vbmUpOgogICAgICAgICAiIiJTdGFydCBhIHdlYiBzZXJ2ZXIu IFJhaXNlIGFuIGVycm9yIGlmIGl0IGNhbid0IHN0YXJ0IG9yIGlzIGFscmVhZHkgcnVubmluZy4K IAogICAgICAgICBQb3J0cyBjYW4gc3R1YiB0aGlzIG91dCBpZiB0aGV5IGRvbid0IG5lZWQgYSB3 ZWIgc2VydmVyIHRvIGJlIHJ1bm5pbmcuIiIiCiAgICAgICAgIGFzc2VydCBub3Qgc2VsZi5faHR0 cF9zZXJ2ZXIsICdBbHJlYWR5IHJ1bm5pbmcgYW4gaHR0cCBzZXJ2ZXIuJwogCiAgICAgICAgIGlm IHNlbGYuX3VzZXNfYXBhY2hlKCk6Ci0gICAgICAgICAgICBzZXJ2ZXIgPSBhcGFjaGVfaHR0cF9z ZXJ2ZXIuTGF5b3V0VGVzdEFwYWNoZUh0dHBkKHNlbGYsIHNlbGYucmVzdWx0c19kaXJlY3Rvcnko KSkKKyAgICAgICAgICAgIHNlcnZlciA9IGFwYWNoZV9odHRwX3NlcnZlci5MYXlvdXRUZXN0QXBh Y2hlSHR0cGQoc2VsZiwgc2VsZi5yZXN1bHRzX2RpcmVjdG9yeSgpLCBhZGRpdGlvbmFsX2RpcnM9 YWRkaXRpb25hbF9kaXJzKQogICAgICAgICBlbHNlOgotICAgICAgICAgICAgc2VydmVyID0gaHR0 cF9zZXJ2ZXIuTGlnaHR0cGQoc2VsZiwgc2VsZi5yZXN1bHRzX2RpcmVjdG9yeSgpKQorICAgICAg ICAgICAgc2VydmVyID0gaHR0cF9zZXJ2ZXIuTGlnaHR0cGQoc2VsZiwgc2VsZi5yZXN1bHRzX2Rp cmVjdG9yeSgpLCBhZGRpdGlvbmFsX2RpcnM9YWRkaXRpb25hbF9kaXJzKQogCiAgICAgICAgIHNl cnZlci5zdGFydCgpCiAgICAgICAgIHNlbGYuX2h0dHBfc2VydmVyID0gc2VydmVyCkluZGV4OiBU b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3Rlc3QucHkKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC90ZXN0LnB5CShy ZXZpc2lvbiAxMDc1ODgpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L3Rlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTQyOCw2ICs0MjgsMTUgQEAgY2xhc3MgVGVz dFBvcnQoUG9ydCk6CiAgICAgZGVmIHJlbGVhc2VfaHR0cF9sb2NrKHNlbGYpOgogICAgICAgICBw YXNzCiAKKyAgICBkZWYgX3BhdGhfdG9fbGlnaHR0cGQoc2VsZik6CisgICAgICAgIHJldHVybiAi L3Vzci9zYmluL2xpZ2h0dHBkIgorCisgICAgZGVmIF9wYXRoX3RvX2xpZ2h0dHBkX21vZHVsZXMo c2VsZik6CisgICAgICAgIHJldHVybiAiL3Vzci9saWIvbGlnaHR0cGQiCisKKyAgICBkZWYgX3Bh dGhfdG9fbGlnaHR0cGRfcGhwKHNlbGYpOgorICAgICAgICByZXR1cm4gIi91c3IvYmluL3BocC1j Z2kiCisKICAgICBkZWYgcGF0aF90b190ZXN0X2V4cGVjdGF0aW9uc19maWxlKHNlbGYpOgogICAg ICAgICByZXR1cm4gc2VsZi5fZXhwZWN0YXRpb25zX3BhdGgKIApJbmRleDogVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvc2VydmVycy9hcGFjaGVfaHR0cF9zZXJ2ZXIucHkKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvc2VydmVycy9h cGFjaGVfaHR0cF9zZXJ2ZXIucHkJKHJldmlzaW9uIDEwNzU4OCkKKysrIFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMvYXBhY2hlX2h0dHBfc2VydmVyLnB5CSh3b3Jr aW5nIGNvcHkpCkBAIC00Myw3ICs0Myw3IEBAIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25h bWVfXykKIAogY2xhc3MgTGF5b3V0VGVzdEFwYWNoZUh0dHBkKGh0dHBfc2VydmVyX2Jhc2UuSHR0 cFNlcnZlckJhc2UpOgogCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHBvcnRfb2JqLCBvdXRwdXRf ZGlyKToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgcG9ydF9vYmosIG91dHB1dF9kaXIsIGFkZGl0 aW9uYWxfZGlycz1Ob25lKToKICAgICAgICAgIiIiQXJnczoKICAgICAgICAgICBwb3J0X29iajog aGFuZGxlIHRvIHRoZSBwbGF0Zm9ybS1zcGVjaWZpYyByb3V0aW5lcwogICAgICAgICAgIG91dHB1 dF9kaXI6IHRoZSBhYnNvbHV0ZSBwYXRoIHRvIHRoZSBsYXlvdXQgdGVzdCByZXN1bHQgZGlyZWN0 b3J5CkBAIC04Nyw2ICs4NywxNCBAQCBjbGFzcyBMYXlvdXRUZXN0QXBhY2hlSHR0cGQoaHR0cF9z ZXJ2ZXJfCiAgICAgICAgICAgICAnLWMnLCAiXCdQaWRGaWxlICVzJyIgJSBzZWxmLl9waWRfZmls ZSwKICAgICAgICAgICAgICctaycsICJzdGFydCJdCiAKKyAgICAgICAgaWYgYWRkaXRpb25hbF9k aXJzOgorICAgICAgICAgICAgZm9yIGFsaWFzLCBwYXRoIGluIGFkZGl0aW9uYWxfZGlycy5pdGVy aXRlbXMoKToKKyAgICAgICAgICAgICAgICBzdGFydF9jbWQgKz0gWyctYycsICJcJ0FsaWFzICVz IFwiJXNcIlwnIiAlIChhbGlhcywgcGF0aCksCisgICAgICAgICAgICAgICAgICAgICAgICAjIERp c2FibGUgQ0dJIGhhbmRsZXIgZm9yIGFkZGl0aW9uYWwgZGlycy4KKyAgICAgICAgICAgICAgICAg ICAgICAgICctYycsICJcJzxMb2NhdGlvbiAlcz5cJyIgJSBhbGlhcywKKyAgICAgICAgICAgICAg ICAgICAgICAgICctYycsICJcJ1JlbW92ZUhhbmRsZXIgLmNnaSAucGxcJyIsCisgICAgICAgICAg ICAgICAgICAgICAgICAnLWMnLCAiXCc8L0xvY2F0aW9uPlwnIl0KKwogICAgICAgICBzdG9wX2Nt ZCA9IFtleGVjdXRhYmxlLAogICAgICAgICAgICAgJy1mJywgIlwiJXNcIiIgJSBzZWxmLl9nZXRf YXBhY2hlX2NvbmZpZ19maWxlX3BhdGgodGVzdF9kaXIsIG91dHB1dF9kaXIpLAogICAgICAgICAg ICAgJy1jJywgIlwnUGlkRmlsZSAlcyciICUgc2VsZi5fcGlkX2ZpbGUsCkluZGV4OiBUb29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9zZXJ2ZXJzL2h0dHBfc2VydmVyLnB5Cj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMvaHR0 cF9zZXJ2ZXIucHkJKHJldmlzaW9uIDEwNzU4OCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3NlcnZlcnMvaHR0cF9zZXJ2ZXIucHkJKHdvcmtpbmcgY29weSkKQEAgLTQz LDcgKzQzLDggQEAgX2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9fbmFtZV9fKQogY2xhc3MgTGln aHR0cGQoaHR0cF9zZXJ2ZXJfYmFzZS5IdHRwU2VydmVyQmFzZSk6CiAKICAgICBkZWYgX19pbml0 X18oc2VsZiwgcG9ydF9vYmosIG91dHB1dF9kaXIsIGJhY2tncm91bmQ9RmFsc2UsIHBvcnQ9Tm9u ZSwKLSAgICAgICAgICAgICAgICAgcm9vdD1Ob25lLCBydW5fYmFja2dyb3VuZD1Ob25lLCBsYXlv dXRfdGVzdHNfZGlyPU5vbmUpOgorICAgICAgICAgICAgICAgICByb290PU5vbmUsIHJ1bl9iYWNr Z3JvdW5kPU5vbmUsIGFkZGl0aW9uYWxfZGlycz1Ob25lLAorICAgICAgICAgICAgICAgICBsYXlv dXRfdGVzdHNfZGlyPU5vbmUpOgogICAgICAgICAiIiJBcmdzOgogICAgICAgICAgIG91dHB1dF9k aXI6IHRoZSBhYnNvbHV0ZSBwYXRoIHRvIHRoZSBsYXlvdXQgdGVzdCByZXN1bHQgZGlyZWN0b3J5 CiAgICAgICAgICIiIgpAQCAtNTQsNiArNTUsNyBAQCBjbGFzcyBMaWdodHRwZChodHRwX3NlcnZl cl9iYXNlLkh0dHBTZXJ2CiAgICAgICAgIHNlbGYuX3BvcnQgPSBwb3J0CiAgICAgICAgIHNlbGYu X3Jvb3QgPSByb290CiAgICAgICAgIHNlbGYuX3J1bl9iYWNrZ3JvdW5kID0gcnVuX2JhY2tncm91 bmQKKyAgICAgICAgc2VsZi5fYWRkaXRpb25hbF9kaXJzID0gYWRkaXRpb25hbF9kaXJzCiAgICAg ICAgIHNlbGYuX2xheW91dF90ZXN0c19kaXIgPSBsYXlvdXRfdGVzdHNfZGlyCiAKICAgICAgICAg c2VsZi5fcGlkX2ZpbGUgPSBzZWxmLl9maWxlc3lzdGVtLmpvaW4oc2VsZi5fcnVudGltZV9wYXRo LCAnJXMucGlkJyAlIHNlbGYuX25hbWUpCkBAIC0xMjQsNiArMTI2LDEwIEBAIGNsYXNzIExpZ2h0 dHBkKGh0dHBfc2VydmVyX2Jhc2UuSHR0cFNlcnYKICAgICAgICAgZi53cml0ZSgoJ2FsaWFzLnVy bCA9ICggIi9qcy10ZXN0LXJlc291cmNlcyIgPT4gIiVzIiApXG5cbicpICUKICAgICAgICAgICAg ICAgICAgICAgKHNlbGYuX2pzX3Rlc3RfcmVzb3VyY2UpKQogCisgICAgICAgIGlmIHNlbGYuX2Fk ZGl0aW9uYWxfZGlyczoKKyAgICAgICAgICAgIGZvciBhbGlhcywgcGF0aCBpbiBzZWxmLl9hZGRp dGlvbmFsX2RpcnMuaXRlcml0ZW1zKCk6CisgICAgICAgICAgICAgICAgZi53cml0ZSgoJ2FsaWFz LnVybCArPSAoICIlcyIgPT4gIiVzIiApXG5cbicpICUgKGFsaWFzLCBwYXRoKSkKKwogICAgICAg ICAjIFNldHVwIGEgbGluayB0byB3aGVyZSB0aGUgbWVkaWEgcmVzb3VyY2VzIGFyZSBzdG9yZWQu CiAgICAgICAgIGYud3JpdGUoKCdhbGlhcy51cmwgKz0gKCAiL21lZGlhLXJlc291cmNlcyIgPT4g IiVzIiApXG5cbicpICUKICAgICAgICAgICAgICAgICAgICAgKHNlbGYuX21lZGlhX3Jlc291cmNl KSkKQEAgLTE4OSw3ICsxOTUsNyBAQCBjbGFzcyBMaWdodHRwZChodHRwX3NlcnZlcl9iYXNlLkh0 dHBTZXJ2CiAgICAgICAgICAgICB0cnk6CiAgICAgICAgICAgICAgICAgc2VsZi5fcmVtb3ZlX2xv Z19maWxlcyhzZWxmLl9vdXRwdXRfZGlyLCBsb2dfcHJlZml4KQogICAgICAgICAgICAgZXhjZXB0 IE9TRXJyb3IsIGU6Ci0gICAgICAgICAgICAgICAgX2xvZy53YXJuaW5nKCdGYWlsZWQgdG8gcmVt b3ZlIG9sZCAlcyAlcyBmaWxlcycgJSBzZWxmLl9uYW1lLCBsb2dfcHJlZml4KQorICAgICAgICAg ICAgICAgIF9sb2cud2FybmluZygnRmFpbGVkIHRvIHJlbW92ZSBvbGQgJXMgJXMgZmlsZXMnICUg KHNlbGYuX25hbWUsIGxvZ19wcmVmaXgpKQogCiAgICAgZGVmIF9zcGF3bl9wcm9jZXNzKHNlbGYp OgogICAgICAgICBfbG9nLmRlYnVnKCdTdGFydGluZyAlcyBzZXJ2ZXIsIGNtZD0iJXMiJyAlIChz ZWxmLl9uYW1lLCBzZWxmLl9zdGFydF9jbWQpKQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvc2VydmVycy9odHRwX3NlcnZlcl91bml0dGVzdC5weQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9zZXJ2ZXJzL2h0dHBfc2Vy dmVyX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAwKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvc2VydmVycy9odHRwX3NlcnZlcl91bml0dGVzdC5weQkocmV2aXNpb24gMCkK QEAgLTAsMCArMSw1OSBAQAorIyBDb3B5cmlnaHQgKEMpIDIwMTIgR29vZ2xlIEluYy4gQWxsIHJp Z2h0cyByZXNlcnZlZC4KKyMKKyMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5k IGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1p dHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKKyMgbWV0Ogor IworIyAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhl IGFib3ZlIGNvcHlyaWdodAorIyBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0 aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisjICAgICAqIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5h cnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUKKyMgY29weXJpZ2h0IG5vdGljZSwgdGhp cyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lcgorIyBpbiB0 aGUgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhl CisjIGRpc3RyaWJ1dGlvbi4KKyMgICAgICogTmVpdGhlciB0aGUgbmFtZSBvZiBHb29nbGUgSW5j LiBub3IgdGhlIG5hbWVzIG9mIGl0cworIyBjb250cmlidXRvcnMgbWF5IGJlIHVzZWQgdG8gZW5k b3JzZSBvciBwcm9tb3RlIHByb2R1Y3RzIGRlcml2ZWQgZnJvbQorIyB0aGlzIHNvZnR3YXJlIHdp dGhvdXQgc3BlY2lmaWMgcHJpb3Igd3JpdHRlbiBwZXJtaXNzaW9uLgorIworIyBUSElTIFNPRlRX QVJFIElTIFBST1ZJREVEIEJZIFRIRSBDT1BZUklHSFQgSE9MREVSUyBBTkQgQ09OVFJJQlVUT1JT CisjICJBUyBJUyIgQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVE SU5HLCBCVVQgTk9UCisjIExJTUlURUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVS Q0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUgorIyBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUg RElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgVEhFIENPUFlSSUdIVAorIyBPV05FUiBPUiBD T05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRB TCwKKyMgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xV RElORywgQlVUIE5PVAorIyBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdP T0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwKKyMgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVT SU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZCisjIFRIRU9SWSBP RiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRP UlQKKyMgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkg V0FZIE9VVCBPRiBUSEUgVVNFCisjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBP RiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisKK2ltcG9ydCB1bml0dGVzdAoraW1w b3J0IHJlCisKK2Zyb20gd2Via2l0cHkuY29tbW9uLmhvc3RfbW9jayBpbXBvcnQgTW9ja0hvc3QK K2Zyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLnBvcnQgaW1wb3J0IHRlc3QKK2Zyb20gd2Via2l0 cHkubGF5b3V0X3Rlc3RzLnNlcnZlcnMuaHR0cF9zZXJ2ZXIgaW1wb3J0IExpZ2h0dHBkCitmcm9t IHdlYmtpdHB5LmxheW91dF90ZXN0cy5zZXJ2ZXJzLmh0dHBfc2VydmVyX2Jhc2UgaW1wb3J0IFNl cnZlckVycm9yCisKKworY2xhc3MgVGVzdEh0dHBTZXJ2ZXIodW5pdHRlc3QuVGVzdENhc2UpOgor ICAgIGRlZiB0ZXN0X3N0YXJ0X2NtZChzZWxmKToKKyAgICAgICAgaG9zdCA9IE1vY2tIb3N0KCkK KyAgICAgICAgdGVzdF9wb3J0ID0gdGVzdC5UZXN0UG9ydChob3N0KQorICAgICAgICBob3N0LmZp bGVzeXN0ZW0ud3JpdGVfdGV4dF9maWxlKAorICAgICAgICAgICAgIi9tb2NrLWNoZWNrb3V0L1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMvbGlnaHR0cGQuY29uZiIs ICJNb2NrIENvbmZpZ1xuIikKKyAgICAgICAgaG9zdC5maWxlc3lzdGVtLndyaXRlX3RleHRfZmls ZSgKKyAgICAgICAgICAgICIvdXNyL2xpYi9saWdodHRwZC9saWJsaWdodGNvbXAuZHlsaWIiLCAi TW9jayBkeWxpYiIpCisKKyAgICAgICAgc2VydmVyID0gTGlnaHR0cGQodGVzdF9wb3J0LCAiL21v Y2svb3V0cHV0X2RpciIsCisgICAgICAgICAgICAgICAgICAgICAgICAgIGFkZGl0aW9uYWxfZGly cz17CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiL21vY2svb25lLWFkZGl0aW9uYWwt ZGlyIjogIi9tb2NrLWNoZWNrb3V0L29uZS1hZGRpdGlvbmFsLWRpciIsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAiL21vY2svYW5vdGhlci1hZGRpdGlvbmFsLWRpciI6ICIvbW9jay1j aGVja291dC9vbmUtYWRkaXRpb25hbC1kaXIifSkKKyAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMo U2VydmVyRXJyb3IsIHNlcnZlci5zdGFydCkKKworICAgICAgICBjb25maWdfZmlsZSA9IGhvc3Qu ZmlsZXN5c3RlbS5yZWFkX3RleHRfZmlsZSgiL21vY2svb3V0cHV0X2Rpci9saWdodHRwZC5jb25m IikKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocmUuZmluZGFsbChyImFsaWFzLnVybC4rIiwg Y29uZmlnX2ZpbGUpLCBbCisgICAgICAgICAgICAnYWxpYXMudXJsID0gKCAiL2pzLXRlc3QtcmVz b3VyY2VzIiA9PiAiL3Rlc3QuY2hlY2tvdXQvTGF5b3V0VGVzdHMvZmFzdC9qcy9yZXNvdXJjZXMi ICknLAorICAgICAgICAgICAgJ2FsaWFzLnVybCArPSAoICIvbW9jay9vbmUtYWRkaXRpb25hbC1k aXIiID0+ICIvbW9jay1jaGVja291dC9vbmUtYWRkaXRpb25hbC1kaXIiICknLAorICAgICAgICAg ICAgJ2FsaWFzLnVybCArPSAoICIvbW9jay9hbm90aGVyLWFkZGl0aW9uYWwtZGlyIiA9PiAiL21v Y2stY2hlY2tvdXQvb25lLWFkZGl0aW9uYWwtZGlyIiApJywKKyAgICAgICAgICAgICdhbGlhcy51 cmwgKz0gKCAiL21lZGlhLXJlc291cmNlcyIgPT4gIi90ZXN0LmNoZWNrb3V0L0xheW91dFRlc3Rz L21lZGlhIiApJywKKyAgICAgICAgXSkK