189679 2018-09-17 14:21:26 -0700 [Win] TestRunner::queueLoad() fails to generate correct url for some urls. 2018-09-20 14:38:39 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 basuke basuke achristensen basuke bfulgham commit-queue fujii lforschler pvollan webkit-bug-importer oldest_to_newest 1460324 0 basuke 2018-09-17 14:21:26 -0700 In win/TestRunnerWin.cpp:327, it just generates a new url assuming passed url is relative url. 1461056 1 350136 basuke 2018-09-19 11:35:41 -0700 Created attachment 350136 PATCH Use UrlCombineW Win32 API to generate correct URL for relative URLs. 1461095 2 350144 basuke 2018-09-19 13:10:56 -0700 Created attachment 350144 PATCH 1461255 3 350144 fujii 2018-09-19 23:55:35 -0700 Comment on attachment 350144 PATCH View in context: https://bugs.webkit.org/attachment.cgi?id=350144&action=review > Tools/DumpRenderTree/win/TestRunnerWin.cpp:346 > + while (true) { You can use UrlCombine instead of UrlCombineA. You don't need this `while` loop because you can get minimum length of result. DWORD bufferSize = 0; auto result = UrlCombine(responseURL.data(), wURL.data(), nullptr, &bufferSize, 0); if (result == E_POINTER) { buffer.resize(bufferSize); auto result = UrlCombine(responseURL.data(), wURL.data(), buffer.data(), &bufferSize, 0); } 1461427 4 basuke 2018-09-20 10:47:35 -0700 Oh, that's nice. Thanks. 1461428 5 350232 basuke 2018-09-20 10:47:57 -0700 Created attachment 350232 PATCH 1461547 6 350232 commit-queue 2018-09-20 14:37:07 -0700 Comment on attachment 350232 PATCH Clearing flags on attachment: 350232 Committed r236285: <https://trac.webkit.org/changeset/236285> 1461548 7 commit-queue 2018-09-20 14:37:09 -0700 All reviewed patches have been landed. Closing bug. 1461549 8 webkit-bug-importer 2018-09-20 14:38:39 -0700 <rdar://problem/44656380> 350136 2018-09-19 11:35:41 -0700 2018-09-19 13:10:56 -0700 PATCH 189679.diff text/plain 1959 basuke ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBkNDI0 ZjZlNmM1MS4uMGYzZGQ2MzFmYjcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxOC0wOS0xOSAgQmFzdWtlIFN1enVr aSAgPEJhc3VrZS5TdXp1a2lAc29ueS5jb20+CisKKyAgICAgICAgW1dpbl0gVGVzdFJ1bm5lcjo6 cXVldWVMb2FkKCkgZmFpbHMgdG8gZ2VuZXJhdGUgY29ycmVjdCB1cmwgZm9yIHNvbWUgdXJscy4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4OTY3OQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlcGxhY2Ug dGhlIGltcGxlbWVudGF0aW9uIHdpdGggY29ycmVjdCBBUEkgY2FsbC4KKworICAgICAgICAqIER1 bXBSZW5kZXJUcmVlL3dpbi9UZXN0UnVubmVyV2luLmNwcDoKKyAgICAgICAgKFRlc3RSdW5uZXI6 OnF1ZXVlTG9hZCk6IENhbGwgVXJsQ29tYmluZVcuCisKIDIwMTgtMDktMTkgIE1pY2hhZWwgQ2F0 YW56YXJvICA8bWNhdGFuemFyb0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtXUEVdW0dUS10gVW5y ZXZpZXdlZCwgZml4IHRoYXQgdHlwbyBpbiBtb3JlIHBsYWNlcwpkaWZmIC0tZ2l0IGEvVG9vbHMv RHVtcFJlbmRlclRyZWUvd2luL1Rlc3RSdW5uZXJXaW4uY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRy ZWUvd2luL1Rlc3RSdW5uZXJXaW4uY3BwCmluZGV4IGIwZmJlM2NmMzhlLi5jOTllZjdiY2M3YSAx MDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL1Rlc3RSdW5uZXJXaW4uY3BwCisr KyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9UZXN0UnVubmVyV2luLmNwcApAQCAtMzM5LDE1 ICszMzksMTggQEAgdm9pZCBUZXN0UnVubmVyOjpxdWV1ZUxvYWQoSlNTdHJpbmdSZWYgdXJsLCBK U1N0cmluZ1JlZiB0YXJnZXQpCiAgICAgICAgIHJldHVybjsKICAgICB3c3RyaW5nIHJlc3BvbnNl VVJMKHJlc3BvbnNlVVJMQlNUUiwgcmVzcG9uc2VVUkxCU1RSLmxlbmd0aCgpKTsKIAotICAgIC8v IEZJWE1FOiBXZSBzaG91bGQgZG8gcmVhbCByZWxhdGl2ZSBVUkwgcmVzb2x1dGlvbiBoZXJlLgot ICAgIGludCBsYXN0U2xhc2ggPSByZXNwb25zZVVSTC5yZmluZCgnLycpOwotICAgIGlmIChsYXN0 U2xhc2ggIT0gLTEpCi0gICAgICAgIHJlc3BvbnNlVVJMID0gcmVzcG9uc2VVUkwuc3Vic3RyKDAs IGxhc3RTbGFzaCk7Ci0KICAgICB3c3RyaW5nIHdVUkwgPSBqc1N0cmluZ1JlZlRvV1N0cmluZyh1 cmwpOwotICAgIHdzdHJpbmcgd0Fic29sdXRlVVJMID0gcmVzcG9uc2VVUkwgKyBURVhUKCIvIikg KyB3VVJMOwotICAgIGF1dG8ganNBYnNvbHV0ZVVSTCA9IGFkb3B0KEpTU3RyaW5nQ3JlYXRlV2l0 aENoYXJhY3RlcnMod0Fic29sdXRlVVJMLmRhdGEoKSwgd0Fic29sdXRlVVJMLmxlbmd0aCgpKSk7 CiAKKyAgICBzdGQ6OnZlY3Rvcjx3Y2hhcl90PiBidWZmZXI7CisgICAgRFdPUkQgYnVmZmVyU2l6 ZSA9IDEyODsKKyAgICB3aGlsZSAodHJ1ZSkgeworICAgICAgICBidWZmZXIucmVzaXplKGJ1ZmZl clNpemUpOworICAgICAgICBhdXRvIHJlc3VsdCA9IFVybENvbWJpbmVXKHJlc3BvbnNlVVJMLmRh dGEoKSwgd1VSTC5kYXRhKCksIGJ1ZmZlci5kYXRhKCksICZidWZmZXJTaXplLCAwKTsKKyAgICAg ICAgaWYgKHJlc3VsdCA9PSBTX09LKQorICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGJ1ZmZl clNpemUgKj0gMjsKKyAgICB9CisgICAgYXV0byBqc0Fic29sdXRlVVJMID0gYWRvcHQoSlNTdHJp bmdDcmVhdGVXaXRoQ2hhcmFjdGVycyhidWZmZXIuZGF0YSgpLCBidWZmZXJTaXplKSk7CiAgICAg V29ya1F1ZXVlOjpzaW5nbGV0b24oKS5xdWV1ZShuZXcgTG9hZEl0ZW0oanNBYnNvbHV0ZVVSTC5n ZXQoKSwgdGFyZ2V0KSk7CiB9CiAK 350144 2018-09-19 13:10:56 -0700 2018-09-20 10:47:57 -0700 PATCH 189679.diff text/plain 3799 basuke ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA1ZjQ0OGMwYjcwNS4uYjQ0M2VlNzg3NTkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAor MjAxOC0wOS0xOSAgQmFzdWtlIFN1enVraSAgPEJhc3VrZS5TdXp1a2lAc29ueS5jb20+CisKKyAg ICAgICAgW1dpbl0gVGVzdFJ1bm5lcjo6cXVldWVMb2FkKCkgZmFpbHMgdG8gZ2VuZXJhdGUgY29y cmVjdCB1cmwgZm9yIHNvbWUgdXJscy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE4OTY3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogcGxhdGZvcm0vd2luY2Fpcm8vVGVzdEV4cGVjdGF0aW9uczoKKwog MjAxOC0wOS0xOSAgTXMyZ2VyICA8TXMyZ2VyQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10g VW5yZXZpZXdlZCB0ZXN0IGdhcmRlbmluZwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZv cm0vd2luY2Fpcm8vVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbmNh aXJvL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggNjhmNjI0MDgyZTEuLjEwZTg2MzQ4NDhkIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW5jYWlyby9UZXN0RXhwZWN0YXRpb25zCisr KyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbmNhaXJvL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTk0 NCw3ICs5NDQsNiBAQCBodHRwL3Rlc3RzL3htbGh0dHByZXF1ZXN0L2FjY2Vzcy1jb250cm9sLXBy ZWZsaWdodC1jcmVkZW50aWFsLXN5bmMuaHRtbCBbIFBhc3MgRgogaHR0cC90ZXN0cy94bWxodHRw cmVxdWVzdC9hY2Nlc3MtY29udHJvbC1wcmVmbGlnaHQtbm90LXN1Y2Nlc3NmdWwuaHRtbCBbIEZh aWx1cmUgXQogaHR0cC90ZXN0cy94bWxodHRwcmVxdWVzdC9hdXRoLXJlamVjdC1wcm90ZWN0aW9u LXNwYWNlLmh0bWwgWyBGYWlsdXJlIF0KIGh0dHAvdGVzdHMveG1saHR0cHJlcXVlc3QvYmFzaWMt YXV0aC1ub3Bhc3N3b3JkLmh0bWwgWyBGYWlsdXJlIF0KLWh0dHAvdGVzdHMveG1saHR0cHJlcXVl c3QvYmFzaWMtYXV0aC1ub3VzZXIuaHRtbCBbIEZhaWx1cmUgXQogaHR0cC90ZXN0cy94bWxodHRw cmVxdWVzdC9jYWNoZS1vdmVycmlkZS5odG1sIFsgUGFzcyBGYWlsdXJlIF0KIGh0dHAvdGVzdHMv eG1saHR0cHJlcXVlc3QvY29va2llcy5odG1sIFsgUGFzcyBGYWlsdXJlIF0KIGh0dHAvdGVzdHMv eG1saHR0cHJlcXVlc3QvY3Jvc3Mtb3JpZ2luLWF1dGhvcml6YXRpb24td2l0aC1lbWJlZGRlci5o dG1sIFsgRmFpbHVyZSBdCkBAIC0xNDg5LDggKzE0ODgsNiBAQCB3ZWJraXQub3JnL2IvMTgyMTI4 IGZhc3QvZG9tL25hdmlnYXRvci1kZXRhY2hlZC1uby1jcmFzaC5odG1sIFsgUGFzcyBGYWlsdXJl IF0KIGZhc3QvZG9tL1dpbmRvdy9zbG93LXVubG9hZC1oYW5kbGVyLmh0bWwgWyBTa2lwIF0KIGZh c3QvZG9tL1dpbmRvdy9zbG93LXVubG9hZC1oYW5kbGVyLW9ubHktZnJhbWUtaXMtc3RvcHBlZC5o dG1sIFsgRmFpbHVyZSBdCiAKLXdlYmtpdC5vcmcvYi80MjQzNSBmYXN0L2RvbS9uYXZpZ2F0aW9u LXR5cGUtYmFjay1mb3J3YXJkLmh0bWwgWyBGYWlsdXJlIF0KLQogZmFzdC9kb20vSFRNTEFuY2hv ckVsZW1lbnQvYW5jaG9yLWZpbGUtYmxvYi1jb252ZXJ0LXRvLWRvd25sb2FkLWFzeW5jLWRlbGVn YXRlLmh0bWwgWyBTa2lwIF0KIAogIyBUT0RPIEhJRERFTl9QQUdFX0RPTV9USU1FUl9USFJPVFRM SU5HIGlzIGRpc2FibGVkCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFu Z2VMb2cKaW5kZXggZDQyNGY2ZTZjNTEuLjBmM2RkNjMxZmI3IDEwMDY0NAotLS0gYS9Ub29scy9D aGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTgtMDkt MTkgIEJhc3VrZSBTdXp1a2kgIDxCYXN1a2UuU3V6dWtpQHNvbnkuY29tPgorCisgICAgICAgIFtX aW5dIFRlc3RSdW5uZXI6OnF1ZXVlTG9hZCgpIGZhaWxzIHRvIGdlbmVyYXRlIGNvcnJlY3QgdXJs IGZvciBzb21lIHVybHMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xODk2NzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBSZXBsYWNlIHRoZSBpbXBsZW1lbnRhdGlvbiB3aXRoIGNvcnJlY3QgQVBJIGNhbGwu CisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS93aW4vVGVzdFJ1bm5lcldpbi5jcHA6CisgICAg ICAgIChUZXN0UnVubmVyOjpxdWV1ZUxvYWQpOiBDYWxsIFVybENvbWJpbmVXLgorCiAyMDE4LTA5 LTE5ICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KIAogICAgICAg ICBbV1BFXVtHVEtdIFVucmV2aWV3ZWQsIGZpeCB0aGF0IHR5cG8gaW4gbW9yZSBwbGFjZXMKZGlm ZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9UZXN0UnVubmVyV2luLmNwcCBiL1Rv b2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9UZXN0UnVubmVyV2luLmNwcAppbmRleCBiMGZiZTNjZjM4 ZS4uYzk5ZWY3YmNjN2EgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9UZXN0 UnVubmVyV2luLmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS93aW4vVGVzdFJ1bm5lcldp bi5jcHAKQEAgLTMzOSwxNSArMzM5LDE4IEBAIHZvaWQgVGVzdFJ1bm5lcjo6cXVldWVMb2FkKEpT U3RyaW5nUmVmIHVybCwgSlNTdHJpbmdSZWYgdGFyZ2V0KQogICAgICAgICByZXR1cm47CiAgICAg d3N0cmluZyByZXNwb25zZVVSTChyZXNwb25zZVVSTEJTVFIsIHJlc3BvbnNlVVJMQlNUUi5sZW5n dGgoKSk7CiAKLSAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIGRvIHJlYWwgcmVsYXRpdmUgVVJMIHJl c29sdXRpb24gaGVyZS4KLSAgICBpbnQgbGFzdFNsYXNoID0gcmVzcG9uc2VVUkwucmZpbmQoJy8n KTsKLSAgICBpZiAobGFzdFNsYXNoICE9IC0xKQotICAgICAgICByZXNwb25zZVVSTCA9IHJlc3Bv bnNlVVJMLnN1YnN0cigwLCBsYXN0U2xhc2gpOwotCiAgICAgd3N0cmluZyB3VVJMID0ganNTdHJp bmdSZWZUb1dTdHJpbmcodXJsKTsKLSAgICB3c3RyaW5nIHdBYnNvbHV0ZVVSTCA9IHJlc3BvbnNl VVJMICsgVEVYVCgiLyIpICsgd1VSTDsKLSAgICBhdXRvIGpzQWJzb2x1dGVVUkwgPSBhZG9wdChK U1N0cmluZ0NyZWF0ZVdpdGhDaGFyYWN0ZXJzKHdBYnNvbHV0ZVVSTC5kYXRhKCksIHdBYnNvbHV0 ZVVSTC5sZW5ndGgoKSkpOwogCisgICAgc3RkOjp2ZWN0b3I8d2NoYXJfdD4gYnVmZmVyOworICAg IERXT1JEIGJ1ZmZlclNpemUgPSAxMjg7CisgICAgd2hpbGUgKHRydWUpIHsKKyAgICAgICAgYnVm ZmVyLnJlc2l6ZShidWZmZXJTaXplKTsKKyAgICAgICAgYXV0byByZXN1bHQgPSBVcmxDb21iaW5l VyhyZXNwb25zZVVSTC5kYXRhKCksIHdVUkwuZGF0YSgpLCBidWZmZXIuZGF0YSgpLCAmYnVmZmVy U2l6ZSwgMCk7CisgICAgICAgIGlmIChyZXN1bHQgPT0gU19PSykKKyAgICAgICAgICAgIGJyZWFr OworICAgICAgICBidWZmZXJTaXplICo9IDI7CisgICAgfQorICAgIGF1dG8ganNBYnNvbHV0ZVVS TCA9IGFkb3B0KEpTU3RyaW5nQ3JlYXRlV2l0aENoYXJhY3RlcnMoYnVmZmVyLmRhdGEoKSwgYnVm ZmVyU2l6ZSkpOwogICAgIFdvcmtRdWV1ZTo6c2luZ2xldG9uKCkucXVldWUobmV3IExvYWRJdGVt KGpzQWJzb2x1dGVVUkwuZ2V0KCksIHRhcmdldCkpOwogfQogCg== 350232 2018-09-20 10:47:57 -0700 2018-09-20 14:37:07 -0700 PATCH 189679.diff text/plain 3966 basuke ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA1ZjQ0OGMwYjcwNS4uYjQ0M2VlNzg3NTkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAor MjAxOC0wOS0xOSAgQmFzdWtlIFN1enVraSAgPEJhc3VrZS5TdXp1a2lAc29ueS5jb20+CisKKyAg ICAgICAgW1dpbl0gVGVzdFJ1bm5lcjo6cXVldWVMb2FkKCkgZmFpbHMgdG8gZ2VuZXJhdGUgY29y cmVjdCB1cmwgZm9yIHNvbWUgdXJscy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE4OTY3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogcGxhdGZvcm0vd2luY2Fpcm8vVGVzdEV4cGVjdGF0aW9uczoKKwog MjAxOC0wOS0xOSAgTXMyZ2VyICA8TXMyZ2VyQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10g VW5yZXZpZXdlZCB0ZXN0IGdhcmRlbmluZwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZv cm0vd2luY2Fpcm8vVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbmNh aXJvL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggNjhmNjI0MDgyZTEuLjEwZTg2MzQ4NDhkIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW5jYWlyby9UZXN0RXhwZWN0YXRpb25zCisr KyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbmNhaXJvL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTk0 NCw3ICs5NDQsNiBAQCBodHRwL3Rlc3RzL3htbGh0dHByZXF1ZXN0L2FjY2Vzcy1jb250cm9sLXBy ZWZsaWdodC1jcmVkZW50aWFsLXN5bmMuaHRtbCBbIFBhc3MgRgogaHR0cC90ZXN0cy94bWxodHRw cmVxdWVzdC9hY2Nlc3MtY29udHJvbC1wcmVmbGlnaHQtbm90LXN1Y2Nlc3NmdWwuaHRtbCBbIEZh aWx1cmUgXQogaHR0cC90ZXN0cy94bWxodHRwcmVxdWVzdC9hdXRoLXJlamVjdC1wcm90ZWN0aW9u LXNwYWNlLmh0bWwgWyBGYWlsdXJlIF0KIGh0dHAvdGVzdHMveG1saHR0cHJlcXVlc3QvYmFzaWMt YXV0aC1ub3Bhc3N3b3JkLmh0bWwgWyBGYWlsdXJlIF0KLWh0dHAvdGVzdHMveG1saHR0cHJlcXVl c3QvYmFzaWMtYXV0aC1ub3VzZXIuaHRtbCBbIEZhaWx1cmUgXQogaHR0cC90ZXN0cy94bWxodHRw cmVxdWVzdC9jYWNoZS1vdmVycmlkZS5odG1sIFsgUGFzcyBGYWlsdXJlIF0KIGh0dHAvdGVzdHMv eG1saHR0cHJlcXVlc3QvY29va2llcy5odG1sIFsgUGFzcyBGYWlsdXJlIF0KIGh0dHAvdGVzdHMv eG1saHR0cHJlcXVlc3QvY3Jvc3Mtb3JpZ2luLWF1dGhvcml6YXRpb24td2l0aC1lbWJlZGRlci5o dG1sIFsgRmFpbHVyZSBdCkBAIC0xNDg5LDggKzE0ODgsNiBAQCB3ZWJraXQub3JnL2IvMTgyMTI4 IGZhc3QvZG9tL25hdmlnYXRvci1kZXRhY2hlZC1uby1jcmFzaC5odG1sIFsgUGFzcyBGYWlsdXJl IF0KIGZhc3QvZG9tL1dpbmRvdy9zbG93LXVubG9hZC1oYW5kbGVyLmh0bWwgWyBTa2lwIF0KIGZh c3QvZG9tL1dpbmRvdy9zbG93LXVubG9hZC1oYW5kbGVyLW9ubHktZnJhbWUtaXMtc3RvcHBlZC5o dG1sIFsgRmFpbHVyZSBdCiAKLXdlYmtpdC5vcmcvYi80MjQzNSBmYXN0L2RvbS9uYXZpZ2F0aW9u LXR5cGUtYmFjay1mb3J3YXJkLmh0bWwgWyBGYWlsdXJlIF0KLQogZmFzdC9kb20vSFRNTEFuY2hv ckVsZW1lbnQvYW5jaG9yLWZpbGUtYmxvYi1jb252ZXJ0LXRvLWRvd25sb2FkLWFzeW5jLWRlbGVn YXRlLmh0bWwgWyBTa2lwIF0KIAogIyBUT0RPIEhJRERFTl9QQUdFX0RPTV9USU1FUl9USFJPVFRM SU5HIGlzIGRpc2FibGVkCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFu Z2VMb2cKaW5kZXggZDQyNGY2ZTZjNTEuLjBmM2RkNjMxZmI3IDEwMDY0NAotLS0gYS9Ub29scy9D aGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTgtMDkt MTkgIEJhc3VrZSBTdXp1a2kgIDxCYXN1a2UuU3V6dWtpQHNvbnkuY29tPgorCisgICAgICAgIFtX aW5dIFRlc3RSdW5uZXI6OnF1ZXVlTG9hZCgpIGZhaWxzIHRvIGdlbmVyYXRlIGNvcnJlY3QgdXJs IGZvciBzb21lIHVybHMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xODk2NzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBSZXBsYWNlIHRoZSBpbXBsZW1lbnRhdGlvbiB3aXRoIGNvcnJlY3QgQVBJIGNhbGwu CisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS93aW4vVGVzdFJ1bm5lcldpbi5jcHA6CisgICAg ICAgIChUZXN0UnVubmVyOjpxdWV1ZUxvYWQpOiBDYWxsIFVybENvbWJpbmVXLgorCiAyMDE4LTA5 LTE5ICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KIAogICAgICAg ICBbV1BFXVtHVEtdIFVucmV2aWV3ZWQsIGZpeCB0aGF0IHR5cG8gaW4gbW9yZSBwbGFjZXMKZGlm ZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9UZXN0UnVubmVyV2luLmNwcCBiL1Rv b2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9UZXN0UnVubmVyV2luLmNwcAppbmRleCBiMGZiZTNjZjM4 ZS4uNDdiMzMzYjc1NTEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9UZXN0 UnVubmVyV2luLmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS93aW4vVGVzdFJ1bm5lcldp bi5jcHAKQEAgLTMzOCwxNiArMzM4LDE4IEBAIHZvaWQgVGVzdFJ1bm5lcjo6cXVldWVMb2FkKEpT U3RyaW5nUmVmIHVybCwgSlNTdHJpbmdSZWYgdGFyZ2V0KQogICAgIGlmIChGQUlMRUQocmVzcG9u c2UtPlVSTCgmcmVzcG9uc2VVUkxCU1RSLkdldEJTVFIoKSkpKQogICAgICAgICByZXR1cm47CiAg ICAgd3N0cmluZyByZXNwb25zZVVSTChyZXNwb25zZVVSTEJTVFIsIHJlc3BvbnNlVVJMQlNUUi5s ZW5ndGgoKSk7Ci0KLSAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIGRvIHJlYWwgcmVsYXRpdmUgVVJM IHJlc29sdXRpb24gaGVyZS4KLSAgICBpbnQgbGFzdFNsYXNoID0gcmVzcG9uc2VVUkwucmZpbmQo Jy8nKTsKLSAgICBpZiAobGFzdFNsYXNoICE9IC0xKQotICAgICAgICByZXNwb25zZVVSTCA9IHJl c3BvbnNlVVJMLnN1YnN0cigwLCBsYXN0U2xhc2gpOwotCiAgICAgd3N0cmluZyB3VVJMID0ganNT dHJpbmdSZWZUb1dTdHJpbmcodXJsKTsKLSAgICB3c3RyaW5nIHdBYnNvbHV0ZVVSTCA9IHJlc3Bv bnNlVVJMICsgVEVYVCgiLyIpICsgd1VSTDsKLSAgICBhdXRvIGpzQWJzb2x1dGVVUkwgPSBhZG9w dChKU1N0cmluZ0NyZWF0ZVdpdGhDaGFyYWN0ZXJzKHdBYnNvbHV0ZVVSTC5kYXRhKCksIHdBYnNv bHV0ZVVSTC5sZW5ndGgoKSkpOwogCisgICAgRFdPUkQgYnVmZmVyU2l6ZSA9IHJlc3BvbnNlVVJM LnNpemUoKSArIHdVUkwuc2l6ZSgpICsgMTsKKyAgICBzdGQ6OnZlY3Rvcjx3Y2hhcl90PiBidWZm ZXIoYnVmZmVyU2l6ZSk7CisgICAgYXV0byByZXN1bHQgPSBVcmxDb21iaW5lKHJlc3BvbnNlVVJM LmRhdGEoKSwgd1VSTC5kYXRhKCksIGJ1ZmZlci5kYXRhKCksICZidWZmZXJTaXplLCAwKTsKKyAg ICBpZiAocmVzdWx0ID09IEVfUE9JTlRFUikgeworICAgICAgICBidWZmZXIucmVzaXplKGJ1ZmZl clNpemUpOworICAgICAgICByZXN1bHQgPSBVcmxDb21iaW5lKHJlc3BvbnNlVVJMLmRhdGEoKSwg d1VSTC5kYXRhKCksIGJ1ZmZlci5kYXRhKCksICZidWZmZXJTaXplLCAwKTsKKyAgICAgICAgQVNT RVJUKHJlc3VsdCAgPT0gU19PSyk7CisgICAgfQorCisgICAgYXV0byBqc0Fic29sdXRlVVJMID0g YWRvcHQoSlNTdHJpbmdDcmVhdGVXaXRoQ2hhcmFjdGVycyhidWZmZXIuZGF0YSgpLCBidWZmZXJT aXplKSk7CiAgICAgV29ya1F1ZXVlOjpzaW5nbGV0b24oKS5xdWV1ZShuZXcgTG9hZEl0ZW0oanNB YnNvbHV0ZVVSTC5nZXQoKSwgdGFyZ2V0KSk7CiB9CiAK