98604 2012-10-06 14:46:57 -0700 WTFURL: implement URL port removal for HTMLAnchorElement 2012-10-07 15:08:48 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin abarth webkit.review.bot oldest_to_newest 736288 0 benjamin 2012-10-06 14:46:57 -0700 Fix the port reset used by HTMLAnchorElement. 736291 1 167461 benjamin 2012-10-06 15:11:04 -0700 Created attachment 167461 Patch 736426 2 167461 abarth 2012-10-07 14:51:01 -0700 Comment on attachment 167461 Patch Ok. I'm slightly worried about the dependency on WTFString. 736429 3 167461 webkit.review.bot 2012-10-07 15:01:22 -0700 Comment on attachment 167461 Patch Clearing flags on attachment: 167461 Committed r130609: <http://trac.webkit.org/changeset/130609> 736430 4 webkit.review.bot 2012-10-07 15:01:26 -0700 All reviewed patches have been landed. Closing bug. 736433 5 benjamin 2012-10-07 15:08:48 -0700 (In reply to comment #2) > Ok. I'm slightly worried about the dependency on WTFString. It is only in ParsedURL, which already depends on WTFString. I have been careful not to push anything in the parser. I added a dependency on LChar in the parser, but I figured we can easily typedef it for use without WTF. 167461 2012-10-06 15:11:04 -0700 2012-10-07 15:01:21 -0700 Patch bug-98604-20121006151010.patch text/plain 13177 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwNTgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDQ4OWVkMTI3YTg3MTcwNjNlMjAzNmZk MzQwOTJlZjA1MjQzNWNkMTIuLjQzYTkzOWU1OWQ5YTU1M2Q1OWI0ZDVlZDFjZTU2MmRkYWEzN2Fk NzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTItMTAtMDYgIEJlbmphbWluIFBvdWxhaW4gIDxi ZW5qYW1pbkB3ZWJraXQub3JnPgorCisgICAgICAgIFdURlVSTDogaW1wbGVtZW50IFVSTCBwb3J0 IHJlbW92YWwgZm9yIEhUTUxBbmNob3JFbGVtZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD05ODYwNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEFkZCBoYXNTdGFuZGFyZFNjaGVtZSgpIChzaW1pbGFyIHRv IGlzU3RhbmRhcmQgZnJvbSBHb29nbGUgVVJMKSwKKyAgICAgICAgaGFzUG9ydCgpIGFuZCByZW1v dmVQb3J0KCkgdG8gaW1wbGVtZW50IHRoZSBwb3J0IHJlbW92YWwgb2YgS1VSTC4KKworICAgICAg ICAqIHd0Zi91cmwvYXBpL1BhcnNlZFVSTC5jcHA6CisgICAgICAgIChXVEY6OlBhcnNlZFVSTDo6 aGFzU3RhbmRhcmRTY2hlbWUpOgorICAgICAgICAoV1RGOjpQYXJzZWRVUkw6Omhhc1BvcnQpOgor ICAgICAgICAoV1RGOjpQYXJzZWRVUkw6OnJlbW92ZVBvcnQpOgorICAgICAgICAqIHd0Zi91cmwv YXBpL1BhcnNlZFVSTC5oOgorICAgICAgICAoUGFyc2VkVVJMKToKKyAgICAgICAgKiB3dGYvdXJs L3NyYy9VUkxDb21wb25lbnQuaDoKKyAgICAgICAgKFdURjo6VVJMQ29tcG9uZW50Ojptb3ZlKToK KyAgICAgICAgKiB3dGYvdXJsL3NyYy9VUkxTZWdtZW50cy5jcHA6CisgICAgICAgIChXVEY6OlVS TFNlZ21lbnRzOjptb3ZlQ29tcG9uZW50c0FmdGVyKToKKyAgICAgICAgKiB3dGYvdXJsL3NyYy9V UkxTZWdtZW50cy5oOgorICAgICAgICAoVVJMU2VnbWVudHMpOgorICAgICAgICAqIHd0Zi91cmwv c3JjL1VSTFV0aWwuY3BwOgorICAgICAgICAoVVJMVXRpbGl0aWVzKToKKyAgICAgICAgKFdURjo6 VVJMVXRpbGl0aWVzOjppc1N0YW5kYXJkKToKKyAgICAgICAgKiB3dGYvdXJsL3NyYy9VUkxVdGls Lmg6CisgICAgICAgIChVUkxVdGlsaXRpZXMpOgorICAgICAgICBSZW1vdmUgTG93ZXJDYXNlRXF1 YWxzQVNDSUkoKSBmcm9tIHRoZSBpbnRlcmZhY2UsIG1ha2UgaXQgYW4gaW50ZXJuYWwgdGVtcGxh dGUuCisKKyAgICAgICAgKFdURjo6VVJMVXRpbGl0aWVzOjppc1N0YW5kYXJkKToKKyAgICAgICAg U2luY2UgaW4gV2ViS2l0LCBMQ2hhciBpcyBhIHN1cGVyc2V0IG9mIGNoYXIsIGV4cG9zZSBMQ2hh ciBhbmQgY2FzdCBjaGFyKiB0byBMQ2hhciouCisKIDIwMTItMTAtMDYgIElseWEgVGlraG9ub3Zz a3kgIDxsb2lzbG9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IE5NSSBm aXggU3RyaW5nIGluc3RydW1lbnRhdGlvbiB0aGUgd2F5IGl0IHdhcyBkaXNjdXNzZWQgaW4gV0s5 Nzk2NApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCmluZGV4IDY0YjI3MmU5Yzg2MzU2ZWJhOTY4M2Q5NTQ3YmRmNjA1ZGM4ZDM2 YmIuLmE3MzI5NTBlMTllZWJmMjNiZTY3ZmYzZmM0OWJjZGIzMzcwNmI2ZDEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxNiBAQAorMjAxMi0xMC0wNiAgQmVuamFtaW4gUG91bGFpbiAgPGJlbmphbWlu QHdlYmtpdC5vcmc+CisKKyAgICAgICAgV1RGVVJMOiBpbXBsZW1lbnQgVVJMIHBvcnQgcmVtb3Zh bCBmb3IgSFRNTEFuY2hvckVsZW1lbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTk4NjA0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9LVVJMV1RGVVJMLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OktVUkw6Omhhc1BvcnQpOgorICAgICAgICAoV2ViQ29yZTo6S1VSTDo6cmVtb3ZlUG9ydCk6 CisgICAgICAgIChXZWJDb3JlOjpLVVJMOjppc0hpZXJhcmNoaWNhbCk6CisgICAgICAgIEltcGxl bWVudCB0aG9zZSBtZXRob2RzIHRvIHBhc3MgdGhlIHBvcnQgcmVtb3ZhbCB0ZXN0IG9mIEhUTUxB bmNob3JFbGVtZW50LgorCiAyMDEyLTEwLTA2ICBCeXVuZ3dvbyBMZWUgIDxidzgwLmxlZUBzYW1z dW5nLmNvbT4KIAogICAgICAgICBGaXggYnVpbGQgd2FybmluZyA6IC1XdW51c2VkLXBhcmFtZXRl ci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL3VybC9hcGkvUGFyc2VkVVJMLmNwcCBiL1Nv dXJjZS9XVEYvd3RmL3VybC9hcGkvUGFyc2VkVVJMLmNwcAppbmRleCAzOGFjOGZjMDc3MDViY2Y5 OTBmMmYzNzI0ZTQ5NjAyODdhMjYwNmU2Li42NTNjY2M4ZGU0N2NiNjc0MzJmZTY3OTJiNzdlNTA2 ZWQ3YTcyNTM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi91cmwvYXBpL1BhcnNlZFVSTC5j cHAKKysrIGIvU291cmNlL1dURi93dGYvdXJsL2FwaS9QYXJzZWRVUkwuY3BwCkBAIC0xMzcsNiAr MTM3LDE1IEBAIFN0cmluZyBQYXJzZWRVUkw6OnNjaGVtZSgpIGNvbnN0CiAgICAgcmV0dXJuIHNl Z21lbnQobV9zZWdtZW50cy5zY2hlbWUpOwogfQogCitib29sIFBhcnNlZFVSTDo6aGFzU3RhbmRh cmRTY2hlbWUoKSBjb25zdAoreworICAgIEFTU0VSVChtX3NlZ21lbnRzLnNjaGVtZS5pc1ZhbGlk KCkpOworICAgIGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nU3BlYyA9IG1fc3BlYy5tX3N0cmluZzsK KyAgICBpZiAodXJsU3RyaW5nU3BlYy5pczhCaXQoKSkKKyAgICAgICAgcmV0dXJuIFVSTFV0aWxp dGllczo6aXNTdGFuZGFyZCh1cmxTdHJpbmdTcGVjLmNoYXJhY3RlcnM4KCksIG1fc2VnbWVudHMu c2NoZW1lKTsKKyAgICByZXR1cm4gVVJMVXRpbGl0aWVzOjppc1N0YW5kYXJkKHVybFN0cmluZ1Nw ZWMuY2hhcmFjdGVyczE2KCksIG1fc2VnbWVudHMuc2NoZW1lKTsKK30KKwogU3RyaW5nIFBhcnNl ZFVSTDo6dXNlcm5hbWUoKSBjb25zdAogewogICAgIHJldHVybiBzZWdtZW50KG1fc2VnbWVudHMu dXNlcm5hbWUpOwpAQCAtMTUyLDExICsxNjEsMzUgQEAgU3RyaW5nIFBhcnNlZFVSTDo6aG9zdCgp IGNvbnN0CiAgICAgcmV0dXJuIHNlZ21lbnQobV9zZWdtZW50cy5ob3N0KTsKIH0KIAorYm9vbCBQ YXJzZWRVUkw6Omhhc1BvcnQoKSBjb25zdAoreworICAgIHJldHVybiBtX3NlZ21lbnRzLnBvcnQu aXNOb25FbXB0eSgpOworfQorCiBTdHJpbmcgUGFyc2VkVVJMOjpwb3J0KCkgY29uc3QKIHsKICAg ICByZXR1cm4gc2VnbWVudChtX3NlZ21lbnRzLnBvcnQpOwogfQogCit2b2lkIFBhcnNlZFVSTDo6 cmVtb3ZlUG9ydCgpCit7CisgICAgaWYgKCFoYXNQb3J0KCkpCisgICAgICAgIHJldHVybjsKKwor ICAgIC8vIDEpIFJlbW92ZSB0aGUgcG9ydCBmcm9tIHRoZSBzcGVjLCBpbmNsdWRpbmcgdGhlIGRl bGltaXRlci4KKyAgICBTdHJpbmcgbmV3U3BlYzsKKyAgICBpbnQgYmVnaW5uaW5nID0gbV9zZWdt ZW50cy5wb3J0LmJlZ2luKCkgLSAxOworICAgIHVuc2lnbmVkIGxlbmd0aCA9IG1fc2VnbWVudHMu cG9ydC5sZW5ndGgoKSArIDE7CisKKyAgICBTdHJpbmcgbmV3U3BlY1N0cmluZyA9IG1fc3BlYy5z dHJpbmcoKTsKKyAgICBuZXdTcGVjU3RyaW5nLnJlbW92ZShiZWdpbm5pbmcsIGxlbmd0aCk7Cisg ICAgbV9zcGVjID0gVVJMU3RyaW5nKG5ld1NwZWNTdHJpbmcpOworCisgICAgLy8gMikgVXBkYXRl IHRoZSBjb21wb25lbnRzIHBvc2l0aW9ucy4KKyAgICBtX3NlZ21lbnRzLnBvcnQucmVzZXQoKTsK KyAgICBtX3NlZ21lbnRzLm1vdmVDb21wb25lbnRzQWZ0ZXIoVVJMU2VnbWVudHM6OlBvcnQsIC1s ZW5ndGgpOworfQorCiBTdHJpbmcgUGFyc2VkVVJMOjpwYXRoKCkgY29uc3QKIHsKICAgICByZXR1 cm4gc2VnbWVudChtX3NlZ21lbnRzLnBhdGgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYv dXJsL2FwaS9QYXJzZWRVUkwuaCBiL1NvdXJjZS9XVEYvd3RmL3VybC9hcGkvUGFyc2VkVVJMLmgK aW5kZXggNjQyZDQyNDZkN2RjMGM2YjI0M2Q3YzdmYmIzZjM1ZWQxYTFkOWY2Ni4uMzc3NjdkMzRl YTk2MTdjNjhlZTViMTJmZGQ5YzQyMzFkMjc5Y2FjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93 dGYvdXJsL2FwaS9QYXJzZWRVUkwuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi91cmwvYXBpL1BhcnNl ZFVSTC5oCkBAIC01NCwxMCArNTQsMTYgQEAgcHVibGljOgogCiAgICAgLy8gUmV0dXJuIGEgVVJM IGNvbXBvbmVudCBvciBhIG51bGwgU3RyaW5nIGlmIHRoZSBjb21wb25lbnQgaXMgdW5kZWZpbmVk IGZvciB0aGUgVVJMLgogICAgIFdURl9FWFBPUlRfUFJJVkFURSBTdHJpbmcgc2NoZW1lKCkgY29u c3Q7CisgICAgV1RGX0VYUE9SVF9QUklWQVRFIGJvb2wgaGFzU3RhbmRhcmRTY2hlbWUoKSBjb25z dDsKKwogICAgIFdURl9FWFBPUlRfUFJJVkFURSBTdHJpbmcgdXNlcm5hbWUoKSBjb25zdDsKICAg ICBXVEZfRVhQT1JUX1BSSVZBVEUgU3RyaW5nIHBhc3N3b3JkKCkgY29uc3Q7CiAgICAgV1RGX0VY UE9SVF9QUklWQVRFIFN0cmluZyBob3N0KCkgY29uc3Q7CisKKyAgICBXVEZfRVhQT1JUX1BSSVZB VEUgYm9vbCBoYXNQb3J0KCkgY29uc3Q7CiAgICAgV1RGX0VYUE9SVF9QUklWQVRFIFN0cmluZyBw b3J0KCkgY29uc3Q7CisgICAgV1RGX0VYUE9SVF9QUklWQVRFIHZvaWQgcmVtb3ZlUG9ydCgpOwor CiAgICAgV1RGX0VYUE9SVF9QUklWQVRFIFN0cmluZyBwYXRoKCkgY29uc3Q7CiAgICAgV1RGX0VY UE9SVF9QUklWQVRFIFN0cmluZyBxdWVyeSgpIGNvbnN0OwogCkBAIC02NSw2ICs3MSw3IEBAIHB1 YmxpYzoKICAgICBXVEZfRVhQT1JUX1BSSVZBVEUgU3RyaW5nIGZyYWdtZW50KCkgY29uc3Q7CiAg ICAgV1RGX0VYUE9SVF9QUklWQVRFIFBhcnNlZFVSTCB3aXRob3V0RnJhZ21lbnQoKSBjb25zdDsK IAorCiAgICAgV1RGX0VYUE9SVF9QUklWQVRFIFN0cmluZyBiYXNlQXNTdHJpbmcoKSBjb25zdDsK IAogICAgIGNvbnN0IFVSTFN0cmluZyYgc3BlYygpIGNvbnN0IHsgcmV0dXJuIG1fc3BlYzsgfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvdXJsL3NyYy9VUkxDb21wb25lbnQuaCBiL1NvdXJj ZS9XVEYvd3RmL3VybC9zcmMvVVJMQ29tcG9uZW50LmgKaW5kZXggMzA4Y2MwYjVlMDUxZjYyZTZk MzhkYzBhNmQ2ODQzZjZmNjk1MmIyMC4uYWYyMzExZGExYzMyNmJiMzE0NGQ0ZmNlNGMxOWRlOTJl ZWIwZjE0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvdXJsL3NyYy9VUkxDb21wb25lbnQu aAorKysgYi9Tb3VyY2UvV1RGL3d0Zi91cmwvc3JjL1VSTENvbXBvbmVudC5oCkBAIC02NSw2ICs2 NSw3IEBAIHB1YmxpYzoKIAogICAgIGludCBiZWdpbigpIGNvbnN0IHsgcmV0dXJuIG1fYmVnaW47 IH0KICAgICB2b2lkIHNldEJlZ2luKGludCBiZWdpbikgeyBtX2JlZ2luID0gYmVnaW47IH0KKyAg ICB2b2lkIG1vdmUoaW50IG9mZnNldCkgeyBtX2JlZ2luICs9IG9mZnNldDsgfQogCiAgICAgaW50 IGxlbmd0aCgpIGNvbnN0IHsgcmV0dXJuIG1fbGVuZ3RoOyB9CiAgICAgdm9pZCBzZXRMZW5ndGgo aW50IGxlbmd0aCkgeyBtX2xlbmd0aCA9IGxlbmd0aDsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dU Ri93dGYvdXJsL3NyYy9VUkxTZWdtZW50cy5jcHAgYi9Tb3VyY2UvV1RGL3d0Zi91cmwvc3JjL1VS TFNlZ21lbnRzLmNwcAppbmRleCA4ZDk3M2NjMmE1YmIwZjA5MmViYWRkNDI2ZDRmNmE5NzM4MWZk MTc0Li42ZjY5ZTlmZWMxMzI4MjdmNWNkY2FhMDZmOTVkYWUyYzlkMWM5YjVmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV1RGL3d0Zi91cmwvc3JjL1VSTFNlZ21lbnRzLmNwcAorKysgYi9Tb3VyY2UvV1RG L3d0Zi91cmwvc3JjL1VSTFNlZ21lbnRzLmNwcApAQCAtMTEwLDYgKzExMCwyOSBAQCBpbnQgVVJM U2VnbWVudHM6OmNoYXJhY3RlcnNCZWZvcmUoQ29tcG9uZW50VHlwZSB0eXBlLCBEZWxpbWl0ZXJJ bmNsdXNpb24gaW5jbHVkZQogICAgIHJldHVybiBjdXJyZW50OwogfQogCit2b2lkIFVSTFNlZ21l bnRzOjptb3ZlQ29tcG9uZW50c0FmdGVyKENvbXBvbmVudFR5cGUgdHlwZSwgaW50IG9mZnNldCkK K3sKKyAgICBzd2l0Y2ggKHR5cGUpIHsKKyAgICAvLyBGYWxsIHRocm91Z2guCisgICAgY2FzZSBT Y2hlbWU6CisgICAgICAgIHVzZXJuYW1lLm1vdmUob2Zmc2V0KTsKKyAgICBjYXNlIFVzZXJuYW1l OgorICAgICAgICBwYXNzd29yZC5tb3ZlKG9mZnNldCk7CisgICAgY2FzZSBQYXNzd29yZDoKKyAg ICAgICAgaG9zdC5tb3ZlKG9mZnNldCk7CisgICAgY2FzZSBIb3N0OgorICAgICAgICBwb3J0Lm1v dmUob2Zmc2V0KTsKKyAgICBjYXNlIFBvcnQ6CisgICAgICAgIHBhdGgubW92ZShvZmZzZXQpOwor ICAgIGNhc2UgUGF0aDoKKyAgICAgICAgcXVlcnkubW92ZShvZmZzZXQpOworICAgIGNhc2UgUXVl cnk6CisgICAgICAgIGZyYWdtZW50Lm1vdmUob2Zmc2V0KTsKKyAgICBjYXNlIEZyYWdtZW50Ogor ICAgICAgICBicmVhazsKKyAgICB9Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdURgogCiAjZW5kaWYg Ly8gVVNFKFdURlVSTCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL3VybC9zcmMvVVJMU2Vn bWVudHMuaCBiL1NvdXJjZS9XVEYvd3RmL3VybC9zcmMvVVJMU2VnbWVudHMuaAppbmRleCA5ZTVh ZTZiZDAwNjE4OTUxOTcxNzlmMzc4MDg0YzdlMzMzZTFiZDQ2Li4wNDg5NzEzODBhMjdiNzhjZWE3 ZDJiN2NmMzgzMWUyZjMzNTE5ZjU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi91cmwvc3Jj L1VSTFNlZ21lbnRzLmgKKysrIGIvU291cmNlL1dURi93dGYvdXJsL3NyYy9VUkxTZWdtZW50cy5o CkBAIC0xMjEsNiArMTIxLDkgQEAgcHVibGljOgogICAgIC8vCiAgICAgaW50IGNoYXJhY3RlcnNC ZWZvcmUoQ29tcG9uZW50VHlwZSwgRGVsaW1pdGVySW5jbHVzaW9uKSBjb25zdDsKIAorICAgIC8v IFNoaWZ0IGFsbCB0aGUgY29tcG9uZW50cyBhZnRlciBDb21wb25lbnRUeXBlIGJ5ICdvZmZzZXQn LgorICAgIHZvaWQgbW92ZUNvbXBvbmVudHNBZnRlcihDb21wb25lbnRUeXBlLCBpbnQgb2Zmc2V0 KTsKKwogICAgIC8vIEVhY2ggY29tcG9uZW50IGV4Y2x1ZGVzIHRoZSByZWxhdGVkIGRlbGltaXRl cnMgYW5kIGhhcyBhIGxlbmd0aCBvZiAtMQogICAgIC8vIGlmIHRoYXQgY29tcG9uZW50IGlzIGFi c2VudCBidXQgMCBpZiB0aGUgY29tcG9uZW50IGV4aXN0cyBidXQgaXMgZW1wdHkuCiAgICAgVVJM Q29tcG9uZW50IHNjaGVtZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL3VybC9zcmMvVVJM VXRpbC5jcHAgYi9Tb3VyY2UvV1RGL3d0Zi91cmwvc3JjL1VSTFV0aWwuY3BwCmluZGV4IGQwNTM1 MTM4ZDk0NzcxNWQzYWI3MjcwYTI5MDZiMmY5Y2VjMmNlMTEuLjRhNDI5YTFmYmRjMjEyZDQ1ZjFh MDBhNjQ2YmVhNTBhNmUyMTM3ODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL3VybC9zcmMv VVJMVXRpbC5jcHAKKysrIGIvU291cmNlL1dURi93dGYvdXJsL3NyYy9VUkxVdGlsLmNwcApAQCAt NTAsOSArNTAsOCBAQCBjb25zdCBjaGFyIGtNYWlsdG9TY2hlbWVbXSA9ICJtYWlsdG8iOwogCiBu YW1lc3BhY2UgewogCi0vLyBCYWNrZW5kIGZvciBMb3dlckNhc2VFcXVhbHNBU0NJSS4KIHRlbXBs YXRlPHR5cGVuYW1lIEl0ZXI+Ci1pbmxpbmUgYm9vbCBkb0xvd2VyQ2FzZUVxdWFsc0FTQ0lJKEl0 ZXIgYUJlZ2luLCBJdGVyIGFFbmQsIGNvbnN0IGNoYXIqIGIpCitzdGF0aWMgYm9vbCBsb3dlckNh c2VFcXVhbHNBU0NJSShJdGVyIGFCZWdpbiwgSXRlciBhRW5kLCBjb25zdCBjaGFyKiBiKQogewog ICAgIGZvciAoSXRlciBpdCA9IGFCZWdpbjsgaXQgIT0gYUVuZDsgKytpdCwgKytiKSB7CiAgICAg ICAgIGlmICghKmIgfHwgdG9BU0NJSUxvd2VyKCppdCkgIT0gKmIpCkBAIC04MCw3ICs3OSw3IEBA IGlubGluZSBib29sIGRvQ29tcGFyZVNjaGVtZUNvbXBvbmVudChjb25zdCBDaGFyYWN0ZXJUeXBl KiBzcGVjLCBjb25zdCBVUkxDb21wb25lCiB7CiAgICAgaWYgKCFjb21wb25lbnQuaXNOb25FbXB0 eSgpKQogICAgICAgICByZXR1cm4gIWNvbXBhcmVUb1swXTsgLy8gV2hlbiBjb21wb25lbnQgaXMg ZW1wdHksIG1hdGNoIGVtcHR5IHNjaGVtZS4KLSAgICByZXR1cm4gTG93ZXJDYXNlRXF1YWxzQVND SUkoJnNwZWNbY29tcG9uZW50LmJlZ2luKCldLCAmc3BlY1tjb21wb25lbnQuZW5kKCldLCBjb21w YXJlVG8pOworICAgIHJldHVybiBsb3dlckNhc2VFcXVhbHNBU0NJSSgmc3BlY1tjb21wb25lbnQu YmVnaW4oKV0sICZzcGVjW2NvbXBvbmVudC5lbmQoKV0sIGNvbXBhcmVUbyk7CiB9CiAKIC8vIFJl dHVybnMgdHJ1ZSBpZiB0aGUgZ2l2ZW4gc2NoZW1lIGlkZW50aWZpZWQgYnkgfHNjaGVtZXwgd2l0 aGluIHxzcGVjfCBpcyBvbmUKQEAgLTkyLDcgKzkxLDcgQEAgYm9vbCBkb0lzU3RhbmRhcmQoY29u c3QgQ2hhcmFjdGVyVHlwZSogc3BlYywgY29uc3QgVVJMQ29tcG9uZW50JiBzY2hlbWUpCiAgICAg ICAgIHJldHVybiBmYWxzZTsgLy8gRW1wdHkgb3IgaW52YWxpZCBzY2hlbWVzIGFyZSBub24tc3Rh bmRhcmQuCiAKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGtOdW1TdGFuZGFyZFVSTFNjaGVt ZXM7ICsraSkgewotICAgICAgICBpZiAoTG93ZXJDYXNlRXF1YWxzQVNDSUkoJnNwZWNbc2NoZW1l LmJlZ2luKCldLCAmc3BlY1tzY2hlbWUuZW5kKCldLCBrU3RhbmRhcmRVUkxTY2hlbWVzW2ldKSkK KyAgICAgICAgaWYgKGxvd2VyQ2FzZUVxdWFsc0FTQ0lJKCZzcGVjW3NjaGVtZS5iZWdpbigpXSwg JnNwZWNbc2NoZW1lLmVuZCgpXSwga1N0YW5kYXJkVVJMU2NoZW1lc1tpXSkpCiAgICAgICAgICAg ICByZXR1cm4gdHJ1ZTsKICAgICB9CiAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMzE5LDcgKzMxOCw3 IEBAIGJvb2wgZG9SZXBsYWNlQ29tcG9uZW50cyhjb25zdCBjaGFyKiBzcGVjLAogCiB9IC8vIG5h bWVzcGFjZQogCi1ib29sIGlzU3RhbmRhcmQoY29uc3QgY2hhciogc3BlYywgY29uc3QgVVJMQ29t cG9uZW50JiBzY2hlbWUpCitib29sIGlzU3RhbmRhcmQoY29uc3QgTENoYXIqIHNwZWMsIGNvbnN0 IFVSTENvbXBvbmVudCYgc2NoZW1lKQogewogICAgIHJldHVybiBkb0lzU3RhbmRhcmQoc3BlYywg c2NoZW1lKTsKIH0KQEAgLTM5NywyNiArMzk2LDYgQEAgYm9vbCBSZXBsYWNlQ29tcG9uZW50cyhj b25zdCBjaGFyKiBzcGVjLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNoYXJzZXRD b252ZXJ0ZXIsIG91dHB1dCwgKm91dHB1dFBhcnNlZCk7CiB9CiAKLS8vIEZyb250LWVuZHMgZm9y IExvd2VyQ2FzZUVxdWFsc0FTQ0lJLgotYm9vbCBMb3dlckNhc2VFcXVhbHNBU0NJSShjb25zdCBj aGFyKiBhQmVnaW4sIGNvbnN0IGNoYXIqIGFFbmQsIGNvbnN0IGNoYXIqIGIpCi17Ci0gICAgcmV0 dXJuIGRvTG93ZXJDYXNlRXF1YWxzQVNDSUkoYUJlZ2luLCBhRW5kLCBiKTsKLX0KLQotYm9vbCBM b3dlckNhc2VFcXVhbHNBU0NJSShjb25zdCBjaGFyKiBhQmVnaW4sIGNvbnN0IGNoYXIqIGFFbmQs IGNvbnN0IGNoYXIqIGJCZWdpbiwgY29uc3QgY2hhciogYkVuZCkKLXsKLSAgICB3aGlsZSAoYUJl Z2luICE9IGFFbmQgJiYgYkJlZ2luICE9IGJFbmQgJiYgdG9BU0NJSUxvd2VyKCphQmVnaW4pID09 ICpiQmVnaW4pIHsKLSAgICAgICAgYUJlZ2luKys7Ci0gICAgICAgIGJCZWdpbisrOwotICAgIH0K LSAgICByZXR1cm4gYUJlZ2luID09IGFFbmQgJiYgYkJlZ2luID09IGJFbmQ7Ci19Ci0KLWJvb2wg TG93ZXJDYXNlRXF1YWxzQVNDSUkoY29uc3QgVUNoYXIqIGFCZWdpbiwgY29uc3QgVUNoYXIqIGFF bmQsIGNvbnN0IGNoYXIqIGIpCi17Ci0gICAgcmV0dXJuIGRvTG93ZXJDYXNlRXF1YWxzQVNDSUko YUJlZ2luLCBhRW5kLCBiKTsKLX0KLQogdm9pZCBEZWNvZGVVUkxFc2NhcGVTZXF1ZW5jZXMoY29u c3QgY2hhciogaW5wdXQsIGludCBsZW5ndGgsIFVSTEJ1ZmZlcjxVQ2hhcj4mIG91dHB1dCkKIHsK ICAgICBSYXdVUkxCdWZmZXI8Y2hhcj4gdW5lc2NhcGVkQ2hhcnM7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV1RGL3d0Zi91cmwvc3JjL1VSTFV0aWwuaCBiL1NvdXJjZS9XVEYvd3RmL3VybC9zcmMvVVJM VXRpbC5oCmluZGV4IGE3MzkyNDE3NzE1ZGZkYTIxMzA5ZDNlNjAzYzdjN2QwN2I4MWQzZDAuLmU4 NWEzMzQ2MWViYzdlNzQzYWM1YWQ2ZDAzOWMyYWNhODc4NDIyZjcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XVEYvd3RmL3VybC9zcmMvVVJMVXRpbC5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL3VybC9zcmMv VVJMVXRpbC5oCkBAIC01Niw4ICs1Niw5IEBAIGJvb2wgRmluZEFuZENvbXBhcmVTY2hlbWUoY29u c3QgVUNoYXIqIHN0ciwgaW50IHN0ckxlbmd0aCwgY29uc3QgY2hhciogY29tcGFyZSwKIAogLy8g UmV0dXJucyB0cnVlIGlmIHRoZSBnaXZlbiBzdHJpbmcgcmVwcmVzZW50cyBhIHN0YW5kYXJkIFVS TC4gVGhpcyBtZWFucyB0aGF0CiAvLyBlaXRoZXIgdGhlIHNjaGVtZSBpcyBpbiB0aGUgbGlzdCBv ZiBrbm93biBzdGFuZGFyZCBzY2hlbWVzLgotYm9vbCBpc1N0YW5kYXJkKGNvbnN0IGNoYXIqIHNw ZWMsIGNvbnN0IFVSTENvbXBvbmVudCYgc2NoZW1lKTsKK2Jvb2wgaXNTdGFuZGFyZChjb25zdCBM Q2hhciogc3BlYywgY29uc3QgVVJMQ29tcG9uZW50JiBzY2hlbWUpOwogYm9vbCBpc1N0YW5kYXJk KGNvbnN0IFVDaGFyKiBzcGVjLCBjb25zdCBVUkxDb21wb25lbnQmIHNjaGVtZSk7CitpbmxpbmUg Ym9vbCBpc1N0YW5kYXJkKGNvbnN0IGNoYXIqIHNwZWMsIGNvbnN0IFVSTENvbXBvbmVudCYgc2No ZW1lKSB7IHJldHVybiBpc1N0YW5kYXJkKHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgTENoYXIqPihz cGVjKSwgc2NoZW1lKTsgfQogCiAvLyBVUkwgbGlicmFyeSB3cmFwcGVycyAtLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKQEAgLTEwOCwxOCAr MTA5LDYgQEAgYm9vbCBSZXBsYWNlQ29tcG9uZW50cyhjb25zdCBjaGFyKiBzcGVjLCBpbnQgc3Bl Y0xlbmd0aCwgY29uc3QgVVJMU2VnbWVudHMmIHBhcnMKICAgICAgICAgICAgICAgICAgICAgICAg VVJMUXVlcnlDaGFyc2V0Q29udmVydGVyKiwKICAgICAgICAgICAgICAgICAgICAgICAgVVJMQnVm ZmVyPGNoYXI+JiwgVVJMU2VnbWVudHMqIG91dHB1dFBhcnNlZCk7CiAKLS8vIFN0cmluZyBoZWxw ZXIgZnVuY3Rpb25zIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0KLQotLy8gQ29tcGFyZSB0aGUgbG93ZXItY2FzZSBmb3JtIG9mIHRoZSBnaXZlbiBz dHJpbmcgYWdhaW5zdCB0aGUgZ2l2ZW4gQVNDSUkKLS8vIHN0cmluZy4gVGhpcyBpcyB1c2VmdWwg Zm9yIGRvaW5nIGNoZWNraW5nIGlmIGFuIGlucHV0IHN0cmluZyBtYXRjaGVzIHNvbWUKLS8vIHRv a2VuLCBhbmQgaXQgaXMgb3B0aW1pemVkIHRvIGF2b2lkIGludGVybWVkaWF0ZSBzdHJpbmcgY29w aWVzLgotLy8KLS8vIFRoZSB2ZXJzaW9ucyBvZiB0aGlzIGZ1bmN0aW9uIHRoYXQgZG9uJ3QgdGFr ZSBhIGJFbmQgYXNzdW1lIHRoYXQgdGhlIGIKLS8vIHN0cmluZyBpcyB6ZXJvIHRlcm1pbmF0ZWQu Ci1ib29sIExvd2VyQ2FzZUVxdWFsc0FTQ0lJKGNvbnN0IGNoYXIqIGFCZWdpbiwgY29uc3QgY2hh ciogYUVuZCwgY29uc3QgY2hhciogYik7Ci1ib29sIExvd2VyQ2FzZUVxdWFsc0FTQ0lJKGNvbnN0 IGNoYXIqIGFCZWdpbiwgY29uc3QgY2hhciogYUVuZCwgY29uc3QgY2hhciogYkJlZ2luLCBjb25z dCBjaGFyKiBiRW5kKTsKLWJvb2wgTG93ZXJDYXNlRXF1YWxzQVNDSUkoY29uc3QgVUNoYXIqIGFC ZWdpbiwgY29uc3QgVUNoYXIqIGFFbmQsIGNvbnN0IGNoYXIqIGIpOwotCiAvLyBVbmVzY2FwZXMg dGhlIGdpdmVuIHN0cmluZyB1c2luZyBVUkwgZXNjYXBpbmcgcnVsZXMuCiB2b2lkIERlY29kZVVS TEVzY2FwZVNlcXVlbmNlcyhjb25zdCBjaGFyKiBpbnB1dCwgaW50IGxlbmd0aCwgVVJMQnVmZmVy PFVDaGFyPiYpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LVVJMV1RG VVJMLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tVUkxXVEZVUkwuY3BwCmluZGV4IDlh MzQ4NGQ0MTZlYWExMWM0MzI1YTJmZDMyMzYyYjlhYmFmNzc3MmYuLjRkMzA2ODBmZmJmY2UyYmYz YjQyOWE5MTdjODkyMWJlMTNiMTVkOTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL0tVUkxXVEZVUkwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tVUkxXVEZV UkwuY3BwCkBAIC0xNzUsNyArMTc1LDcgQEAgYm9vbCBLVVJMOjpoYXNQb3J0KCkgY29uc3QKICAg ICBpZiAoIWlzVmFsaWQoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgcmV0dXJuICFt X3VybEltcGwtPm1fcGFyc2VkVVJMLnBvcnQoKS5pc051bGwoKTsKKyAgICByZXR1cm4gbV91cmxJ bXBsLT5tX3BhcnNlZFVSTC5oYXNQb3J0KCk7CiB9CiAKIHVuc2lnbmVkIHNob3J0IEtVUkw6OnBv cnQoKSBjb25zdApAQCAtMzEzLDggKzMxMywxMSBAQCB2b2lkIEtVUkw6OnNldEhvc3QoY29uc3Qg U3RyaW5nJikKIAogdm9pZCBLVVJMOjpyZW1vdmVQb3J0KCkKIHsKKyAgICBpZiAoIWhhc1BvcnQo KSkKKyAgICAgICAgcmV0dXJuOworCiAgICAgZGV0YWNoKG1fdXJsSW1wbCk7Ci0gICAgLy8gRklY TUU6IEFkZCBXVEZVUkwgSW1wbGVtZW50YXRpb24uCisgICAgbV91cmxJbXBsLT5tX3BhcnNlZFVS TC5yZW1vdmVQb3J0KCk7CiB9CiAKIHZvaWQgS1VSTDo6c2V0UG9ydCh1bnNpZ25lZCBzaG9ydCkK QEAgLTQyMyw4ICs0MjYsOSBAQCB2b2lkIEtVUkw6OmludmFsaWRhdGUoKQogCiBib29sIEtVUkw6 OmlzSGllcmFyY2hpY2FsKCkgY29uc3QKIHsKLSAgICAvLyBGSVhNRTogQWRkIFdURlVSTCBJbXBs ZW1lbnRhdGlvbi4KLSAgICByZXR1cm4gZmFsc2U7CisgICAgaWYgKCFpc1ZhbGlkKCkpCisgICAg ICAgIHJldHVybiBmYWxzZTsKKyAgICByZXR1cm4gbV91cmxJbXBsLT5tX3BhcnNlZFVSTC5oYXNT dGFuZGFyZFNjaGVtZSgpOwogfQogCiBib29sIHByb3RvY29sSXMoY29uc3QgU3RyaW5nJiwgY29u c3QgY2hhciopCg==