133815 2014-06-12 12:47:17 -0700 Move header value merging to HTTPHeaderMap 2014-06-13 00:23:54 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca ossy oldest_to_newest 1015192 0 andersca 2014-06-12 12:47:17 -0700 Move header value merging to HTTPHeaderMap 1015193 1 232975 andersca 2014-06-12 12:48:14 -0700 Created attachment 232975 Patch 1015195 2 232975 kling 2014-06-12 12:49:52 -0700 Comment on attachment 232975 Patch r=me 1015196 3 andersca 2014-06-12 12:51:27 -0700 Committed r169906: <http://trac.webkit.org/changeset/169906> 1015199 4 ossy 2014-06-12 12:57:53 -0700 (In reply to comment #3) > Committed r169906: <http://trac.webkit.org/changeset/169906> FYI: It broke the GTK build: http://build.webkit.org/builders/GTK%20Linux%2064-bit%20Release%20%28Build%29/builds/48245 1015345 5 ossy 2014-06-13 00:23:54 -0700 Thanks for the fix: https://trac.webkit.org/changeset/169908 232975 2014-06-12 12:48:14 -0700 2014-06-12 12:49:52 -0700 Patch bug-133815-20140612124750.patch text/plain 6439 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTY5OTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2Q1ZTM5NDgxYzQ3NTk5 NThlMzYwYTBlYmYyODNhZjhiZGRkNTY0My4uMWU2MzU5Njg0MTEwM2QxNjcyNzI3OWQ3YTJjZTdk MmY1MzIyYzdjYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDE0LTA2LTEyICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgTW92ZSBoZWFkZXIg dmFsdWUgbWVyZ2luZyB0byBIVFRQSGVhZGVyTWFwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzM4MTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvSFRUUEhlYWRlck1hcC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpIVFRQSGVhZGVyTWFwOjpzZXQpOgorICAgICAgICAoV2Vi Q29yZTo6SFRUUEhlYWRlck1hcDo6YWRkKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL0hU VFBIZWFkZXJNYXAuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVxdWVz dEJhc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0QmFzZTo6YWRkSFRU UEhlYWRlckZpZWxkKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVzcG9u c2VCYXNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2VCYXNlOjphZGRI VFRQSGVhZGVyRmllbGQpOgorICAgICAgICAqIHhtbC9YTUxIdHRwUmVxdWVzdC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpYTUxIdHRwUmVxdWVzdDo6c2V0UmVxdWVzdEhlYWRlckludGVybmFsKToK KworMjAxNC0wNi0xMiAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAg ICAgICAgIEFkZCBTaGFwZVZhbHVlLmNwcCBhbmQgbW92ZSBTaGFwZVZhbHVlOjppc0ltYWdlVmFs aWQoKSB0aGVyZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTMzODA5CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv SFRUUEhlYWRlck1hcC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0hUVFBI ZWFkZXJNYXAuY3BwCmluZGV4IDc3MzIyNjEzY2E3NDViOTRlNTkyNjEzYzI4MTZkZTVlNTA3NTE0 NzYuLmQ1NGNmNjE4YzkxZTlmMmMxYmNjNjFjNjRkNzQzNzM3OGVhMGExYzkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvSFRUUEhlYWRlck1hcC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9IVFRQSGVhZGVyTWFwLmNwcApAQCAtNjcs MTQgKzY3LDE2IEBAIFN0cmluZyBIVFRQSGVhZGVyTWFwOjpnZXQoY29uc3QgQXRvbWljU3RyaW5n JiBuYW1lKSBjb25zdAogICAgIHJldHVybiBtX2hlYWRlcnMuZ2V0KG5hbWUpOwogfQogCi1IVFRQ SGVhZGVyTWFwOjpBZGRSZXN1bHQgSFRUUEhlYWRlck1hcDo6c2V0KGNvbnN0IEF0b21pY1N0cmlu ZyYgbmFtZSwgY29uc3QgU3RyaW5nJiB2YWx1ZSkKK3ZvaWQgSFRUUEhlYWRlck1hcDo6c2V0KGNv bnN0IEF0b21pY1N0cmluZyYgbmFtZSwgY29uc3QgU3RyaW5nJiB2YWx1ZSkKIHsKLSAgICByZXR1 cm4gbV9oZWFkZXJzLnNldChuYW1lLCB2YWx1ZSk7CisgICAgbV9oZWFkZXJzLnNldChuYW1lLCB2 YWx1ZSk7CiB9CiAKLUhUVFBIZWFkZXJNYXA6OkFkZFJlc3VsdCBIVFRQSGVhZGVyTWFwOjphZGQo Y29uc3QgQXRvbWljU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcmIHZhbHVlKQordm9pZCBIVFRQ SGVhZGVyTWFwOjphZGQoY29uc3QgQXRvbWljU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcmIHZh bHVlKQogewotICAgIHJldHVybiBtX2hlYWRlcnMuYWRkKG5hbWUsIHZhbHVlKTsKKyAgICBhdXRv IHJlc3VsdCA9IG1faGVhZGVycy5hZGQobmFtZSwgdmFsdWUpOworICAgIGlmICghcmVzdWx0Lmlz TmV3RW50cnkpCisgICAgICAgIHJlc3VsdC5pdGVyYXRvci0+dmFsdWUgPSByZXN1bHQuaXRlcmF0 b3ItPnZhbHVlICsgJywnICsgdmFsdWU7CiB9CiAKIC8vIEFkYXB0ZXIgdGhhdCBhbGxvd3MgdGhl IEhhc2hNYXAgdG8gdGFrZSBDIHN0cmluZ3MgYXMga2V5cy4KQEAgLTExMywxMSArMTE1LDYgQEAg SFRUUEhlYWRlck1hcDo6Y29uc3RfaXRlcmF0b3IgSFRUUEhlYWRlck1hcDo6ZmluZChjb25zdCBj aGFyKiBuYW1lKSBjb25zdAogICAgIHJldHVybiBtX2hlYWRlcnMuZmluZDxDYXNlRm9sZGluZ0NT dHJpbmdUcmFuc2xhdG9yPihuYW1lKTsKIH0KIAotSFRUUEhlYWRlck1hcDo6QWRkUmVzdWx0IEhU VFBIZWFkZXJNYXA6OmFkZChjb25zdCBjaGFyKiBuYW1lLCBjb25zdCBTdHJpbmcmIHZhbHVlKQot ewotICAgIHJldHVybiBtX2hlYWRlcnMuYWRkPENhc2VGb2xkaW5nQ1N0cmluZ1RyYW5zbGF0b3I+ KG5hbWUsIHZhbHVlKTsKLX0KLQogYm9vbCBIVFRQSGVhZGVyTWFwOjpyZW1vdmUoY29uc3QgY2hh ciogbmFtZSkKIHsKICAgICByZXR1cm4gbV9oZWFkZXJzLnJlbW92ZShtX2hlYWRlcnMuZmluZDxD YXNlRm9sZGluZ0NTdHJpbmdUcmFuc2xhdG9yPihuYW1lKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0hUVFBIZWFkZXJNYXAuaCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL25ldHdvcmsvSFRUUEhlYWRlck1hcC5oCmluZGV4IDNjZTI3MjU4MzQ2YzViZThk NzcxYmJjYjlkOWZlMjRmMDRkMTRhZmYuLmNhYWQ3ODUzZTRiMzFjM2RkMzczZjM3OTAxZjY4MmZh YTVkZjUzODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvSFRU UEhlYWRlck1hcC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvSFRUUEhl YWRlck1hcC5oCkBAIC00NCw3ICs0NCw2IEBAIGNsYXNzIEhUVFBIZWFkZXJNYXAgewogICAgIHR5 cGVkZWYgSGFzaE1hcDxBdG9taWNTdHJpbmcsIFN0cmluZywgQ2FzZUZvbGRpbmdIYXNoPiBIYXNo TWFwVHlwZTsKIHB1YmxpYzoKICAgICB0eXBlZGVmIEhhc2hNYXBUeXBlOjpjb25zdF9pdGVyYXRv ciBjb25zdF9pdGVyYXRvcjsKLSAgICB0eXBlZGVmIEhhc2hNYXBUeXBlOjpBZGRSZXN1bHQgQWRk UmVzdWx0OwogCiAgICAgSFRUUEhlYWRlck1hcCgpOwogICAgIH5IVFRQSGVhZGVyTWFwKCk7CkBA IC02MCwxNCArNTksMTMgQEAgcHVibGljOgogCiAgICAgU3RyaW5nIGdldChjb25zdCBBdG9taWNT dHJpbmcmIG5hbWUpIGNvbnN0OwogCi0gICAgQWRkUmVzdWx0IHNldChjb25zdCBBdG9taWNTdHJp bmcmIG5hbWUsIGNvbnN0IFN0cmluZyYgdmFsdWUpOwotICAgIEFkZFJlc3VsdCBhZGQoY29uc3Qg QXRvbWljU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcmIHZhbHVlKTsKKyAgICB2b2lkIHNldChj b25zdCBBdG9taWNTdHJpbmcmIG5hbWUsIGNvbnN0IFN0cmluZyYgdmFsdWUpOworICAgIHZvaWQg YWRkKGNvbnN0IEF0b21pY1N0cmluZyYgbmFtZSwgY29uc3QgU3RyaW5nJiB2YWx1ZSk7CiAKICAg ICAvLyBBbHRlcm5hdGUgYWNjZXNzb3JzIHRoYXQgYXJlIGZhc3RlciB0aGFuIGNvbnZlcnRpbmcg dGhlIGNoYXIqIHRvIEF0b21pY1N0cmluZyBmaXJzdC4KICAgICBib29sIGNvbnRhaW5zKGNvbnN0 IGNoYXIqKSBjb25zdDsKICAgICBTdHJpbmcgZ2V0KGNvbnN0IGNoYXIqKSBjb25zdDsKICAgICBj b25zdF9pdGVyYXRvciBmaW5kKGNvbnN0IGNoYXIqKSBjb25zdDsKLSAgICBBZGRSZXN1bHQgYWRk KGNvbnN0IGNoYXIqIG5hbWUsIGNvbnN0IFN0cmluZyYgdmFsdWUpOwogICAgIGJvb2wgcmVtb3Zl KGNvbnN0IGNoYXIqKTsKIAogICAgIGNvbnN0X2l0ZXJhdG9yIGJlZ2luKCkgY29uc3QgeyByZXR1 cm4gbV9oZWFkZXJzLmJlZ2luKCk7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvUmVzb3VyY2VSZXF1ZXN0QmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVxdWVzdEJhc2UuY3BwCmluZGV4IDY3Y2UzNjgwNDlkMjMy MjhkNTQxMTAwYTZmM2NmMGVmYjNlYzFjOWMuLmZjYWQyYzcyZDk2ZmQzYzFjMWU3YzU2MWVlN2Rm OWEyMzExYzJjODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv UmVzb3VyY2VSZXF1ZXN0QmFzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9SZXNvdXJjZVJlcXVlc3RCYXNlLmNwcApAQCAtNDUwLDkgKzQ1MCw4IEBAIHZvaWQgUmVz b3VyY2VSZXF1ZXN0QmFzZTo6c2V0UHJpb3JpdHkoUmVzb3VyY2VMb2FkUHJpb3JpdHkgcHJpb3Jp dHkpCiB2b2lkIFJlc291cmNlUmVxdWVzdEJhc2U6OmFkZEhUVFBIZWFkZXJGaWVsZChjb25zdCBB dG9taWNTdHJpbmcmIG5hbWUsIGNvbnN0IFN0cmluZyYgdmFsdWUpIAogewogICAgIHVwZGF0ZVJl c291cmNlUmVxdWVzdCgpOwotICAgIEhUVFBIZWFkZXJNYXA6OkFkZFJlc3VsdCByZXN1bHQgPSBt X2h0dHBIZWFkZXJGaWVsZHMuYWRkKG5hbWUsIHZhbHVlKTsKLSAgICBpZiAoIXJlc3VsdC5pc05l d0VudHJ5KQotICAgICAgICByZXN1bHQuaXRlcmF0b3ItPnZhbHVlID0gcmVzdWx0Lml0ZXJhdG9y LT52YWx1ZSArICcsJyArIHZhbHVlOworCisgICAgbV9odHRwSGVhZGVyRmllbGRzLmFkZChuYW1l LCB2YWx1ZSk7CiAKICAgICBpZiAodXJsKCkucHJvdG9jb2xJc0luSFRUUEZhbWlseSgpKQogICAg ICAgICBtX3BsYXRmb3JtUmVxdWVzdFVwZGF0ZWQgPSBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VSZXNwb25zZUJhc2UuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlc3BvbnNlQmFzZS5jcHAKaW5k ZXggY2I5YWYyNGUyMjJlNmZjYTYxODVkNGQ2YTlhZmQ0ZjlmM2NhZThlYS4uMDAxYTgwMmI1NzBk Zjc1YTZlY2ZjMTk3MzQ2ZTE0ZDgzYzIwYzBkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlc3BvbnNlQmFzZS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlc3BvbnNlQmFzZS5jcHAKQEAgLTMyMyw5 ICszMjMsNyBAQCB2b2lkIFJlc291cmNlUmVzcG9uc2VCYXNlOjphZGRIVFRQSGVhZGVyRmllbGQo Y29uc3QgQXRvbWljU3RyaW5nJiBuYW1lLCBjb25zdCBTdAogCiAgICAgdXBkYXRlSGVhZGVyUGFy c2VkU3RhdGUobmFtZSk7CiAKLSAgICBIVFRQSGVhZGVyTWFwOjpBZGRSZXN1bHQgcmVzdWx0ID0g bV9odHRwSGVhZGVyRmllbGRzLmFkZChuYW1lLCB2YWx1ZSk7Ci0gICAgaWYgKCFyZXN1bHQuaXNO ZXdFbnRyeSkKLSAgICAgICAgcmVzdWx0Lml0ZXJhdG9yLT52YWx1ZSA9IHJlc3VsdC5pdGVyYXRv ci0+dmFsdWUgKyAiLCAiICsgdmFsdWU7CisgICAgbV9odHRwSGVhZGVyRmllbGRzLmFkZChuYW1l LCB2YWx1ZSk7CiB9CiAKIGNvbnN0IEhUVFBIZWFkZXJNYXAmIFJlc291cmNlUmVzcG9uc2VCYXNl OjpodHRwSGVhZGVyRmllbGRzKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3ht bC9YTUxIdHRwUmVxdWVzdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3Qu Y3BwCmluZGV4IDQzOTJhYzY0ZWZmY2Q1NThjYTIwZTIzNzM0NmZmNWVjMjA3ODA0MTAuLjYxMmQ1 M2NlMDFjODliYmQwMzliYTkyMjUxODY2MDZiNDdkMDJjNDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUveG1sL1hN TEh0dHBSZXF1ZXN0LmNwcApAQCAtOTQ3LDkgKzk0Nyw3IEBAIHZvaWQgWE1MSHR0cFJlcXVlc3Q6 OnNldFJlcXVlc3RIZWFkZXIoY29uc3QgQXRvbWljU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcm IHZhCiAKIHZvaWQgWE1MSHR0cFJlcXVlc3Q6OnNldFJlcXVlc3RIZWFkZXJJbnRlcm5hbChjb25z dCBBdG9taWNTdHJpbmcmIG5hbWUsIGNvbnN0IFN0cmluZyYgdmFsdWUpCiB7Ci0gICAgSFRUUEhl YWRlck1hcDo6QWRkUmVzdWx0IHJlc3VsdCA9IG1fcmVxdWVzdEhlYWRlcnMuYWRkKG5hbWUsIHZh bHVlKTsKLSAgICBpZiAoIXJlc3VsdC5pc05ld0VudHJ5KQotICAgICAgICByZXN1bHQuaXRlcmF0 b3ItPnZhbHVlID0gcmVzdWx0Lml0ZXJhdG9yLT52YWx1ZSArICIsICIgKyB2YWx1ZTsKKyAgICBt X3JlcXVlc3RIZWFkZXJzLmFkZChuYW1lLCB2YWx1ZSk7CiB9CiAKIFN0cmluZyBYTUxIdHRwUmVx dWVzdDo6Z2V0UmVxdWVzdEhlYWRlcihjb25zdCBBdG9taWNTdHJpbmcmIG5hbWUpIGNvbnN0Cg==