161731 2016-09-07 20:36:26 -0700 URLParser should parse ports after IPv4 and IPv6 hosts 2016-09-08 15:35:46 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 achristensen achristensen oldest_to_newest 1227502 0 achristensen 2016-09-07 20:36:26 -0700 URLParser should parse ports after IPv4 and IPv6 hosts 1227503 1 288234 achristensen 2016-09-07 20:37:12 -0700 Created attachment 288234 Patch 1227630 2 288276 achristensen 2016-09-08 10:33:18 -0700 Created attachment 288276 Patch 1227659 3 288289 achristensen 2016-09-08 11:27:43 -0700 Created attachment 288289 Patch 1227875 4 achristensen 2016-09-08 15:31:08 -0700 http://trac.webkit.org/changeset/205669 1227880 5 achristensen 2016-09-08 15:35:46 -0700 Followup in r205671 288234 2016-09-07 20:37:12 -0700 2016-09-08 10:33:16 -0700 Patch bug-161731-20160907203447.patch text/plain 7922 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwNTU4MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDE2LTA5LTA3ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgVVJMUGFyc2Vy IHNob3VsZCBwYXJzZSBwb3J0cyBhZnRlciBJUHY0IGFuZCBJUHY2IGhvc3RzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjE3MzEKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb3ZlcmVkIGJ5IG5ldyBBUEkg dGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9VUkxQYXJzZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6VVJMUGFyc2VyOjpwYXJzZVBvcnQpOgorICAgICAgICAoV2ViQ29yZTo6VVJMUGFyc2Vy OjpwYXJzZUhvc3QpOgorCiAyMDE2LTA5LTA3ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVu c2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0IHIyMDU1MzMuCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9VUkxQYXJzZXIuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1VSTFBhcnNlci5jcHAJKHJldmlzaW9uIDIwNTU4MCkK KysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1VSTFBhcnNlci5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTEzMzMsNyArMTMzMywxMSBAQCBzdGF0aWMgYm9vbCBoYXNJbnZhbGlkRG9tYWluQ2hhcmFj dGVyKGNvCiBib29sIFVSTFBhcnNlcjo6cGFyc2VQb3J0KFN0cmluZ1ZpZXc6OkNvZGVQb2ludHM6 Okl0ZXJhdG9yJiBpdGVyYXRvciwgY29uc3QgU3RyaW5nVmlldzo6Q29kZVBvaW50czo6SXRlcmF0 b3ImIGVuZCkKIHsKICAgICB1aW50MzJfdCBwb3J0ID0gMDsKLSAgICBBU1NFUlQoaXRlcmF0b3Ig IT0gZW5kKTsKKyAgICBpZiAoaXRlcmF0b3IgPT0gZW5kKSB7CisgICAgICAgIG1fdXJsLm1fcG9y dEVuZCA9IG1fYnVmZmVyLmxlbmd0aCgpOworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9Cisg ICAgbV9idWZmZXIuYXBwZW5kKCc6Jyk7CiAgICAgZm9yICg7IGl0ZXJhdG9yICE9IGVuZDsgKytp dGVyYXRvcikgewogICAgICAgICBpZiAoaXNUYWJPck5ld2xpbmUoKml0ZXJhdG9yKSkKICAgICAg ICAgICAgIGNvbnRpbnVlOwpAQCAtMTM1Myw2ICsxMzU3LDcgQEAgYm9vbCBVUkxQYXJzZXI6OnBh cnNlUG9ydChTdHJpbmdWaWV3OjpDbwogICAgIH0gZWxzZQogICAgICAgICBtX2J1ZmZlci5hcHBl bmROdW1iZXIocG9ydCk7CiAKKyAgICBtX3VybC5tX3BvcnRFbmQgPSBtX2J1ZmZlci5sZW5ndGgo KTsKICAgICByZXR1cm4gdHJ1ZTsKIH0KIApAQCAtMTM2OCw4ICsxMzczLDE1IEBAIGJvb2wgVVJM UGFyc2VyOjpwYXJzZUhvc3QoU3RyaW5nVmlldzo6Q28KICAgICAgICAgaWYgKGF1dG8gYWRkcmVz cyA9IHBhcnNlSVB2Nkhvc3QoaXRlcmF0b3IsIGlwdjZFbmQpKSB7CiAgICAgICAgICAgICBzZXJp YWxpemVJUHY2KGFkZHJlc3MudmFsdWUoKSwgbV9idWZmZXIpOwogICAgICAgICAgICAgbV91cmwu bV9ob3N0RW5kID0gbV9idWZmZXIubGVuZ3RoKCk7Ci0gICAgICAgICAgICAvLyBGSVhNRTogSGFu ZGxlIHRoZSBwb3J0IGNvcnJlY3RseS4KLSAgICAgICAgICAgIG1fdXJsLm1fcG9ydEVuZCA9IG1f YnVmZmVyLmxlbmd0aCgpOyAgICAgICAgICAgIAorICAgICAgICAgICAgaWYgKGlwdjZFbmQgIT0g ZW5kKSB7CisgICAgICAgICAgICAgICAgKytpcHY2RW5kOworICAgICAgICAgICAgICAgIGlmIChp cHY2RW5kICE9IGVuZCAmJiAqaXB2NkVuZCA9PSAnOicpIHsKKyAgICAgICAgICAgICAgICAgICAg KytpcHY2RW5kOworICAgICAgICAgICAgICAgICAgICByZXR1cm4gcGFyc2VQb3J0KGlwdjZFbmQs IGVuZCk7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIG1fdXJsLm1fcG9ydEVu ZCA9IG1fYnVmZmVyLmxlbmd0aCgpOworICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOworICAg ICAgICAgICAgfQogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH0KICAgICB9CkBA IC0xMzk5LDkgKzE0MTEsMTIgQEAgYm9vbCBVUkxQYXJzZXI6OnBhcnNlSG9zdChTdHJpbmdWaWV3 OjpDbwogICAgIGlmIChhdXRvIGFkZHJlc3MgPSBwYXJzZUlQdjRIb3N0KGFzY2lpRG9tYWluQ29k ZVBvaW50cy5iZWdpbigpLCBhc2NpaURvbWFpbkNvZGVQb2ludHMuZW5kKCkpKSB7CiAgICAgICAg IHNlcmlhbGl6ZUlQdjQoYWRkcmVzcy52YWx1ZSgpLCBtX2J1ZmZlcik7CiAgICAgICAgIG1fdXJs Lm1faG9zdEVuZCA9IG1fYnVmZmVyLmxlbmd0aCgpOwotICAgICAgICAvLyBGSVhNRTogSGFuZGxl IHRoZSBwb3J0IGNvcnJlY3RseS4KLSAgICAgICAgbV91cmwubV9wb3J0RW5kID0gbV9idWZmZXIu bGVuZ3RoKCk7Ci0gICAgICAgIHJldHVybiB0cnVlOworICAgICAgICBpZiAoaXRlcmF0b3IgPT0g ZW5kKSB7CisgICAgICAgICAgICBtX3VybC5tX3BvcnRFbmQgPSBtX2J1ZmZlci5sZW5ndGgoKTsK KyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICB9CisgICAgICAgICsraXRlcmF0b3I7 CisgICAgICAgIHJldHVybiBwYXJzZVBvcnQoaXRlcmF0b3IsIGVuZCk7CiAgICAgfQogICAgIAog ICAgIG1fYnVmZmVyLmFwcGVuZChhc2NpaURvbWFpbi52YWx1ZSgpKTsKQEAgLTE0MTEsMTEgKzE0 MjYsOCBAQCBib29sIFVSTFBhcnNlcjo6cGFyc2VIb3N0KFN0cmluZ1ZpZXc6OkNvCiAgICAgICAg ICsraXRlcmF0b3I7CiAgICAgICAgIHdoaWxlIChpdGVyYXRvciAhPSBlbmQgJiYgaXNUYWJPck5l d2xpbmUoKml0ZXJhdG9yKSkKICAgICAgICAgICAgICsraXRlcmF0b3I7Ci0gICAgICAgIGlmIChp dGVyYXRvciAhPSBlbmQpIHsKLSAgICAgICAgICAgIG1fYnVmZmVyLmFwcGVuZCgnOicpOwotICAg ICAgICAgICAgaWYgKCFwYXJzZVBvcnQoaXRlcmF0b3IsIGVuZCkpCi0gICAgICAgICAgICAgICAg cmV0dXJuIGZhbHNlOwotICAgICAgICB9CisgICAgICAgIGlmIChpdGVyYXRvciAhPSBlbmQpCisg ICAgICAgICAgICByZXR1cm4gcGFyc2VQb3J0KGl0ZXJhdG9yLCBlbmQpOwogICAgIH0KICAgICBt X3VybC5tX3BvcnRFbmQgPSBtX2J1ZmZlci5sZW5ndGgoKTsKICAgICByZXR1cm4gdHJ1ZTsKSW5k ZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJldmlz aW9uIDIwNTU4MSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDEzIEBACisyMDE2LTA5LTA3ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtp dC5vcmc+CisKKyAgICAgICAgVVJMUGFyc2VyIHNob3VsZCBwYXJzZSBwb3J0cyBhZnRlciBJUHY0 IGFuZCBJUHY2IGhvc3RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNjE3MzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9VUkxQYXJzZXIuY3BwOgorICAg ICAgICAoVGVzdFdlYktpdEFQSTo6VEVTVF9GKToKKwogMjAxNi0wOS0wNyAgQWxleCBDaHJpc3Rl bnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJl dmVydCByMjA1NTMzLgpJbmRleDogVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJDb3JlL1VS TFBhcnNlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJD b3JlL1VSTFBhcnNlci5jcHAJKHJldmlzaW9uIDIwNTU4MCkKKysrIFRvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViQ29yZS9VUkxQYXJzZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Myw3ICs0 Myw3IEBAIHN0cnVjdCBFeHBlY3RlZFBhcnRzIHsKICAgICBTdHJpbmcgdXNlcjsKICAgICBTdHJp bmcgcGFzc3dvcmQ7CiAgICAgU3RyaW5nIGhvc3Q7Ci0gICAgdW5zaWduZWQgc2hvcnQgcG9ydDsK KyAgICB1bnNpZ25lZCBzaG9ydCBwb3J0IHsgMCB9OwogICAgIFN0cmluZyBwYXRoOwogICAgIFN0 cmluZyBxdWVyeTsKICAgICBTdHJpbmcgZnJhZ21lbnQ7CkBAIC0xNzgsNiArMTc4LDE5IEBAIFRF U1RfRihVUkxQYXJzZXJUZXN0LCBCYXNpYykKICAgICBjaGVja1VSTCgiaHR0cDovL2hvc3QvQSBi IiwgeyJodHRwIiwgIiIsICIiLCAiaG9zdCIsIDAsICIvQSUyMGIiLCAiIiwgIiIsICJodHRwOi8v aG9zdC9BJTIwYiJ9KTsKICAgICBjaGVja1VSTCgiaHR0cDovL2hvc3QvYSUyMEIiLCB7Imh0dHAi LCAiIiwgIiIsICJob3N0IiwgMCwgIi9hJTIwQiIsICIiLCAiIiwgImh0dHA6Ly9ob3N0L2ElMjBC In0pOwogICAgIGNoZWNrVVJMKCJodHRwOi8vaG9zdD9xPUAgPD4hI2ZyYWdtZW50IiwgeyJodHRw IiwgIiIsICIiLCAiaG9zdCIsIDAsICIvIiwgInE9QCUyMCUzQyUzRSEiLCAiZnJhZ21lbnQiLCAi aHR0cDovL2hvc3QvP3E9QCUyMCUzQyUzRSEjZnJhZ21lbnQifSk7CisgICAgY2hlY2tVUkwoImh0 dHA6Ly8xMjcuMC4wLjE6MTAxMDAvcGF0aCIsIHsiaHR0cCIsICIiLCAiIiwgIjEyNy4wLjAuMSIs IDEwMTAwLCAiL3BhdGgiLCAiIiwgIiIsICJodHRwOi8vMTI3LjAuMC4xOjEwMTAwL3BhdGgifSk7 CisgICAgY2hlY2tVUkwoImh0dHA6Ly8xMjcuMC4wLjE6L3BhdGgiLCB7Imh0dHAiLCAiIiwgIiIs ICIxMjcuMC4wLjEiLCAwLCAiL3BhdGgiLCAiIiwgIiIsICJodHRwOi8vMTI3LjAuMC4xL3BhdGgi fSk7CisgICAgY2hlY2tVUkwoImh0dHA6Ly8xMjcuMC4wLjE6MTIzIiwgeyJodHRwIiwgIiIsICIi LCAiMTI3LjAuMC4xIiwgMTIzLCAiLyIsICIiLCAiIiwgImh0dHA6Ly8xMjcuMC4wLjE6MTIzLyJ9 KTsKKyAgICBjaGVja1VSTCgiaHR0cDovLzEyNy4wLjAuMToiLCB7Imh0dHAiLCAiIiwgIiIsICIx MjcuMC4wLjEiLCAwLCAiLyIsICIiLCAiIiwgImh0dHA6Ly8xMjcuMC4wLjEvIn0pOworICAgIGNo ZWNrVVJMKCJodHRwOi8vWzA6Zjo6ZjpmOjA6MF06MTIzL3BhdGgiLCB7Imh0dHAiLCAiIiwgIiIs ICJbMDpmOjpmOmY6MDowXSIsIDEyMywgIi9wYXRoIiwgIiIsICIiLCAiaHR0cDovL1swOmY6OmY6 ZjowOjBdOjEyMy9wYXRoIn0pOworICAgIGNoZWNrVVJMKCJodHRwOi8vWzA6Zjo6ZjpmOjA6MF06 MTIzIiwgeyJodHRwIiwgIiIsICIiLCAiWzA6Zjo6ZjpmOjA6MF0iLCAxMjMsICIvIiwgIiIsICIi LCAiaHR0cDovL1swOmY6OmY6ZjowOjBdOjEyMy8ifSk7CisgICAgY2hlY2tVUkwoImh0dHA6Ly9b MDpmOjpmOmY6MDowXTovcGF0aCIsIHsiaHR0cCIsICIiLCAiIiwgIlswOmY6OmY6ZjowOjBdIiwg MCwgIi9wYXRoIiwgIiIsICIiLCAiaHR0cDovL1swOmY6OmY6ZjowOjBdL3BhdGgifSk7CisgICAg Y2hlY2tVUkwoImh0dHA6Ly9bMDpmOjpmOmY6MDowXToiLCB7Imh0dHAiLCAiIiwgIiIsICJbMDpm OjpmOmY6MDowXSIsIDAsICIvIiwgIiIsICIiLCAiaHR0cDovL1swOmY6OmY6ZjowOjBdLyJ9KTsK KyAgICBjaGVja1VSTCgiaHR0cDovL2hvc3Q6MTAxMDAvcGF0aCIsIHsiaHR0cCIsICIiLCAiIiwg Imhvc3QiLCAxMDEwMCwgIi9wYXRoIiwgIiIsICIiLCAiaHR0cDovL2hvc3Q6MTAxMDAvcGF0aCJ9 KTsKKyAgICBjaGVja1VSTCgiaHR0cDovL2hvc3Q6L3BhdGgiLCB7Imh0dHAiLCAiIiwgIiIsICJo b3N0IiwgMCwgIi9wYXRoIiwgIiIsICIiLCAiaHR0cDovL2hvc3QvcGF0aCJ9KTsKKyAgICBjaGVj a1VSTCgiaHR0cDovL2hvc3Q6MTIzIiwgeyJodHRwIiwgIiIsICIiLCAiaG9zdCIsIDEyMywgIi8i LCAiIiwgIiIsICJodHRwOi8vaG9zdDoxMjMvIn0pOworICAgIGNoZWNrVVJMKCJodHRwOi8vaG9z dDoiLCB7Imh0dHAiLCAiIiwgIiIsICJob3N0IiwgMCwgIi8iLCAiIiwgIiIsICJodHRwOi8vaG9z dC8ifSk7CisgICAgY2hlY2tVUkwoImh0dHA6Ly9ob3NcdHRcbjpcdDFcbjJcdDNcdC9cbnBhdGgi LCB7Imh0dHAiLCAiIiwgIiIsICJob3N0IiwgMTIzLCAiL3BhdGgiLCAiIiwgIiIsICJodHRwOi8v aG9zdDoxMjMvcGF0aCJ9KTsKIH0KIAogc3RhdGljIHZvaWQgY2hlY2tSZWxhdGl2ZVVSTChjb25z dCBTdHJpbmcmIHVybFN0cmluZywgY29uc3QgU3RyaW5nJiBiYXNlVVJMU3RyaW5nLCBjb25zdCBF eHBlY3RlZFBhcnRzJiBwYXJ0cykKQEAgLTM1NCw2ICszNjcsMTMgQEAgVEVTVF9GKFVSTFBhcnNl clRlc3QsIFBhcnNlckRpZmZlcmVuY2VzKQogICAgIGNoZWNrUmVsYXRpdmVVUkxEaWZmZXJlbmNl cyh3aWRlU3RyaW5nKEwiI86yIiksICJodHRwOi8vZXhhbXBsZS5vcmcvZm9vL2JhciIsCiAgICAg ICAgIHsiaHR0cCIsICIiLCAiIiwgImV4YW1wbGUub3JnIiwgMCwgIi9mb28vYmFyIiwgIiIsIHdp ZGVTdHJpbmcoTCLOsiIpLCB3aWRlU3RyaW5nKEwiaHR0cDovL2V4YW1wbGUub3JnL2Zvby9iYXIj zrIiKX0sCiAgICAgICAgIHsiaHR0cCIsICIiLCAiIiwgImV4YW1wbGUub3JnIiwgMCwgIi9mb28v YmFyIiwgIiIsICIlQ0UlQjIiLCAiaHR0cDovL2V4YW1wbGUub3JnL2Zvby9iYXIjJUNFJUIyIn0p OworICAgIGNoZWNrVVJMRGlmZmVyZW5jZXMoImh0dHA6Ly8xMjcuMC4wLjE6NjU1MzYvcGF0aCIs IHsgfSwgeyJodHRwIiwgIiIsICIiLCAiMTI3LjAuMC4xIiwgNjU1MzUsICIvcGF0aCIsICIiLCAi IiwgImh0dHA6Ly8xMjcuMC4wLjE6NjU1MzYvcGF0aCJ9KTsKKyAgICBjaGVja1VSTERpZmZlcmVu Y2VzKCJodHRwOi8vaG9zdDphYmMiLCB7IH0sIHsiIiwgIiIsICIiLCAiIiwgMCwgIiIsICIiLCAi IiwgImh0dHA6Ly9ob3N0OmFiYyJ9KTsKKyAgICBjaGVja1VSTERpZmZlcmVuY2VzKCJodHRwOi8v aG9zdDo2NTUzNiIsIHsgfSwgeyJodHRwIiwgIiIsICIiLCAiaG9zdCIsIDY1NTM1LCAiLyIsICIi LCAiIiwgImh0dHA6Ly9ob3N0OjY1NTM2LyJ9KTsKKyAgICBjaGVja1VSTERpZmZlcmVuY2VzKCJo dHRwOi8vMTI3LjAuMC4xOmFiYyIsIHsgfSwgeyIiLCAiIiwgIiIsICIiLCAwLCAiIiwgIiIsICIi LCAiaHR0cDovLzEyNy4wLjAuMTphYmMifSk7CisgICAgY2hlY2tVUkxEaWZmZXJlbmNlcygiaHR0 cDovLzEyNy4wLjAuMTo2NTUzNiIsIHsgfSwgeyJodHRwIiwgIiIsICIiLCAiMTI3LjAuMC4xIiwg NjU1MzUsICIvIiwgIiIsICIiLCAiaHR0cDovLzEyNy4wLjAuMTo2NTUzNi8ifSk7CisgICAgY2hl Y2tVUkxEaWZmZXJlbmNlcygiaHR0cDovL1swOmY6OmY6ZjowOjBdOmFiYyIsIHsgfSwgeyIiLCAi IiwgIiIsICIiLCAwLCAiIiwgIiIsICIiLCAiaHR0cDovL1swOmY6OmY6ZjowOjBdOmFiYyJ9KTsK KyAgICBjaGVja1VSTERpZmZlcmVuY2VzKCJodHRwOi8vWzA6Zjo6ZjpmOjA6MF06NjU1MzYiLCB7 IH0sIHsiaHR0cCIsICIiLCAiIiwgIlswOmY6OmY6ZjowOjBdIiwgNjU1MzUsICIvIiwgIiIsICIi LCAiaHR0cDovL1swOmY6OmY6ZjowOjBdOjY1NTM2LyJ9KTsKIAogICAgIC8vIEZJWE1FOiBUaGlz IGJlaGF2aW9yIG91Z2h0IHRvIGJlIHNwZWNpZmllZCBpbiB0aGUgc3RhbmRhcmQuCiAgICAgLy8g V2l0aCB0aGUgZXhpc3RpbmcgVVJMOjpwYXJzZSwgV2ViS2l0IHJldHVybnMgImh0dHBzOi8iLCBG aXJlZm94IHJldHVybnMgImh0dHBzOi8vLyIsIGFuZCBDaHJvbWUgdGhyb3dzIGFuIGVycm9yLgo= 288276 2016-09-08 10:33:18 -0700 2016-09-08 11:27:39 -0700 Patch bug-161731-20160908103052.patch text/plain 7974 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwNTY1MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDE2LTA5LTA4ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgVVJMUGFyc2Vy IHNob3VsZCBwYXJzZSBwb3J0cyBhZnRlciBJUHY0IGFuZCBJUHY2IGhvc3RzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjE3MzEKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb3ZlcmVkIGJ5IG5ldyBBUEkg dGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9VUkxQYXJzZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6VVJMUGFyc2VyOjpwYXJzZVBvcnQpOgorICAgICAgICAoV2ViQ29yZTo6VVJMUGFyc2Vy OjpwYXJzZUhvc3QpOgorCiAyMDE2LTA5LTA4ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVu c2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmUtbGFuZCByMjA1NTgwIGFmdGVyIHIyMDU2NDkg Zml4ZWQgdGhlIHRlc3QgZmFpbHVyZXMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1VS TFBhcnNlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVVJMUGFy c2VyLmNwcAkocmV2aXNpb24gMjA1NjUwKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVVJM UGFyc2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTMzMyw3ICsxMzMzLDExIEBAIHN0YXRpYyBi b29sIGhhc0ludmFsaWREb21haW5DaGFyYWN0ZXIoY28KIGJvb2wgVVJMUGFyc2VyOjpwYXJzZVBv cnQoU3RyaW5nVmlldzo6Q29kZVBvaW50czo6SXRlcmF0b3ImIGl0ZXJhdG9yLCBjb25zdCBTdHJp bmdWaWV3OjpDb2RlUG9pbnRzOjpJdGVyYXRvciYgZW5kKQogewogICAgIHVpbnQzMl90IHBvcnQg PSAwOwotICAgIEFTU0VSVChpdGVyYXRvciAhPSBlbmQpOworICAgIGlmIChpdGVyYXRvciA9PSBl bmQpIHsKKyAgICAgICAgbV91cmwubV9wb3J0RW5kID0gbV9idWZmZXIubGVuZ3RoKCk7CisgICAg ICAgIHJldHVybiB0cnVlOworICAgIH0KKyAgICBtX2J1ZmZlci5hcHBlbmQoJzonKTsKICAgICBm b3IgKDsgaXRlcmF0b3IgIT0gZW5kOyArK2l0ZXJhdG9yKSB7CiAgICAgICAgIGlmIChpc1RhYk9y TmV3bGluZSgqaXRlcmF0b3IpKQogICAgICAgICAgICAgY29udGludWU7CkBAIC0xMzUzLDYgKzEz NTcsNyBAQCBib29sIFVSTFBhcnNlcjo6cGFyc2VQb3J0KFN0cmluZ1ZpZXc6OkNvCiAgICAgfSBl bHNlCiAgICAgICAgIG1fYnVmZmVyLmFwcGVuZE51bWJlcihwb3J0KTsKIAorICAgIG1fdXJsLm1f cG9ydEVuZCA9IG1fYnVmZmVyLmxlbmd0aCgpOwogICAgIHJldHVybiB0cnVlOwogfQogCkBAIC0x MzY4LDggKzEzNzMsMTUgQEAgYm9vbCBVUkxQYXJzZXI6OnBhcnNlSG9zdChTdHJpbmdWaWV3OjpD bwogICAgICAgICBpZiAoYXV0byBhZGRyZXNzID0gcGFyc2VJUHY2SG9zdChpdGVyYXRvciwgaXB2 NkVuZCkpIHsKICAgICAgICAgICAgIHNlcmlhbGl6ZUlQdjYoYWRkcmVzcy52YWx1ZSgpLCBtX2J1 ZmZlcik7CiAgICAgICAgICAgICBtX3VybC5tX2hvc3RFbmQgPSBtX2J1ZmZlci5sZW5ndGgoKTsK LSAgICAgICAgICAgIC8vIEZJWE1FOiBIYW5kbGUgdGhlIHBvcnQgY29ycmVjdGx5LgotICAgICAg ICAgICAgbV91cmwubV9wb3J0RW5kID0gbV9idWZmZXIubGVuZ3RoKCk7ICAgICAgICAgICAgCisg ICAgICAgICAgICBpZiAoaXB2NkVuZCAhPSBlbmQpIHsKKyAgICAgICAgICAgICAgICArK2lwdjZF bmQ7CisgICAgICAgICAgICAgICAgaWYgKGlwdjZFbmQgIT0gZW5kICYmICppcHY2RW5kID09ICc6 JykgeworICAgICAgICAgICAgICAgICAgICArK2lwdjZFbmQ7CisgICAgICAgICAgICAgICAgICAg IHJldHVybiBwYXJzZVBvcnQoaXB2NkVuZCwgZW5kKTsKKyAgICAgICAgICAgICAgICB9CisgICAg ICAgICAgICAgICAgbV91cmwubV9wb3J0RW5kID0gbV9idWZmZXIubGVuZ3RoKCk7CisgICAgICAg ICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgICAgICB9CiAgICAgICAgICAgICByZXR1cm4g dHJ1ZTsKICAgICAgICAgfQogICAgIH0KQEAgLTEzOTksOSArMTQxMSwxMiBAQCBib29sIFVSTFBh cnNlcjo6cGFyc2VIb3N0KFN0cmluZ1ZpZXc6OkNvCiAgICAgaWYgKGF1dG8gYWRkcmVzcyA9IHBh cnNlSVB2NEhvc3QoYXNjaWlEb21haW5Db2RlUG9pbnRzLmJlZ2luKCksIGFzY2lpRG9tYWluQ29k ZVBvaW50cy5lbmQoKSkpIHsKICAgICAgICAgc2VyaWFsaXplSVB2NChhZGRyZXNzLnZhbHVlKCks IG1fYnVmZmVyKTsKICAgICAgICAgbV91cmwubV9ob3N0RW5kID0gbV9idWZmZXIubGVuZ3RoKCk7 Ci0gICAgICAgIC8vIEZJWE1FOiBIYW5kbGUgdGhlIHBvcnQgY29ycmVjdGx5LgotICAgICAgICBt X3VybC5tX3BvcnRFbmQgPSBtX2J1ZmZlci5sZW5ndGgoKTsKLSAgICAgICAgcmV0dXJuIHRydWU7 CisgICAgICAgIGlmIChpdGVyYXRvciA9PSBlbmQpIHsKKyAgICAgICAgICAgIG1fdXJsLm1fcG9y dEVuZCA9IG1fYnVmZmVyLmxlbmd0aCgpOworICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAg ICAgIH0KKyAgICAgICAgKytpdGVyYXRvcjsKKyAgICAgICAgcmV0dXJuIHBhcnNlUG9ydChpdGVy YXRvciwgZW5kKTsKICAgICB9CiAgICAgCiAgICAgbV9idWZmZXIuYXBwZW5kKGFzY2lpRG9tYWlu LnZhbHVlKCkpOwpAQCAtMTQxMSwxMSArMTQyNiw4IEBAIGJvb2wgVVJMUGFyc2VyOjpwYXJzZUhv c3QoU3RyaW5nVmlldzo6Q28KICAgICAgICAgKytpdGVyYXRvcjsKICAgICAgICAgd2hpbGUgKGl0 ZXJhdG9yICE9IGVuZCAmJiBpc1RhYk9yTmV3bGluZSgqaXRlcmF0b3IpKQogICAgICAgICAgICAg KytpdGVyYXRvcjsKLSAgICAgICAgaWYgKGl0ZXJhdG9yICE9IGVuZCkgewotICAgICAgICAgICAg bV9idWZmZXIuYXBwZW5kKCc6Jyk7Ci0gICAgICAgICAgICBpZiAoIXBhcnNlUG9ydChpdGVyYXRv ciwgZW5kKSkKLSAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIH0KKyAgICAg ICAgaWYgKGl0ZXJhdG9yICE9IGVuZCkKKyAgICAgICAgICAgIHJldHVybiBwYXJzZVBvcnQoaXRl cmF0b3IsIGVuZCk7CiAgICAgfQogICAgIG1fdXJsLm1fcG9ydEVuZCA9IG1fYnVmZmVyLmxlbmd0 aCgpOwogICAgIHJldHVybiB0cnVlOwpJbmRleDogVG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMjA1NjUwKQorKysgVG9vbHMvQ2hhbmdlTG9n CSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTYtMDktMDggIEFsZXggQ2hyaXN0 ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBVUkxQYXJzZXIgc2hv dWxkIHBhcnNlIHBvcnRzIGFmdGVyIElQdjQgYW5kIElQdjYgaG9zdHMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MTczMQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJDb3JlL1VSTFBhcnNlci5jcHA6CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpURVNUX0YpOgor CiAyMDE2LTA5LTA4ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+ CiAKICAgICAgICAgUmUtbGFuZCByMjA1NTgwIGFmdGVyIHIyMDU2NDkgZml4ZWQgdGhlIHRlc3Qg ZmFpbHVyZXMKSW5kZXg6IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9VUkxQYXJz ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9V UkxQYXJzZXIuY3BwCShyZXZpc2lvbiAyMDU2NTApCisrKyBUb29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYkNvcmUvVVJMUGFyc2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDMsNyArNDMsNyBA QCBzdHJ1Y3QgRXhwZWN0ZWRQYXJ0cyB7CiAgICAgU3RyaW5nIHVzZXI7CiAgICAgU3RyaW5nIHBh c3N3b3JkOwogICAgIFN0cmluZyBob3N0OwotICAgIHVuc2lnbmVkIHNob3J0IHBvcnQ7CisgICAg dW5zaWduZWQgc2hvcnQgcG9ydCB7IDAgfTsKICAgICBTdHJpbmcgcGF0aDsKICAgICBTdHJpbmcg cXVlcnk7CiAgICAgU3RyaW5nIGZyYWdtZW50OwpAQCAtMTc4LDYgKzE3OCwxOSBAQCBURVNUX0Yo VVJMUGFyc2VyVGVzdCwgQmFzaWMpCiAgICAgY2hlY2tVUkwoImh0dHA6Ly9ob3N0L0EgYiIsIHsi aHR0cCIsICIiLCAiIiwgImhvc3QiLCAwLCAiL0ElMjBiIiwgIiIsICIiLCAiaHR0cDovL2hvc3Qv QSUyMGIifSk7CiAgICAgY2hlY2tVUkwoImh0dHA6Ly9ob3N0L2ElMjBCIiwgeyJodHRwIiwgIiIs ICIiLCAiaG9zdCIsIDAsICIvYSUyMEIiLCAiIiwgIiIsICJodHRwOi8vaG9zdC9hJTIwQiJ9KTsK ICAgICBjaGVja1VSTCgiaHR0cDovL2hvc3Q/cT1AIDw+ISNmcmFnbWVudCIsIHsiaHR0cCIsICIi LCAiIiwgImhvc3QiLCAwLCAiLyIsICJxPUAlMjAlM0MlM0UhIiwgImZyYWdtZW50IiwgImh0dHA6 Ly9ob3N0Lz9xPUAlMjAlM0MlM0UhI2ZyYWdtZW50In0pOworICAgIGNoZWNrVVJMKCJodHRwOi8v MTI3LjAuMC4xOjEwMTAwL3BhdGgiLCB7Imh0dHAiLCAiIiwgIiIsICIxMjcuMC4wLjEiLCAxMDEw MCwgIi9wYXRoIiwgIiIsICIiLCAiaHR0cDovLzEyNy4wLjAuMToxMDEwMC9wYXRoIn0pOworICAg IGNoZWNrVVJMKCJodHRwOi8vMTI3LjAuMC4xOi9wYXRoIiwgeyJodHRwIiwgIiIsICIiLCAiMTI3 LjAuMC4xIiwgMCwgIi9wYXRoIiwgIiIsICIiLCAiaHR0cDovLzEyNy4wLjAuMS9wYXRoIn0pOwor ICAgIGNoZWNrVVJMKCJodHRwOi8vMTI3LjAuMC4xOjEyMyIsIHsiaHR0cCIsICIiLCAiIiwgIjEy Ny4wLjAuMSIsIDEyMywgIi8iLCAiIiwgIiIsICJodHRwOi8vMTI3LjAuMC4xOjEyMy8ifSk7Cisg ICAgY2hlY2tVUkwoImh0dHA6Ly8xMjcuMC4wLjE6IiwgeyJodHRwIiwgIiIsICIiLCAiMTI3LjAu MC4xIiwgMCwgIi8iLCAiIiwgIiIsICJodHRwOi8vMTI3LjAuMC4xLyJ9KTsKKyAgICBjaGVja1VS TCgiaHR0cDovL1swOmY6OmY6ZjowOjBdOjEyMy9wYXRoIiwgeyJodHRwIiwgIiIsICIiLCAiWzA6 Zjo6ZjpmOjA6MF0iLCAxMjMsICIvcGF0aCIsICIiLCAiIiwgImh0dHA6Ly9bMDpmOjpmOmY6MDow XToxMjMvcGF0aCJ9KTsKKyAgICBjaGVja1VSTCgiaHR0cDovL1swOmY6OmY6ZjowOjBdOjEyMyIs IHsiaHR0cCIsICIiLCAiIiwgIlswOmY6OmY6ZjowOjBdIiwgMTIzLCAiLyIsICIiLCAiIiwgImh0 dHA6Ly9bMDpmOjpmOmY6MDowXToxMjMvIn0pOworICAgIGNoZWNrVVJMKCJodHRwOi8vWzA6Zjo6 ZjpmOjA6MF06L3BhdGgiLCB7Imh0dHAiLCAiIiwgIiIsICJbMDpmOjpmOmY6MDowXSIsIDAsICIv cGF0aCIsICIiLCAiIiwgImh0dHA6Ly9bMDpmOjpmOmY6MDowXS9wYXRoIn0pOworICAgIGNoZWNr VVJMKCJodHRwOi8vWzA6Zjo6ZjpmOjA6MF06IiwgeyJodHRwIiwgIiIsICIiLCAiWzA6Zjo6Zjpm OjA6MF0iLCAwLCAiLyIsICIiLCAiIiwgImh0dHA6Ly9bMDpmOjpmOmY6MDowXS8ifSk7CisgICAg Y2hlY2tVUkwoImh0dHA6Ly9ob3N0OjEwMTAwL3BhdGgiLCB7Imh0dHAiLCAiIiwgIiIsICJob3N0 IiwgMTAxMDAsICIvcGF0aCIsICIiLCAiIiwgImh0dHA6Ly9ob3N0OjEwMTAwL3BhdGgifSk7Cisg ICAgY2hlY2tVUkwoImh0dHA6Ly9ob3N0Oi9wYXRoIiwgeyJodHRwIiwgIiIsICIiLCAiaG9zdCIs IDAsICIvcGF0aCIsICIiLCAiIiwgImh0dHA6Ly9ob3N0L3BhdGgifSk7CisgICAgY2hlY2tVUkwo Imh0dHA6Ly9ob3N0OjEyMyIsIHsiaHR0cCIsICIiLCAiIiwgImhvc3QiLCAxMjMsICIvIiwgIiIs ICIiLCAiaHR0cDovL2hvc3Q6MTIzLyJ9KTsKKyAgICBjaGVja1VSTCgiaHR0cDovL2hvc3Q6Iiwg eyJodHRwIiwgIiIsICIiLCAiaG9zdCIsIDAsICIvIiwgIiIsICIiLCAiaHR0cDovL2hvc3QvIn0p OworICAgIGNoZWNrVVJMKCJodHRwOi8vaG9zXHR0XG46XHQxXG4yXHQzXHQvXG5wYXRoIiwgeyJo dHRwIiwgIiIsICIiLCAiaG9zdCIsIDEyMywgIi9wYXRoIiwgIiIsICIiLCAiaHR0cDovL2hvc3Q6 MTIzL3BhdGgifSk7CiB9CiAKIHN0YXRpYyB2b2lkIGNoZWNrUmVsYXRpdmVVUkwoY29uc3QgU3Ry aW5nJiB1cmxTdHJpbmcsIGNvbnN0IFN0cmluZyYgYmFzZVVSTFN0cmluZywgY29uc3QgRXhwZWN0 ZWRQYXJ0cyYgcGFydHMpCkBAIC0zNTQsNiArMzY3LDEzIEBAIFRFU1RfRihVUkxQYXJzZXJUZXN0 LCBQYXJzZXJEaWZmZXJlbmNlcykKICAgICBjaGVja1JlbGF0aXZlVVJMRGlmZmVyZW5jZXMod2lk ZVN0cmluZyhMIiPOsiIpLCAiaHR0cDovL2V4YW1wbGUub3JnL2Zvby9iYXIiLAogICAgICAgICB7 Imh0dHAiLCAiIiwgIiIsICJleGFtcGxlLm9yZyIsIDAsICIvZm9vL2JhciIsICIiLCB3aWRlU3Ry aW5nKEwizrIiKSwgd2lkZVN0cmluZyhMImh0dHA6Ly9leGFtcGxlLm9yZy9mb28vYmFyI86yIil9 LAogICAgICAgICB7Imh0dHAiLCAiIiwgIiIsICJleGFtcGxlLm9yZyIsIDAsICIvZm9vL2JhciIs ICIiLCAiJUNFJUIyIiwgImh0dHA6Ly9leGFtcGxlLm9yZy9mb28vYmFyIyVDRSVCMiJ9KTsKKyAg ICBjaGVja1VSTERpZmZlcmVuY2VzKCJodHRwOi8vMTI3LjAuMC4xOjY1NTM2L3BhdGgiLCB7IH0s IHsiaHR0cCIsICIiLCAiIiwgIjEyNy4wLjAuMSIsIDY1NTM1LCAiL3BhdGgiLCAiIiwgIiIsICJo dHRwOi8vMTI3LjAuMC4xOjY1NTM2L3BhdGgifSk7CisgICAgY2hlY2tVUkxEaWZmZXJlbmNlcygi aHR0cDovL2hvc3Q6YWJjIiwgeyB9LCB7IiIsICIiLCAiIiwgIiIsIDAsICIiLCAiIiwgIiIsICJo dHRwOi8vaG9zdDphYmMifSk7CisgICAgY2hlY2tVUkxEaWZmZXJlbmNlcygiaHR0cDovL2hvc3Q6 NjU1MzYiLCB7IH0sIHsiaHR0cCIsICIiLCAiIiwgImhvc3QiLCA2NTUzNSwgIi8iLCAiIiwgIiIs ICJodHRwOi8vaG9zdDo2NTUzNi8ifSk7CisgICAgY2hlY2tVUkxEaWZmZXJlbmNlcygiaHR0cDov LzEyNy4wLjAuMTphYmMiLCB7IH0sIHsiIiwgIiIsICIiLCAiIiwgMCwgIiIsICIiLCAiIiwgImh0 dHA6Ly8xMjcuMC4wLjE6YWJjIn0pOworICAgIGNoZWNrVVJMRGlmZmVyZW5jZXMoImh0dHA6Ly8x MjcuMC4wLjE6NjU1MzYiLCB7IH0sIHsiaHR0cCIsICIiLCAiIiwgIjEyNy4wLjAuMSIsIDY1NTM1 LCAiLyIsICIiLCAiIiwgImh0dHA6Ly8xMjcuMC4wLjE6NjU1MzYvIn0pOworICAgIGNoZWNrVVJM RGlmZmVyZW5jZXMoImh0dHA6Ly9bMDpmOjpmOmY6MDowXTphYmMiLCB7IH0sIHsiIiwgIiIsICIi LCAiIiwgMCwgIiIsICIiLCAiIiwgImh0dHA6Ly9bMDpmOjpmOmY6MDowXTphYmMifSk7CisgICAg Y2hlY2tVUkxEaWZmZXJlbmNlcygiaHR0cDovL1swOmY6OmY6ZjowOjBdOjY1NTM2IiwgeyB9LCB7 Imh0dHAiLCAiIiwgIiIsICJbMDpmOjpmOmY6MDowXSIsIDY1NTM1LCAiLyIsICIiLCAiIiwgImh0 dHA6Ly9bMDpmOjpmOmY6MDowXTo2NTUzNi8ifSk7CiAKICAgICAvLyBGSVhNRTogVGhpcyBiZWhh dmlvciBvdWdodCB0byBiZSBzcGVjaWZpZWQgaW4gdGhlIHN0YW5kYXJkLgogICAgIC8vIFdpdGgg dGhlIGV4aXN0aW5nIFVSTDo6cGFyc2UsIFdlYktpdCByZXR1cm5zICJodHRwczovIiwgRmlyZWZv eCByZXR1cm5zICJodHRwczovLy8iLCBhbmQgQ2hyb21lIHRocm93cyBhbiBlcnJvci4K 288289 2016-09-08 11:27:43 -0700 2016-09-08 15:30:07 -0700 Patch bug-161731-20160908112516.patch text/plain 8108 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwNTY1MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDE2LTA5LTA4ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgVVJMUGFyc2Vy IHNob3VsZCBwYXJzZSBwb3J0cyBhZnRlciBJUHY0IGFuZCBJUHY2IGhvc3RzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjE3MzEKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb3ZlcmVkIGJ5IG5ldyBBUEkg dGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9VUkxQYXJzZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6VVJMUGFyc2VyOjpwYXJzZVBvcnQpOgorICAgICAgICAoV2ViQ29yZTo6VVJMUGFyc2Vy OjpwYXJzZUhvc3QpOgorCiAyMDE2LTA5LTA4ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVu c2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmUtbGFuZCByMjA1NTgwIGFmdGVyIHIyMDU2NDkg Zml4ZWQgdGhlIHRlc3QgZmFpbHVyZXMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1VS TFBhcnNlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVVJMUGFy c2VyLmNwcAkocmV2aXNpb24gMjA1NjUwKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVVJM UGFyc2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTMzMyw3ICsxMzMzLDExIEBAIHN0YXRpYyBi b29sIGhhc0ludmFsaWREb21haW5DaGFyYWN0ZXIoY28KIGJvb2wgVVJMUGFyc2VyOjpwYXJzZVBv cnQoU3RyaW5nVmlldzo6Q29kZVBvaW50czo6SXRlcmF0b3ImIGl0ZXJhdG9yLCBjb25zdCBTdHJp bmdWaWV3OjpDb2RlUG9pbnRzOjpJdGVyYXRvciYgZW5kKQogewogICAgIHVpbnQzMl90IHBvcnQg PSAwOwotICAgIEFTU0VSVChpdGVyYXRvciAhPSBlbmQpOworICAgIGlmIChpdGVyYXRvciA9PSBl bmQpIHsKKyAgICAgICAgbV91cmwubV9wb3J0RW5kID0gbV9idWZmZXIubGVuZ3RoKCk7CisgICAg ICAgIHJldHVybiB0cnVlOworICAgIH0KKyAgICBtX2J1ZmZlci5hcHBlbmQoJzonKTsKICAgICBm b3IgKDsgaXRlcmF0b3IgIT0gZW5kOyArK2l0ZXJhdG9yKSB7CiAgICAgICAgIGlmIChpc1RhYk9y TmV3bGluZSgqaXRlcmF0b3IpKQogICAgICAgICAgICAgY29udGludWU7CkBAIC0xMzUzLDYgKzEz NTcsNyBAQCBib29sIFVSTFBhcnNlcjo6cGFyc2VQb3J0KFN0cmluZ1ZpZXc6OkNvCiAgICAgfSBl bHNlCiAgICAgICAgIG1fYnVmZmVyLmFwcGVuZE51bWJlcihwb3J0KTsKIAorICAgIG1fdXJsLm1f cG9ydEVuZCA9IG1fYnVmZmVyLmxlbmd0aCgpOwogICAgIHJldHVybiB0cnVlOwogfQogCkBAIC0x MzY4LDggKzEzNzMsMTUgQEAgYm9vbCBVUkxQYXJzZXI6OnBhcnNlSG9zdChTdHJpbmdWaWV3OjpD bwogICAgICAgICBpZiAoYXV0byBhZGRyZXNzID0gcGFyc2VJUHY2SG9zdChpdGVyYXRvciwgaXB2 NkVuZCkpIHsKICAgICAgICAgICAgIHNlcmlhbGl6ZUlQdjYoYWRkcmVzcy52YWx1ZSgpLCBtX2J1 ZmZlcik7CiAgICAgICAgICAgICBtX3VybC5tX2hvc3RFbmQgPSBtX2J1ZmZlci5sZW5ndGgoKTsK LSAgICAgICAgICAgIC8vIEZJWE1FOiBIYW5kbGUgdGhlIHBvcnQgY29ycmVjdGx5LgotICAgICAg ICAgICAgbV91cmwubV9wb3J0RW5kID0gbV9idWZmZXIubGVuZ3RoKCk7ICAgICAgICAgICAgCisg ICAgICAgICAgICBpZiAoaXB2NkVuZCAhPSBlbmQpIHsKKyAgICAgICAgICAgICAgICArK2lwdjZF bmQ7CisgICAgICAgICAgICAgICAgaWYgKGlwdjZFbmQgIT0gZW5kICYmICppcHY2RW5kID09ICc6 JykgeworICAgICAgICAgICAgICAgICAgICArK2lwdjZFbmQ7CisgICAgICAgICAgICAgICAgICAg IHJldHVybiBwYXJzZVBvcnQoaXB2NkVuZCwgZW5kKTsKKyAgICAgICAgICAgICAgICB9CisgICAg ICAgICAgICAgICAgbV91cmwubV9wb3J0RW5kID0gbV9idWZmZXIubGVuZ3RoKCk7CisgICAgICAg ICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgICAgICB9CiAgICAgICAgICAgICByZXR1cm4g dHJ1ZTsKICAgICAgICAgfQogICAgIH0KQEAgLTEzOTksOSArMTQxMSwxMiBAQCBib29sIFVSTFBh cnNlcjo6cGFyc2VIb3N0KFN0cmluZ1ZpZXc6OkNvCiAgICAgaWYgKGF1dG8gYWRkcmVzcyA9IHBh cnNlSVB2NEhvc3QoYXNjaWlEb21haW5Db2RlUG9pbnRzLmJlZ2luKCksIGFzY2lpRG9tYWluQ29k ZVBvaW50cy5lbmQoKSkpIHsKICAgICAgICAgc2VyaWFsaXplSVB2NChhZGRyZXNzLnZhbHVlKCks IG1fYnVmZmVyKTsKICAgICAgICAgbV91cmwubV9ob3N0RW5kID0gbV9idWZmZXIubGVuZ3RoKCk7 Ci0gICAgICAgIC8vIEZJWE1FOiBIYW5kbGUgdGhlIHBvcnQgY29ycmVjdGx5LgotICAgICAgICBt X3VybC5tX3BvcnRFbmQgPSBtX2J1ZmZlci5sZW5ndGgoKTsKLSAgICAgICAgcmV0dXJuIHRydWU7 CisgICAgICAgIGlmIChpdGVyYXRvciA9PSBlbmQpIHsKKyAgICAgICAgICAgIG1fdXJsLm1fcG9y dEVuZCA9IG1fYnVmZmVyLmxlbmd0aCgpOworICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAg ICAgIH0KKyAgICAgICAgKytpdGVyYXRvcjsKKyAgICAgICAgcmV0dXJuIHBhcnNlUG9ydChpdGVy YXRvciwgZW5kKTsKICAgICB9CiAgICAgCiAgICAgbV9idWZmZXIuYXBwZW5kKGFzY2lpRG9tYWlu LnZhbHVlKCkpOwpAQCAtMTQxMSwxMSArMTQyNiw4IEBAIGJvb2wgVVJMUGFyc2VyOjpwYXJzZUhv c3QoU3RyaW5nVmlldzo6Q28KICAgICAgICAgKytpdGVyYXRvcjsKICAgICAgICAgd2hpbGUgKGl0 ZXJhdG9yICE9IGVuZCAmJiBpc1RhYk9yTmV3bGluZSgqaXRlcmF0b3IpKQogICAgICAgICAgICAg KytpdGVyYXRvcjsKLSAgICAgICAgaWYgKGl0ZXJhdG9yICE9IGVuZCkgewotICAgICAgICAgICAg bV9idWZmZXIuYXBwZW5kKCc6Jyk7Ci0gICAgICAgICAgICBpZiAoIXBhcnNlUG9ydChpdGVyYXRv ciwgZW5kKSkKLSAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIH0KKyAgICAg ICAgaWYgKGl0ZXJhdG9yICE9IGVuZCkKKyAgICAgICAgICAgIHJldHVybiBwYXJzZVBvcnQoaXRl cmF0b3IsIGVuZCk7CiAgICAgfQogICAgIG1fdXJsLm1fcG9ydEVuZCA9IG1fYnVmZmVyLmxlbmd0 aCgpOwogICAgIHJldHVybiB0cnVlOwpJbmRleDogVG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMjA1NjUwKQorKysgVG9vbHMvQ2hhbmdlTG9n CSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTYtMDktMDggIEFsZXggQ2hyaXN0 ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBVUkxQYXJzZXIgc2hv dWxkIHBhcnNlIHBvcnRzIGFmdGVyIElQdjQgYW5kIElQdjYgaG9zdHMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MTczMQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJDb3JlL1VSTFBhcnNlci5jcHA6CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpURVNUX0YpOgor CiAyMDE2LTA5LTA4ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+ CiAKICAgICAgICAgUmUtbGFuZCByMjA1NTgwIGFmdGVyIHIyMDU2NDkgZml4ZWQgdGhlIHRlc3Qg ZmFpbHVyZXMKSW5kZXg6IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9VUkxQYXJz ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9V UkxQYXJzZXIuY3BwCShyZXZpc2lvbiAyMDU2NTApCisrKyBUb29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYkNvcmUvVVJMUGFyc2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTc4LDYgKzE3OCwx OSBAQCBURVNUX0YoVVJMUGFyc2VyVGVzdCwgQmFzaWMpCiAgICAgY2hlY2tVUkwoImh0dHA6Ly9o b3N0L0EgYiIsIHsiaHR0cCIsICIiLCAiIiwgImhvc3QiLCAwLCAiL0ElMjBiIiwgIiIsICIiLCAi aHR0cDovL2hvc3QvQSUyMGIifSk7CiAgICAgY2hlY2tVUkwoImh0dHA6Ly9ob3N0L2ElMjBCIiwg eyJodHRwIiwgIiIsICIiLCAiaG9zdCIsIDAsICIvYSUyMEIiLCAiIiwgIiIsICJodHRwOi8vaG9z dC9hJTIwQiJ9KTsKICAgICBjaGVja1VSTCgiaHR0cDovL2hvc3Q/cT1AIDw+ISNmcmFnbWVudCIs IHsiaHR0cCIsICIiLCAiIiwgImhvc3QiLCAwLCAiLyIsICJxPUAlMjAlM0MlM0UhIiwgImZyYWdt ZW50IiwgImh0dHA6Ly9ob3N0Lz9xPUAlMjAlM0MlM0UhI2ZyYWdtZW50In0pOworICAgIGNoZWNr VVJMKCJodHRwOi8vMTI3LjAuMC4xOjEwMTAwL3BhdGgiLCB7Imh0dHAiLCAiIiwgIiIsICIxMjcu MC4wLjEiLCAxMDEwMCwgIi9wYXRoIiwgIiIsICIiLCAiaHR0cDovLzEyNy4wLjAuMToxMDEwMC9w YXRoIn0pOworICAgIGNoZWNrVVJMKCJodHRwOi8vMTI3LjAuMC4xOi9wYXRoIiwgeyJodHRwIiwg IiIsICIiLCAiMTI3LjAuMC4xIiwgMCwgIi9wYXRoIiwgIiIsICIiLCAiaHR0cDovLzEyNy4wLjAu MS9wYXRoIn0pOworICAgIGNoZWNrVVJMKCJodHRwOi8vMTI3LjAuMC4xOjEyMyIsIHsiaHR0cCIs ICIiLCAiIiwgIjEyNy4wLjAuMSIsIDEyMywgIi8iLCAiIiwgIiIsICJodHRwOi8vMTI3LjAuMC4x OjEyMy8ifSk7CisgICAgY2hlY2tVUkwoImh0dHA6Ly8xMjcuMC4wLjE6IiwgeyJodHRwIiwgIiIs ICIiLCAiMTI3LjAuMC4xIiwgMCwgIi8iLCAiIiwgIiIsICJodHRwOi8vMTI3LjAuMC4xLyJ9KTsK KyAgICBjaGVja1VSTCgiaHR0cDovL1swOmY6OmY6ZjowOjBdOjEyMy9wYXRoIiwgeyJodHRwIiwg IiIsICIiLCAiWzA6Zjo6ZjpmOjA6MF0iLCAxMjMsICIvcGF0aCIsICIiLCAiIiwgImh0dHA6Ly9b MDpmOjpmOmY6MDowXToxMjMvcGF0aCJ9KTsKKyAgICBjaGVja1VSTCgiaHR0cDovL1swOmY6OmY6 ZjowOjBdOjEyMyIsIHsiaHR0cCIsICIiLCAiIiwgIlswOmY6OmY6ZjowOjBdIiwgMTIzLCAiLyIs ICIiLCAiIiwgImh0dHA6Ly9bMDpmOjpmOmY6MDowXToxMjMvIn0pOworICAgIGNoZWNrVVJMKCJo dHRwOi8vWzA6Zjo6ZjpmOjA6MF06L3BhdGgiLCB7Imh0dHAiLCAiIiwgIiIsICJbMDpmOjpmOmY6 MDowXSIsIDAsICIvcGF0aCIsICIiLCAiIiwgImh0dHA6Ly9bMDpmOjpmOmY6MDowXS9wYXRoIn0p OworICAgIGNoZWNrVVJMKCJodHRwOi8vWzA6Zjo6ZjpmOjA6MF06IiwgeyJodHRwIiwgIiIsICIi LCAiWzA6Zjo6ZjpmOjA6MF0iLCAwLCAiLyIsICIiLCAiIiwgImh0dHA6Ly9bMDpmOjpmOmY6MDow XS8ifSk7CisgICAgY2hlY2tVUkwoImh0dHA6Ly9ob3N0OjEwMTAwL3BhdGgiLCB7Imh0dHAiLCAi IiwgIiIsICJob3N0IiwgMTAxMDAsICIvcGF0aCIsICIiLCAiIiwgImh0dHA6Ly9ob3N0OjEwMTAw L3BhdGgifSk7CisgICAgY2hlY2tVUkwoImh0dHA6Ly9ob3N0Oi9wYXRoIiwgeyJodHRwIiwgIiIs ICIiLCAiaG9zdCIsIDAsICIvcGF0aCIsICIiLCAiIiwgImh0dHA6Ly9ob3N0L3BhdGgifSk7Cisg ICAgY2hlY2tVUkwoImh0dHA6Ly9ob3N0OjEyMyIsIHsiaHR0cCIsICIiLCAiIiwgImhvc3QiLCAx MjMsICIvIiwgIiIsICIiLCAiaHR0cDovL2hvc3Q6MTIzLyJ9KTsKKyAgICBjaGVja1VSTCgiaHR0 cDovL2hvc3Q6IiwgeyJodHRwIiwgIiIsICIiLCAiaG9zdCIsIDAsICIvIiwgIiIsICIiLCAiaHR0 cDovL2hvc3QvIn0pOworICAgIGNoZWNrVVJMKCJodHRwOi8vaG9zXHR0XG46XHQxXG4yXHQzXHQv XG5wYXRoIiwgeyJodHRwIiwgIiIsICIiLCAiaG9zdCIsIDEyMywgIi9wYXRoIiwgIiIsICIiLCAi aHR0cDovL2hvc3Q6MTIzL3BhdGgifSk7CiB9CiAKIHN0YXRpYyB2b2lkIGNoZWNrUmVsYXRpdmVV UkwoY29uc3QgU3RyaW5nJiB1cmxTdHJpbmcsIGNvbnN0IFN0cmluZyYgYmFzZVVSTFN0cmluZywg Y29uc3QgRXhwZWN0ZWRQYXJ0cyYgcGFydHMpCkBAIC0zNTQsNiArMzY3LDI3IEBAIFRFU1RfRihV UkxQYXJzZXJUZXN0LCBQYXJzZXJEaWZmZXJlbmNlcykKICAgICBjaGVja1JlbGF0aXZlVVJMRGlm ZmVyZW5jZXMod2lkZVN0cmluZyhMIiPOsiIpLCAiaHR0cDovL2V4YW1wbGUub3JnL2Zvby9iYXIi LAogICAgICAgICB7Imh0dHAiLCAiIiwgIiIsICJleGFtcGxlLm9yZyIsIDAsICIvZm9vL2JhciIs ICIiLCB3aWRlU3RyaW5nKEwizrIiKSwgd2lkZVN0cmluZyhMImh0dHA6Ly9leGFtcGxlLm9yZy9m b28vYmFyI86yIil9LAogICAgICAgICB7Imh0dHAiLCAiIiwgIiIsICJleGFtcGxlLm9yZyIsIDAs ICIvZm9vL2JhciIsICIiLCAiJUNFJUIyIiwgImh0dHA6Ly9leGFtcGxlLm9yZy9mb28vYmFyIyVD RSVCMiJ9KTsKKyAgICBjaGVja1VSTERpZmZlcmVuY2VzKCJodHRwOi8vMTI3LjAuMC4xOjY1NTM2 L3BhdGgiLAorICAgICAgICB7IiIsICIiLCAiIiwgIiIsIDAsICIiLCAiIiwgIiIsICIifSwKKyAg ICAgICAgeyJodHRwIiwgIiIsICIiLCAiMTI3LjAuMC4xIiwgNjU1MzUsICIvcGF0aCIsICIiLCAi IiwgImh0dHA6Ly8xMjcuMC4wLjE6NjU1MzYvcGF0aCJ9KTsKKyAgICBjaGVja1VSTERpZmZlcmVu Y2VzKCJodHRwOi8vaG9zdDphYmMiLAorICAgICAgICB7IiIsICIiLCAiIiwgIiIsIDAsICIiLCAi IiwgIiIsICIifSwKKyAgICAgICAgeyIiLCAiIiwgIiIsICIiLCAwLCAiIiwgIiIsICIiLCAiaHR0 cDovL2hvc3Q6YWJjIn0pOworICAgIGNoZWNrVVJMRGlmZmVyZW5jZXMoImh0dHA6Ly9ob3N0OjY1 NTM2IiwKKyAgICAgICAgeyIiLCAiIiwgIiIsICIiLCAwLCAiIiwgIiIsICIiLCAiIn0sCisgICAg ICAgIHsiaHR0cCIsICIiLCAiIiwgImhvc3QiLCA2NTUzNSwgIi8iLCAiIiwgIiIsICJodHRwOi8v aG9zdDo2NTUzNi8ifSk7CisgICAgY2hlY2tVUkxEaWZmZXJlbmNlcygiaHR0cDovLzEyNy4wLjAu MTphYmMiLAorICAgICAgICB7IiIsICIiLCAiIiwgIiIsIDAsICIiLCAiIiwgIiIsICIifSwKKyAg ICAgICAgeyIiLCAiIiwgIiIsICIiLCAwLCAiIiwgIiIsICIiLCAiaHR0cDovLzEyNy4wLjAuMTph YmMifSk7CisgICAgY2hlY2tVUkxEaWZmZXJlbmNlcygiaHR0cDovLzEyNy4wLjAuMTo2NTUzNiIs CisgICAgICAgIHsiIiwgIiIsICIiLCAiIiwgMCwgIiIsICIiLCAiIiwgIiJ9LAorICAgICAgICB7 Imh0dHAiLCAiIiwgIiIsICIxMjcuMC4wLjEiLCA2NTUzNSwgIi8iLCAiIiwgIiIsICJodHRwOi8v MTI3LjAuMC4xOjY1NTM2LyJ9KTsKKyAgICBjaGVja1VSTERpZmZlcmVuY2VzKCJodHRwOi8vWzA6 Zjo6ZjpmOjA6MF06YWJjIiwKKyAgICAgICAgeyIiLCAiIiwgIiIsICIiLCAwLCAiIiwgIiIsICIi LCAiIn0sCisgICAgICAgIHsiIiwgIiIsICIiLCAiIiwgMCwgIiIsICIiLCAiIiwgImh0dHA6Ly9b MDpmOjpmOmY6MDowXTphYmMifSk7CisgICAgY2hlY2tVUkxEaWZmZXJlbmNlcygiaHR0cDovL1sw OmY6OmY6ZjowOjBdOjY1NTM2IiwKKyAgICAgICAgeyIiLCAiIiwgIiIsICIiLCAwLCAiIiwgIiIs ICIiLCAiIn0sCisgICAgICAgIHsiaHR0cCIsICIiLCAiIiwgIlswOmY6OmY6ZjowOjBdIiwgNjU1 MzUsICIvIiwgIiIsICIiLCAiaHR0cDovL1swOmY6OmY6ZjowOjBdOjY1NTM2LyJ9KTsKIAogICAg IC8vIEZJWE1FOiBUaGlzIGJlaGF2aW9yIG91Z2h0IHRvIGJlIHNwZWNpZmllZCBpbiB0aGUgc3Rh bmRhcmQuCiAgICAgLy8gV2l0aCB0aGUgZXhpc3RpbmcgVVJMOjpwYXJzZSwgV2ViS2l0IHJldHVy bnMgImh0dHBzOi8iLCBGaXJlZm94IHJldHVybnMgImh0dHBzOi8vLyIsIGFuZCBDaHJvbWUgdGhy b3dzIGFuIGVycm9yLgo=