99898 2012-10-19 18:26:46 -0700 WTFURL: Implement KURL::setPort() 2012-10-23 14:11:28 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin abarth oldest_to_newest 746825 0 benjamin 2012-10-19 18:26:46 -0700 Make an efficient implementation of KURL::setPort(). 746848 1 169746 benjamin 2012-10-19 19:19:17 -0700 Created attachment 169746 Patch 746915 2 169746 abarth 2012-10-19 23:26:56 -0700 Comment on attachment 169746 Patch This feels a bit oddly specific to port. Maybe you plan to generalize it to replacing arbitrary components in future patches? 746932 3 benjamin 2012-10-20 00:21:26 -0700 (In reply to comment #2) > (From update of attachment 169746 [details]) > This feels a bit oddly specific to port. Maybe you plan to generalize it to replacing arbitrary components in future patches? Yep, that's the idea. :) First encode the input for any component, and pass it to a generalized version of this code. I started with port since the input is dead simple. 748976 4 benjamin 2012-10-23 14:11:28 -0700 Committed r132261: <http://trac.webkit.org/changeset/132261> 169746 2012-10-19 19:19:17 -0700 2012-10-19 23:26:56 -0700 Patch bug-99898-20121019191800.patch text/plain 6993 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwNzAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGE0YzExOWUwZDNkNDRiNDlmZmFhNWYx YzE4ZjQzODcyMzQ1NTIxOGYuLmQ0MTNmODA4ODU0NTVmNzdiMWYwMmI0OTY5N2MzYzE3OTdiNTFl NDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTItMTAtMTkgIEJlbmphbWluIFBvdWxhaW4gIDxi ZW5qYW1pbkB3ZWJraXQub3JnPgorCisgICAgICAgIFdURlVSTDogSW1wbGVtZW50IEtVUkw6OnNl dFBvcnQoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 OTk4OTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBB ZGQgYW4gZWZmaWNpZW50IGltcGxlbWVudGF0aW9uIGZvciByZW1wbGFjaW5nIHRoZSBwb3J0IGNv bXBvbmVudAorICAgICAgICBpbiBhbiBVUkwuIFRoaXMgd2lsbCBiZSB0aGUgYmFzZSBmb3IgcmVw bGFjaW5nIG90aGVyIGNvbXBvbmVudHMKKyAgICAgICAgZWZmaWNpZW50bHkuCisKKyAgICAgICAg VGhlIHRlc3RpbmcgaXMgY292ZXJlZCBieSBmYXN0L2RvbS9IVE1MQW5jaG9yRWxlbWVudC9zZXQt aHJlZi1hdHRyaWJ1dGUtcG9ydC5odG1sCisKKyAgICAgICAgKiB3dGYvdXJsL2FwaS9QYXJzZWRV UkwuY3BwOgorICAgICAgICAoV1RGOjpnZW5lcmF0ZU5ld1NwZWNXaXRoUG9ydCk6CisgICAgICAg IChXVEY6OnJlcGxhY2VQb3J0V2l0aFN0cmluZyk6CisgICAgICAgIChXVEY6OlBhcnNlZFVSTDo6 cmVwbGFjZVBvcnQpOgorICAgICAgICAqIHd0Zi91cmwvYXBpL1BhcnNlZFVSTC5oOgorICAgICAg ICAoUGFyc2VkVVJMKToKKwogMjAxMi0xMC0wOCAgQmVuamFtaW4gUG91bGFpbiAgPGJlbmphbWlu QHdlYmtpdC5vcmc+CiAKICAgICAgICAgR2VuZXJhbGl6ZSBtb3ZpbmcgVVJMQ29tcG9uZW50J3Mg YmVnaW4gcG9zaXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlNDM1MmExNmJhMDM2ZTlkMzBmOTA1N2M1OTI0 MjFkZTQwMThhYjA3Li5iNWY1ZWFkYWU4NjdhNDFlZjNlYjhmNTExYzVkNzRjYjdlOGI5MTI3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTItMTAtMTkgIEJlbmphbWluIFBvdWxhaW4g IDxiZW5qYW1pbkB3ZWJraXQub3JnPgorCisgICAgICAgIFdURlVSTDogSW1wbGVtZW50IEtVUkw6 OnNldFBvcnQoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTk4OTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIHBsYXRmb3JtL0tVUkxXVEZVUkwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6S1VSTDo6c2V0 UG9ydCk6CisKIDIwMTItMTAtMDggIE5hdGUgQ2hhcGluICA8amFwaGV0QGNocm9taXVtLm9yZz4K IAogICAgICAgICBQb3N0LXIxMzAyMjYgQ2xlYW51cDogQ29tbWVudCBhIGNvbXBsaWNhdGVkIGlm IHN0YXRlbWVudCBhbmQgbWFrZSBpdCBhIGhlbHBlci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYv d3RmL3VybC9hcGkvUGFyc2VkVVJMLmNwcCBiL1NvdXJjZS9XVEYvd3RmL3VybC9hcGkvUGFyc2Vk VVJMLmNwcAppbmRleCBhMjBiZTM5ZjE0ZmEzNGZjN2I1MTdhYTIwZWJjMGVlMTg2ZTlkN2ZjLi5j NGE1NjY5OWI0MzA2YzEwZmJjNmZlMTg5ZjQ2ZmQ2YzBiZTQ5MjVjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV1RGL3d0Zi91cmwvYXBpL1BhcnNlZFVSTC5jcHAKKysrIGIvU291cmNlL1dURi93dGYvdXJs L2FwaS9QYXJzZWRVUkwuY3BwCkBAIC0zNCw2ICszNCw3IEBACiAjaW5jbHVkZSA8d3RmL1VSTENv bXBvbmVudC5oPgogI2luY2x1ZGUgPHd0Zi9VUkxVdGlsLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQv Q1N0cmluZy5oPgorI2luY2x1ZGUgPHd0Zi90ZXh0L1N0cmluZ0ltcGwuaD4KIAogbmFtZXNwYWNl IFdURiB7CiAKQEAgLTE3MSw2ICsxNzIsODQgQEAgU3RyaW5nIFBhcnNlZFVSTDo6cG9ydCgpIGNv bnN0CiAgICAgcmV0dXJuIHNlZ21lbnQobV9zZWdtZW50cy5wb3J0KTsKIH0KIAordGVtcGxhdGU8 dHlwZW5hbWUgQ2hhcmFjdGVyVHlwZT4KK3N0YXRpYyBpbmxpbmUgU3RyaW5nIGdlbmVyYXRlTmV3 U3BlY1dpdGhQb3J0KGNvbnN0IFN0cmluZyYgc3BlYywgdW5zaWduZWQgbmV3U3BlY0xlbmd0aCwg dW5zaWduZWQgcG9ydERlbGltaXRlclBvc2l0aW9uLCBjb25zdCBMQ2hhciogcG9ydFN0cmluZywg dW5zaWduZWQgcG9ydFN0cmluZ0xlbmd0aCwgdW5zaWduZWQgcG9zdFBvcnRQb3NpdGlvbkluU291 cmNlKQoreworICAgIEFTU0VSVChuZXdTcGVjTGVuZ3RoID09IHBvcnREZWxpbWl0ZXJQb3NpdGlv biArIDEgKyBwb3J0U3RyaW5nTGVuZ3RoICsgKHNwZWMubGVuZ3RoKCkgLSBwb3N0UG9ydFBvc2l0 aW9uSW5Tb3VyY2UpKTsKKworICAgIENoYXJhY3RlclR5cGUqIGJ1ZmZlcjsKKyAgICBTdHJpbmcg bmV3U3BlYyA9IFN0cmluZ0ltcGw6OmNyZWF0ZVVuaW5pdGlhbGl6ZWQobmV3U3BlY0xlbmd0aCwg YnVmZmVyKTsKKworICAgIC8vIENvcHkgZXZlcnl0aGluZyBwcmlvciB0byB0aGUgcG9ydCBwb3Np c2l0b24uCisgICAgQVNTRVJUKGJ1ZmZlciArIHBvcnREZWxpbWl0ZXJQb3NpdGlvbiA8IGJ1ZmZl ciArIG5ld1NwZWNMZW5ndGgpOworICAgIFN0cmluZ0ltcGw6OmNvcHlDaGFycyhidWZmZXIsIHNw ZWMuZ2V0Q2hhcmFjdGVyczxDaGFyYWN0ZXJUeXBlPigpLCBwb3J0RGVsaW1pdGVyUG9zaXRpb24p OworCisgICAgLy8gQWRkIHRoZSBuZXcgcG9ydCBmcm9tIHRoZSBwb3NpdGlvbi4KKyAgICBidWZm ZXJbcG9ydERlbGltaXRlclBvc2l0aW9uXSA9ICc6JzsKKyAgICB1bnNpZ25lZCBwb3J0UG9zaXRp b24gPSBwb3J0RGVsaW1pdGVyUG9zaXRpb24gKyAxOworICAgIEFTU0VSVChidWZmZXIgKyBwb3J0 UG9zaXRpb24gKyBwb3J0U3RyaW5nTGVuZ3RoIDw9IGJ1ZmZlciArIG5ld1NwZWNMZW5ndGgpOwor ICAgIFN0cmluZ0ltcGw6OmNvcHlDaGFycyhidWZmZXIgKyBwb3J0UG9zaXRpb24sIHBvcnRTdHJp bmcsIHBvcnRTdHJpbmdMZW5ndGgpOworCisgICAgLy8gQ29weSB0aGUgY2hhcmFjdGVyIHBvc3Qt cG9ydCBmcm9tIHRoZSBzb3VyY2UuCisgICAgdW5zaWduZWQgcmVtYWluaW5nQ29tcG9uZW50c1Bv c2l0aW9uSW5EZXN0aW5hdGlvbiA9IHBvcnRQb3NpdGlvbiArIHBvcnRTdHJpbmdMZW5ndGg7Cisg ICAgQVNTRVJUKGJ1ZmZlciArIHJlbWFpbmluZ0NvbXBvbmVudHNQb3NpdGlvbkluRGVzdGluYXRp b24gKyAoc3BlYy5sZW5ndGgoKSAtIHBvc3RQb3J0UG9zaXRpb25JblNvdXJjZSkgPT0gYnVmZmVy ICsgbmV3U3BlY0xlbmd0aCk7CisgICAgU3RyaW5nSW1wbDo6Y29weUNoYXJzKGJ1ZmZlciArIHJl bWFpbmluZ0NvbXBvbmVudHNQb3NpdGlvbkluRGVzdGluYXRpb24sICYoc3BlYy5nZXRDaGFyYWN0 ZXJzPENoYXJhY3RlclR5cGU+KClbcG9zdFBvcnRQb3NpdGlvbkluU291cmNlXSksIHNwZWMubGVu Z3RoKCkgLSBwb3N0UG9ydFBvc2l0aW9uSW5Tb3VyY2UpOworCisgICAgcmV0dXJuIG5ld1NwZWM7 Cit9CisKK3N0YXRpYyBpbmxpbmUgdm9pZCByZXBsYWNlUG9ydFdpdGhTdHJpbmcoU3RyaW5nJiBz cGVjLCBVUkxTZWdtZW50cyYgc2VnbWVudHMsIGNvbnN0IExDaGFyKiBwb3J0U3RyaW5nLCB1bnNp Z25lZCBwb3J0U3RyaW5nTGVuZ3RoKQoreworICAgIC8vIENvbXB1dGUgdGhlIG5ldyBzcGVjIGxl bmd0aC4KKyAgICBpbnQgbGVuZ3RoRGlmZmVyZW5jZTsKKyAgICBjb25zdCBVUkxDb21wb25lbnQg b2xkUG9ydENvbXBvbmVudCA9IHNlZ21lbnRzLnBvcnQ7CisgICAgaWYgKG9sZFBvcnRDb21wb25l bnQuaXNWYWxpZCgpKQorICAgICAgICBsZW5ndGhEaWZmZXJlbmNlID0gcG9ydFN0cmluZ0xlbmd0 aCAtIG9sZFBvcnRDb21wb25lbnQubGVuZ3RoKCk7CisgICAgZWxzZQorICAgICAgICBsZW5ndGhE aWZmZXJlbmNlID0gMSArIHBvcnRTdHJpbmdMZW5ndGg7CisgICAgdW5zaWduZWQgbmV3TGVuZ3Ro ID0gc3BlYy5sZW5ndGgoKSArIGxlbmd0aERpZmZlcmVuY2U7CisKKyAgICAvLyBGaW5kIHRoZSBz dWJzdHJpbmcgcG9zaXRpb25zIGZvciB0aGUgZ2VuZXJhdG9yIHRlbXBsYXRlLgorICAgIGludCBw b3J0RGVsaW1pdGVyUG9zaXRpb24gPSBzZWdtZW50cy5jaGFyYWN0ZXJzQmVmb3JlKFVSTFNlZ21l bnRzOjpQb3J0LCBVUkxTZWdtZW50czo6RGVsaW1pdGVySW5jbHVkZWQpOworICAgIEFTU0VSVChw b3J0RGVsaW1pdGVyUG9zaXRpb24gPiAwKTsKKworICAgIHVuc2lnbmVkIHBvc3RQb3J0UG9zaXRp b25JblNvdXJjZTsKKyAgICBpZiAob2xkUG9ydENvbXBvbmVudC5pc1ZhbGlkKCkpCisgICAgICAg IHBvc3RQb3J0UG9zaXRpb25JblNvdXJjZSA9IG9sZFBvcnRDb21wb25lbnQuZW5kKCk7CisgICAg ZWxzZQorICAgICAgICBwb3N0UG9ydFBvc2l0aW9uSW5Tb3VyY2UgPSBwb3J0RGVsaW1pdGVyUG9z aXRpb247CisKKyAgICAvLyBDcmVhdGUgdGhlIG5ldyBzcGVjIHdpdGggcG9ydFN0cmluZy4KKyAg ICBpZiAoc3BlYy5pczhCaXQoKSkKKyAgICAgICAgc3BlYyA9IGdlbmVyYXRlTmV3U3BlY1dpdGhQ b3J0PExDaGFyPihzcGVjLCBuZXdMZW5ndGgsIHN0YXRpY19jYXN0PHVuc2lnbmVkPihwb3J0RGVs aW1pdGVyUG9zaXRpb24pLCBwb3J0U3RyaW5nLCBwb3J0U3RyaW5nTGVuZ3RoLCBwb3N0UG9ydFBv c2l0aW9uSW5Tb3VyY2UpOworICAgIGVsc2UKKyAgICAgICAgc3BlYyA9IGdlbmVyYXRlTmV3U3Bl Y1dpdGhQb3J0PFVDaGFyPihzcGVjLCBuZXdMZW5ndGgsIHN0YXRpY19jYXN0PHVuc2lnbmVkPihw b3J0RGVsaW1pdGVyUG9zaXRpb24pLCBwb3J0U3RyaW5nLCBwb3J0U3RyaW5nTGVuZ3RoLCBwb3N0 UG9ydFBvc2l0aW9uSW5Tb3VyY2UpOworCisgICAgLy8gVXBkYXRlIHRoZSBVUkwgY29tcG9uZW50 cy4KKyAgICB1bnNpZ25lZCBwb3J0UG9zaXRpb24gPSBwb3J0RGVsaW1pdGVyUG9zaXRpb24gKyAx OworICAgIHNlZ21lbnRzLnBvcnQuc2V0QmVnaW4ocG9ydFBvc2l0aW9uKTsKKyAgICBzZWdtZW50 cy5wb3J0LnNldExlbmd0aChwb3J0U3RyaW5nTGVuZ3RoKTsKKyAgICBzZWdtZW50cy5tb3ZlRnJv bUNvbXBvbmVudEJ5KFVSTFNlZ21lbnRzOjpQYXRoLCBsZW5ndGhEaWZmZXJlbmNlKTsKK30KKwor Cit2b2lkIFBhcnNlZFVSTDo6cmVwbGFjZVBvcnQodW5zaWduZWQgc2hvcnQgbmV3UG9ydCkKK3sK KyAgICBBU1NFUlQoaGFzU3RhbmRhcmRTY2hlbWUoKSk7CisKKyAgICAvLyBHZW5lcmF0ZSBhIGNo YXIqIHN0cmluZyBmb3IgdGhlIHBvcnQgbnVtYmVyLgorICAgIExDaGFyIGJ1Zls1XTsKKyAgICBM Q2hhciogZW5kID0gYnVmICsgV1RGX0FSUkFZX0xFTkdUSChidWYpOworICAgIExDaGFyKiBwID0g ZW5kOworICAgIGRvIHsKKyAgICAgICAgKi0tcCA9IHN0YXRpY19jYXN0PExDaGFyPigobmV3UG9y dCAlIDEwKSArICcwJyk7CisgICAgICAgIG5ld1BvcnQgLz0gMTA7CisgICAgfSB3aGlsZSAobmV3 UG9ydCk7CisgICAgY29uc3QgdW5zaWduZWQgcG9ydFN0cmluZ0xlbmd0aCA9IGVuZCAtIHA7CisK KyAgICByZXBsYWNlUG9ydFdpdGhTdHJpbmcobV9zcGVjLm1fc3RyaW5nLCBtX3NlZ21lbnRzLCBw LCBwb3J0U3RyaW5nTGVuZ3RoKTsKK30KKwogdm9pZCBQYXJzZWRVUkw6OnJlbW92ZVBvcnQoKQog ewogICAgIGlmICghaGFzUG9ydCgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvdXJsL2Fw aS9QYXJzZWRVUkwuaCBiL1NvdXJjZS9XVEYvd3RmL3VybC9hcGkvUGFyc2VkVVJMLmgKaW5kZXgg Mzc3NjdkMzRlYTk2MTdjNjhlZTViMTJmZGQ5YzQyMzFkMjc5Y2FjMC4uYzJjYmI5Y2QyN2RlNDBk NDBjZWJmYzA2OTE3ZDI2OTFjY2RiZjEyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvdXJs L2FwaS9QYXJzZWRVUkwuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi91cmwvYXBpL1BhcnNlZFVSTC5o CkBAIC02Miw2ICs2Miw3IEBAIHB1YmxpYzoKIAogICAgIFdURl9FWFBPUlRfUFJJVkFURSBib29s IGhhc1BvcnQoKSBjb25zdDsKICAgICBXVEZfRVhQT1JUX1BSSVZBVEUgU3RyaW5nIHBvcnQoKSBj b25zdDsKKyAgICBXVEZfRVhQT1JUX1BSSVZBVEUgdm9pZCByZXBsYWNlUG9ydCh1bnNpZ25lZCBz aG9ydCBuZXdQb3J0KTsKICAgICBXVEZfRVhQT1JUX1BSSVZBVEUgdm9pZCByZW1vdmVQb3J0KCk7 CiAKICAgICBXVEZfRVhQT1JUX1BSSVZBVEUgU3RyaW5nIHBhdGgoKSBjb25zdDsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tVUkxXVEZVUkwuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vS1VSTFdURlVSTC5jcHAKaW5kZXggNGQzMDY4MGZmYmZjZTJiZjNiNDI5YTkx N2M4OTIxYmUxM2IxNWQ5OC4uODE2NWE4ZjE3ZDUzMDQ1MDhlYTdlMDAwNmE1MjAzMWQ2YzlmOWMz MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS1VSTFdURlVSTC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS1VSTFdURlVSTC5jcHAKQEAgLTMyMCwxMCArMzIw LDEwIEBAIHZvaWQgS1VSTDo6cmVtb3ZlUG9ydCgpCiAgICAgbV91cmxJbXBsLT5tX3BhcnNlZFVS TC5yZW1vdmVQb3J0KCk7CiB9CiAKLXZvaWQgS1VSTDo6c2V0UG9ydCh1bnNpZ25lZCBzaG9ydCkK K3ZvaWQgS1VSTDo6c2V0UG9ydCh1bnNpZ25lZCBzaG9ydCBuZXdQb3J0KQogewogICAgIGRldGFj aChtX3VybEltcGwpOwotICAgIC8vIEZJWE1FOiBBZGQgV1RGVVJMIEltcGxlbWVudGF0aW9uLgor ICAgIG1fdXJsSW1wbC0+bV9wYXJzZWRVUkwucmVwbGFjZVBvcnQobmV3UG9ydCk7CiB9CiAKIHZv aWQgS1VSTDo6c2V0SG9zdEFuZFBvcnQoY29uc3QgU3RyaW5nJikK