177837 2017-10-03 14:08:42 -0700 Share code to normalize an HTTP method 2017-10-03 16:37:44 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Local Build All All RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=177833 InRadar P2 Normal --- 1 dbates dbates aestes webkit-bug-importer oldest_to_newest 1356031 0 dbates 2017-10-03 14:08:42 -0700 Similar to the issue in bug #177833, we currently duplicate code in XMLHttpRequest and FetchRequest to normalize the name of an HTTP method. We should add a common helper function and update both classes to make use of it. 1356037 1 322579 dbates 2017-10-03 14:12:40 -0700 Created attachment 322579 Patch I named the common function normalizeHTTPMethod instead of normalizeMethod as I was worried that the latter could be ambigious given that it is a globally scoped function. Let me know if it would be preferred to name the funciton normalizeMethod or if there is a better name for this function. 1356138 2 322579 dbates 2017-10-03 16:35:46 -0700 Comment on attachment 322579 Patch Clearing flags on attachment: 322579 Committed r222819: <http://trac.webkit.org/changeset/222819> 1356139 3 dbates 2017-10-03 16:35:47 -0700 All reviewed patches have been landed. Closing bug. 1356140 4 webkit-bug-importer 2017-10-03 16:37:44 -0700 <rdar://problem/34802449> 322579 2017-10-03 14:12:40 -0700 2017-10-03 16:35:46 -0700 Patch bug-177837-20171003141239.patch text/plain 6155 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjIyNzEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTc0ZWE5ZmE4YzJlZDll MjM5MDU4MmY0YmY3ZTRmMWExM2YzYmQxMS4uYWE0MjY2ZGNlMzhlMjgxY2FjZTc3ZTQzMjU2Y2Vl ZjY0NzkwMTZhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDE3LTEwLTAzICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAorICAgICAgICBTaGFyZSBjb2RlIHRvIG5v cm1hbGl6ZSBhbiBIVFRQIG1ldGhvZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTc3ODM3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQ3VycmVudGx5IHdlIGR1cGxpY2F0ZSBjb2RlIGluIFhNTEh0dHBSZXF1 ZXN0IGFuZCBGZXRjaFJlcXVlc3QgdG8gbm9ybWFsaXplIGFuIEhUVFAgbWV0aG9kLgorICAgICAg ICBXZSBzaG91bGQgYWRkIGEgY29tbW9uIGhlbHBlciBmdW5jdGlvbiBhbmQgdXBkYXRlIGJvdGgg Y2xhc3NlcyB0byBtYWtlIHVzZSBvZiBpdC4KKworICAgICAgICBObyBmdW5jdGlvbmFsaXR5IGNo YW5nZWQuIFNvLCBubyBuZXcgdGVzdHMuCisKKyAgICAgICAgKiBNb2R1bGVzL2ZldGNoL0ZldGNo UmVxdWVzdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzZXRNZXRob2QpOiBNb2RpZmllZCB0byB1 c2UgV2ViQ29yZTo6bm9ybWFsaXplSFRUUE1ldGhvZCgpLgorICAgICAgICAqIHBsYXRmb3JtL25l dHdvcmsvSFRUUFBhcnNlcnMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6bm9ybWFsaXplSFRUUE1l dGhvZCk6IE1vdmVkIGZyb20gWE1MSHR0cFJlcXVlc3QuY3BwLgorICAgICAgICAqIHBsYXRmb3Jt L25ldHdvcmsvSFRUUFBhcnNlcnMuaDoKKyAgICAgICAgKiB4bWwvWE1MSHR0cFJlcXVlc3QuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6WE1MSHR0cFJlcXVlc3Q6Om9wZW4pOiBNb2RpZmllZCB0byB1 c2UgV2ViQ29yZTo6bm9ybWFsaXplSFRUUE1ldGhvZCgpLgorICAgICAgICAoV2ViQ29yZTo6WE1M SHR0cFJlcXVlc3Q6OnVwcGVyY2FzZUtub3duSFRUUE1ldGhvZCk6IERlbGV0ZWQ7IG1vdmVkIHRv IEhUVFBQYXJzZXJzLmNwcC4KKyAgICAgICAgKiB4bWwvWE1MSHR0cFJlcXVlc3QuaDoKKworMjAx Ny0xMC0wMyAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CisKICAgICAgICAgU2hh cmUgY29kZSB0byBkZXRlcm1pbmUgYSBmb3JiaWRkZW4gbWV0aG9kCiAgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzc4MzMKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9mZXRjaC9GZXRjaFJlcXVlc3QuY3BwIGIvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9mZXRjaC9GZXRjaFJlcXVlc3QuY3BwCmluZGV4IDQwODRiMWY4MTYxZDgxNzBh ZThhMTkwNjQ5MThiYzk5M2Y3MGQ1M2QuLjBlODc0MmE3YzZmYmRhNjQxN2ZlOWI1NTZmYWMxYTA0 MTk2ZWYxMGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZmV0Y2gvRmV0Y2hS ZXF1ZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2ZldGNoL0ZldGNoUmVxdWVz dC5jcHAKQEAgLTQxLDggKzQxLDcgQEAgc3RhdGljIHN0ZDo6b3B0aW9uYWw8RXhjZXB0aW9uPiBz ZXRNZXRob2QoUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBTdHJpbmcKICAgICAgICAg cmV0dXJuIEV4Y2VwdGlvbiB7IFR5cGVFcnJvciwgQVNDSUlMaXRlcmFsKCJNZXRob2QgaXMgbm90 IGEgdmFsaWQgSFRUUCB0b2tlbi4iKSB9OwogICAgIGlmIChpc0ZvcmJpZGRlbk1ldGhvZChpbml0 TWV0aG9kKSkKICAgICAgICAgcmV0dXJuIEV4Y2VwdGlvbiB7IFR5cGVFcnJvciwgQVNDSUlMaXRl cmFsKCJNZXRob2QgaXMgZm9yYmlkZGVuLiIpIH07Ci0gICAgU3RyaW5nIG1ldGhvZCA9IGluaXRN ZXRob2QuY29udmVydFRvQVNDSUlVcHBlcmNhc2UoKTsKLSAgICByZXF1ZXN0LnNldEhUVFBNZXRo b2QoKG1ldGhvZCA9PSAiREVMRVRFIiB8fCBtZXRob2QgPT0gIkdFVCIgfHwgbWV0aG9kID09ICJI RUFEIiB8fCBtZXRob2QgPT0gIk9QVElPTlMiIHx8IG1ldGhvZCA9PSAiUE9TVCIgfHwgbWV0aG9k ID09ICJQVVQiKSA/IG1ldGhvZCA6IGluaXRNZXRob2QpOworICAgIHJlcXVlc3Quc2V0SFRUUE1l dGhvZChub3JtYWxpemVIVFRQTWV0aG9kKGluaXRNZXRob2QpKTsKICAgICByZXR1cm4gc3RkOjpu dWxsb3B0OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L0hUVFBQYXJzZXJzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvSFRUUFBh cnNlcnMuY3BwCmluZGV4IDQ4YWNjM2NhMGNmMjUyNzQ0ZjM0MWJjZTBhM2JiYzhlMDI0ODRlNGUu LmVhZWQyOWJkMjQwNjE3NDUxMzc4MjgyM2I1YThlYzg3MzA4MTljNDcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvSFRUUFBhcnNlcnMuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvSFRUUFBhcnNlcnMuY3BwCkBAIC04ODEsNCArODgx LDE5IEBAIGJvb2wgaXNDcm9zc09yaWdpblNhZmVSZXF1ZXN0SGVhZGVyKEhUVFBIZWFkZXJOYW1l IG5hbWUsIGNvbnN0IFN0cmluZyYgdmFsdWUpCiAgICAgfQogfQogCisvLyBJbXBsZW1lbnRzIDxo dHRwczovL2ZldGNoLnNwZWMud2hhdHdnLm9yZy8jY29uY2VwdC1tZXRob2Qtbm9ybWFsaXplPi4K K1N0cmluZyBub3JtYWxpemVIVFRQTWV0aG9kKGNvbnN0IFN0cmluZyYgbWV0aG9kKQoreworICAg IGNvbnN0IGNoYXIqIGNvbnN0IG1ldGhvZHNbXSA9IHsgIkRFTEVURSIsICJHRVQiLCAiSEVBRCIs ICJPUFRJT05TIiwgIlBPU1QiLCAiUFVUIiB9OworICAgIGZvciAoYXV0byogdmFsdWUgOiBtZXRo b2RzKSB7CisgICAgICAgIGlmIChlcXVhbElnbm9yaW5nQVNDSUlDYXNlKG1ldGhvZCwgdmFsdWUp KSB7CisgICAgICAgICAgICAvLyBEb24ndCBib3RoZXIgYWxsb2NhdGluZyBhIG5ldyBzdHJpbmcg aWYgaXQncyBhbHJlYWR5IGFsbCB1cHBlcmNhc2UuCisgICAgICAgICAgICBpZiAobWV0aG9kID09 IHZhbHVlKQorICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgcmV0dXJuIEFTQ0lJ TGl0ZXJhbCB7IHZhbHVlIH07CisgICAgICAgIH0KKyAgICB9CisgICAgcmV0dXJuIG1ldGhvZDsK K30KKwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9IVFRQ UGFyc2Vycy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9IVFRQUGFyc2Vycy5o CmluZGV4IDQ5ODFkODA5ODJmY2U2YjM4MmI4M2JlNGViZmQyZDg5YjBjNTJmOTMuLjgwZTYwM2Zi ZmNhZmQ1NzA5YTRlYTZmNzc5NzNjNjhiYWQzNWVlYmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvSFRUUFBhcnNlcnMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL0hUVFBQYXJzZXJzLmgKQEAgLTEwMSw2ICsxMDEsOCBAQCBib29sIGlz Q3Jvc3NPcmlnaW5TYWZlSGVhZGVyKEhUVFBIZWFkZXJOYW1lLCBjb25zdCBIVFRQSGVhZGVyU2V0 Jik7CiBib29sIGlzQ3Jvc3NPcmlnaW5TYWZlSGVhZGVyKGNvbnN0IFN0cmluZyYsIGNvbnN0IEhU VFBIZWFkZXJTZXQmKTsKIGJvb2wgaXNDcm9zc09yaWdpblNhZmVSZXF1ZXN0SGVhZGVyKEhUVFBI ZWFkZXJOYW1lLCBjb25zdCBTdHJpbmcmKTsKIAorU3RyaW5nIG5vcm1hbGl6ZUhUVFBNZXRob2Qo Y29uc3QgU3RyaW5nJik7CisKIGlubGluZSBib29sIGlzSFRUUFNwYWNlKFVDaGFyIGNoYXJhY3Rl cikKIHsKICAgICByZXR1cm4gY2hhcmFjdGVyIDw9ICcgJyAmJiAoY2hhcmFjdGVyID09ICcgJyB8 fCBjaGFyYWN0ZXIgPT0gJ1xuJyB8fCBjaGFyYWN0ZXIgPT0gJ1x0JyB8fCBjaGFyYWN0ZXIgPT0g J1xyJyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3QuY3Bw IGIvU291cmNlL1dlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0LmNwcAppbmRleCBlOTkwMmRiYTE3 YWY4MTdhMzU3Y2JkOTNlMzRkYTZhNWRjZmRjODg4Li42NjFhODc1YjA4Mjg3OTgxZTdlNWE5MWUw OWViYWI1YTBlYTczMTcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJl cXVlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdC5jcHAKQEAg LTMyNywyMCArMzI3LDYgQEAgRXhjZXB0aW9uT3I8dm9pZD4gWE1MSHR0cFJlcXVlc3Q6OnNldFdp dGhDcmVkZW50aWFscyhib29sIHZhbHVlKQogICAgIHJldHVybiB7IH07CiB9CiAKLVN0cmluZyBY TUxIdHRwUmVxdWVzdDo6dXBwZXJjYXNlS25vd25IVFRQTWV0aG9kKGNvbnN0IFN0cmluZyYgbWV0 aG9kKQotewotICAgIGNvbnN0IGNoYXIqIGNvbnN0IG1ldGhvZHNbXSA9IHsgIkRFTEVURSIsICJH RVQiLCAiSEVBRCIsICJPUFRJT05TIiwgIlBPU1QiLCAiUFVUIiB9OwotICAgIGZvciAoYXV0byog dmFsdWUgOiBtZXRob2RzKSB7Ci0gICAgICAgIGlmIChlcXVhbElnbm9yaW5nQVNDSUlDYXNlKG1l dGhvZCwgdmFsdWUpKSB7Ci0gICAgICAgICAgICAvLyBEb24ndCBib3RoZXIgYWxsb2NhdGluZyBh IG5ldyBzdHJpbmcgaWYgaXQncyBhbHJlYWR5IGFsbCB1cHBlcmNhc2UuCi0gICAgICAgICAgICBp ZiAobWV0aG9kID09IHZhbHVlKQotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAg cmV0dXJuIEFTQ0lJTGl0ZXJhbCh2YWx1ZSk7Ci0gICAgICAgIH0KLSAgICB9Ci0gICAgcmV0dXJu IG1ldGhvZDsKLX0KLQogRXhjZXB0aW9uT3I8dm9pZD4gWE1MSHR0cFJlcXVlc3Q6Om9wZW4oY29u c3QgU3RyaW5nJiBtZXRob2QsIGNvbnN0IFN0cmluZyYgdXJsKQogewogICAgIC8vIElmIHRoZSBh c3luYyBhcmd1bWVudCBpcyBvbWl0dGVkLCBzZXQgYXN5bmMgdG8gdHJ1ZS4KQEAgLTM4OCw3ICsz NzQsNyBAQCBFeGNlcHRpb25Pcjx2b2lkPiBYTUxIdHRwUmVxdWVzdDo6b3Blbihjb25zdCBTdHJp bmcmIG1ldGhvZCwgY29uc3QgVVJMJiB1cmwsIGJvbwogICAgICAgICB9CiAgICAgfQogCi0gICAg bV9tZXRob2QgPSB1cHBlcmNhc2VLbm93bkhUVFBNZXRob2QobWV0aG9kKTsKKyAgICBtX21ldGhv ZCA9IG5vcm1hbGl6ZUhUVFBNZXRob2QobWV0aG9kKTsKIAogICAgIG1fdXJsID0gdXJsOwogICAg IHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKS0+Y29udGVudFNlY3VyaXR5UG9saWN5KCktPnVwZ3Jh ZGVJbnNlY3VyZVJlcXVlc3RJZk5lZWRlZChtX3VybCwgQ29udGVudFNlY3VyaXR5UG9saWN5OjpJ bnNlY3VyZVJlcXVlc3RUeXBlOjpMb2FkKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3ht bC9YTUxIdHRwUmVxdWVzdC5oIGIvU291cmNlL1dlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0LmgK aW5kZXggZGJkYzAzZGRmNDE0Y2VmNzM3ZjNhODRjMjZkYWUwODQ1ZjAyZWYzNy4uMzU0NTQ4YmQw YWIwMGI2MzkwYWI5ZjQxODc2ODViOTYwZGQ3ZDQyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUveG1sL1hNTEh0dHBSZXF1ZXN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUveG1sL1hNTEh0dHBS ZXF1ZXN0LmgKQEAgLTEwMyw5ICsxMDMsNiBAQCBwdWJsaWM6CiAgICAgYm9vbCByZXNwb25zZUNh Y2hlSXNWYWxpZCgpIGNvbnN0IHsgcmV0dXJuIG1fcmVzcG9uc2VDYWNoZUlzVmFsaWQ7IH0KICAg ICB2b2lkIGRpZENhY2hlUmVzcG9uc2UoKTsKIAotICAgIC8vIEV4cG9zZSBIVFRQIHZhbGlkYXRp b24gbWV0aG9kcyBmb3Igb3RoZXIgdW50cnVzdGVkIHJlcXVlc3RzLgotICAgIHN0YXRpYyBTdHJp bmcgdXBwZXJjYXNlS25vd25IVFRQTWV0aG9kKGNvbnN0IFN0cmluZyYpOwotCiAgICAgZW51bSBj bGFzcyBSZXNwb25zZVR5cGUgeyBFbXB0eVN0cmluZywgQXJyYXlidWZmZXIsIEJsb2IsIERvY3Vt ZW50LCBKc29uLCBUZXh0IH07CiAgICAgRXhjZXB0aW9uT3I8dm9pZD4gc2V0UmVzcG9uc2VUeXBl KFJlc3BvbnNlVHlwZSk7CiAgICAgUmVzcG9uc2VUeXBlIHJlc3BvbnNlVHlwZSgpIGNvbnN0Owo=