105373 2012-12-18 17:43:46 -0800 Set the original resource's response even on a 304 2012-12-19 16:28:40 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simonjam simonjam japhet oldest_to_newest 794217 0 simonjam 2012-12-18 17:43:46 -0800 Set the request's response even on a 304 794227 1 180068 simonjam 2012-12-18 17:56:05 -0800 Created attachment 180068 Patch 795024 2 simonjam 2012-12-19 16:28:40 -0800 Committed r138202: <http://trac.webkit.org/changeset/138202> 180068 2012-12-18 17:56:05 -0800 2012-12-19 11:49:21 -0800 Patch bug-105373-20121218175322.patch text/plain 7467 simonjam U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3OTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzliMDE4YmE5N2RkYjUx N2QxY2ExNTU2MmI5NGM0M2JjYzFiM2RkNi4uYzY2ZjI0MmM3MWFjNTdiODdiNTc2NGVhMWJmNjNj NWFjYTU5MWE0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEyLTEyLTE4ICBKYW1l cyBTaW1vbnNlbiAgPHNpbW9uamFtQGNocm9taXVtLm9yZz4KKworICAgICAgICBTZXQgdGhlIG9y aWdpbmFsIHJlc291cmNlJ3MgcmVzcG9uc2UgZXZlbiBvbiBhIDMwNAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA1MzczCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGV4aXN0aW5nIHNldFJlc3BvbnNl IHdhcyByZW5hbWVkIHRvIHJlc3BvbnNlUmVjZWl2ZWQgdG8gYmV0dGVyIHJlZmxlY3Qgd2hhdCBp dCBkb2VzLiBBIG5ldworICAgICAgICBzZXRSZXNwb25zZSB3YXMgYWRkZWQgdGhhdCBvbmx5IHNl dHMgdGhlIHJlc3BvbnNlLiBUaGlzIGlzIHVzZWQgaW4gdGhlIDMwNCBjYXNlLgorCisgICAgICAg IE5vIG5ldyB0ZXN0cy4gQSBuZXcgUmVzb3VyY2UgVGltaW5nIHRlc3Qgd2lsbCBkZXBlbmQgb24g dGhpcyBzb29uLgorCisgICAgICAgICogbG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlN1YnJlc291cmNlTG9hZGVyOjpkaWRSZWNlaXZlUmVzcG9uc2UpOgor ICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRJbWFnZS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpDYWNoZWRJbWFnZTo6cmVzcG9uc2VSZWNlaXZlZCk6CisgICAgICAgICogbG9hZGVyL2NhY2hl L0NhY2hlZEltYWdlLmg6CisgICAgICAgIChDYWNoZWRJbWFnZSk6CisgICAgICAgICogbG9hZGVy L2NhY2hlL0NhY2hlZFJhd1Jlc291cmNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJh d1Jlc291cmNlOjpyZXNwb25zZVJlY2VpdmVkKToKKyAgICAgICAgKiBsb2FkZXIvY2FjaGUvQ2Fj aGVkUmF3UmVzb3VyY2UuaDoKKyAgICAgICAgKENhY2hlZFJhd1Jlc291cmNlKToKKyAgICAgICAg KiBsb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2Fj aGVkUmVzb3VyY2U6OnJlc3BvbnNlUmVjZWl2ZWQpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9D YWNoZWRSZXNvdXJjZS5oOgorICAgICAgICAoQ2FjaGVkUmVzb3VyY2UpOgorICAgICAgICAoV2Vi Q29yZTo6Q2FjaGVkUmVzb3VyY2U6OnNldFJlc3BvbnNlKToKKwogMjAxMi0xMi0xNyAgU2ltb24g RnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBEb24ndCBhbGxvdyBl ZGdlIFRpbGVDYWNoZSB0aWxlcyB0byBiZSBsYXJnZXIgdGhhbiBuZWNlc3NhcnkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvU3VicmVzb3VyY2VMb2FkZXIuY3BwCmluZGV4IDA4OTNhZTdlNzc0OTVl YmJhMzlkZDIyYWRlYzdhY2JiNmM1Y2FiYzYuLjE0ZGEyY2ExMTNiNmRmZTM0YmI2OGQ4MzU2YWI5 M2UxZGE1NmM2MDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJj ZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291cmNlTG9hZGVy LmNwcApAQCAtMTcxLDYgKzE3MSw3IEBAIHZvaWQgU3VicmVzb3VyY2VMb2FkZXI6OmRpZFJlY2Vp dmVSZXNwb25zZShjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSkKICAgICAgICAgaWYg KHJlc3BvbnNlLmh0dHBTdGF0dXNDb2RlKCkgPT0gMzA0KSB7CiAgICAgICAgICAgICAvLyAzMDQg Tm90IG1vZGlmaWVkIC8gVXNlIGxvY2FsIGNvcHkKICAgICAgICAgICAgIC8vIEV4aXN0aW5nIHJl c291cmNlIGlzIG9rLCBqdXN0IHVzZSBpdCB1cGRhdGluZyB0aGUgZXhwaXJhdGlvbiB0aW1lLgor ICAgICAgICAgICAgbV9yZXNvdXJjZS0+c2V0UmVzcG9uc2UocmVzcG9uc2UpOwogICAgICAgICAg ICAgbWVtb3J5Q2FjaGUoKS0+cmV2YWxpZGF0aW9uU3VjY2VlZGVkKG1fcmVzb3VyY2UsIHJlc3Bv bnNlKTsKICAgICAgICAgICAgIGlmICghcmVhY2hlZFRlcm1pbmFsU3RhdGUoKSkKICAgICAgICAg ICAgICAgICBSZXNvdXJjZUxvYWRlcjo6ZGlkUmVjZWl2ZVJlc3BvbnNlKHJlc3BvbnNlKTsKQEAg LTE4MCw3ICsxODEsNyBAQCB2b2lkIFN1YnJlc291cmNlTG9hZGVyOjpkaWRSZWNlaXZlUmVzcG9u c2UoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UpCiAgICAgICAgIG1lbW9yeUNhY2hl KCktPnJldmFsaWRhdGlvbkZhaWxlZChtX3Jlc291cmNlKTsKICAgICB9CiAKLSAgICBtX3Jlc291 cmNlLT5zZXRSZXNwb25zZShyZXNwb25zZSk7CisgICAgbV9yZXNvdXJjZS0+cmVzcG9uc2VSZWNl aXZlZChyZXNwb25zZSk7CiAgICAgaWYgKHJlYWNoZWRUZXJtaW5hbFN0YXRlKCkpCiAgICAgICAg IHJldHVybjsKICAgICBSZXNvdXJjZUxvYWRlcjo6ZGlkUmVjZWl2ZVJlc3BvbnNlKHJlc3BvbnNl KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRJbWFnZS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkSW1hZ2UuY3BwCmluZGV4IDMz ZDY5Nzk3ZWExN2E4NjFhOTlmMjEyM2M1MmUwYWUxMGU3MjY1ZTguLjA0OTFjZGMyZjY1ZGQ5MTVl ODQwNWUwZWE4NWZlOGYzZTkxNWVjMDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9jYWNoZS9DYWNoZWRJbWFnZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hl L0NhY2hlZEltYWdlLmNwcApAQCAtMzg5LDExICszODksMTEgQEAgdm9pZCBDYWNoZWRJbWFnZTo6 ZXJyb3IoQ2FjaGVkUmVzb3VyY2U6OlN0YXR1cyBzdGF0dXMpCiAgICAgbm90aWZ5T2JzZXJ2ZXJz KCk7CiB9CiAKLXZvaWQgQ2FjaGVkSW1hZ2U6OnNldFJlc3BvbnNlKGNvbnN0IFJlc291cmNlUmVz cG9uc2UmIHJlc3BvbnNlKQordm9pZCBDYWNoZWRJbWFnZTo6cmVzcG9uc2VSZWNlaXZlZChjb25z dCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSkKIHsKICAgICBpZiAoIW1fcmVzcG9uc2UuaXNO dWxsKCkpCiAgICAgICAgIGNsZWFyKCk7Ci0gICAgQ2FjaGVkUmVzb3VyY2U6OnNldFJlc3BvbnNl KHJlc3BvbnNlKTsKKyAgICBDYWNoZWRSZXNvdXJjZTo6cmVzcG9uc2VSZWNlaXZlZChyZXNwb25z ZSk7CiB9CiAKIHZvaWQgQ2FjaGVkSW1hZ2U6OmRlc3Ryb3lEZWNvZGVkRGF0YSgpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkSW1hZ2UuaCBiL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRJbWFnZS5oCmluZGV4IDc3YWZjMTNlNjdkMjRmNzQx MDIwZjM3MGQyZjkyZTc5NGFmZDg3NDQuLjkzZDg5YjhkOGNiMDM0ODEzZWQxN2Q4ZWQ5ZTdjMWEy NWQ5MTE1NmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRJ bWFnZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRJbWFnZS5oCkBA IC03Niw3ICs3Niw3IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgdm9pZCBkYXRhKFBhc3NSZWZQ dHI8UmVzb3VyY2VCdWZmZXI+IGRhdGEsIGJvb2wgYWxsRGF0YVJlY2VpdmVkKTsKICAgICB2aXJ0 dWFsIHZvaWQgZXJyb3IoQ2FjaGVkUmVzb3VyY2U6OlN0YXR1cyk7Ci0gICAgdmlydHVhbCB2b2lk IHNldFJlc3BvbnNlKGNvbnN0IFJlc291cmNlUmVzcG9uc2UmKTsKKyAgICB2aXJ0dWFsIHZvaWQg cmVzcG9uc2VSZWNlaXZlZChjb25zdCBSZXNvdXJjZVJlc3BvbnNlJik7CiAgICAgCiAgICAgLy8g Rm9yIGNvbXBhdGliaWxpdHksIGltYWdlcyBrZWVwIGxvYWRpbmcgZXZlbiBpZiB0aGVyZSBhcmUg SFRUUCBlcnJvcnMuCiAgICAgdmlydHVhbCBib29sIHNob3VsZElnbm9yZUhUVFBTdGF0dXNDb2Rl RXJyb3JzKCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJhd1Jlc291cmNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9jYWNoZS9DYWNoZWRSYXdSZXNvdXJjZS5jcHAKaW5kZXggYTNhNDQ1ZmUxOTI4NWUzN2Fi M2Q2ZjMyZTY4ZjBkZjk5ODI4ODU4OS4uYjA5MTA4YjJhYjgzNjc5YzUxNmQ0YWYyMGE2NTBhOWU2 MDVhMjEyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJh d1Jlc291cmNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmF3 UmVzb3VyY2UuY3BwCkBAIC0xMDcsMTEgKzEwNywxMSBAQCB2b2lkIENhY2hlZFJhd1Jlc291cmNl Ojp3aWxsU2VuZFJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBSZXNvdXJj ZQogICAgIENhY2hlZFJlc291cmNlOjp3aWxsU2VuZFJlcXVlc3QocmVxdWVzdCwgcmVzcG9uc2Up OwogfQogCi12b2lkIENhY2hlZFJhd1Jlc291cmNlOjpzZXRSZXNwb25zZShjb25zdCBSZXNvdXJj ZVJlc3BvbnNlJiByZXNwb25zZSkKK3ZvaWQgQ2FjaGVkUmF3UmVzb3VyY2U6OnJlc3BvbnNlUmVj ZWl2ZWQoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UpCiB7CiAgICAgaWYgKCFtX2lk ZW50aWZpZXIpCiAgICAgICAgIG1faWRlbnRpZmllciA9IG1fbG9hZGVyLT5pZGVudGlmaWVyKCk7 Ci0gICAgQ2FjaGVkUmVzb3VyY2U6OnNldFJlc3BvbnNlKHJlc3BvbnNlKTsKKyAgICBDYWNoZWRS ZXNvdXJjZTo6cmVzcG9uc2VSZWNlaXZlZChyZXNwb25zZSk7CiAgICAgQ2FjaGVkUmVzb3VyY2VD bGllbnRXYWxrZXI8Q2FjaGVkUmF3UmVzb3VyY2VDbGllbnQ+IHcobV9jbGllbnRzKTsKICAgICB3 aGlsZSAoQ2FjaGVkUmF3UmVzb3VyY2VDbGllbnQqIGMgPSB3Lm5leHQoKSkKICAgICAgICAgYy0+ cmVzcG9uc2VSZWNlaXZlZCh0aGlzLCBtX3Jlc3BvbnNlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSYXdSZXNvdXJjZS5oIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL2NhY2hlL0NhY2hlZFJhd1Jlc291cmNlLmgKaW5kZXggMzU4ZjUwNDBiNDFlZmMxMmEy MmM1YTVlMDM1YTM0OTE2ZDA2MWUwZi4uMWZjMDQyZmNkMWJlM2IyNGZmMmMzMTA2Mjc1NGMwN2Ji OTIwY2IwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJh d1Jlc291cmNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJhd1Jl c291cmNlLmgKQEAgLTYwLDcgKzYwLDcgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgYWxs Q2xpZW50c1JlbW92ZWQoKTsKIAogICAgIHZpcnR1YWwgdm9pZCB3aWxsU2VuZFJlcXVlc3QoUmVz b3VyY2VSZXF1ZXN0JiwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYpOwotICAgIHZpcnR1YWwgdm9p ZCBzZXRSZXNwb25zZShjb25zdCBSZXNvdXJjZVJlc3BvbnNlJik7CisgICAgdmlydHVhbCB2b2lk IHJlc3BvbnNlUmVjZWl2ZWQoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYpOwogICAgIHZpcnR1YWwg dm9pZCBkaWRTZW5kRGF0YSh1bnNpZ25lZCBsb25nIGxvbmcgYnl0ZXNTZW50LCB1bnNpZ25lZCBs b25nIGxvbmcgdG90YWxCeXRlc1RvQmVTZW50KTsKICNpZiBQTEFURk9STShDSFJPTUlVTSkKICAg ICB2aXJ0dWFsIHZvaWQgZGlkRG93bmxvYWREYXRhKGludCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuY3BwIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlLmNwcAppbmRleCA1MjgyMGEyMGUzYmMzZjYwYmZj ZjdlOTY2YjRmZmRjZDlkZjVkNWI1Li5jZTkwMjhiM2JlNzY0YjQzODljZWI5OWFkNGNlNmU3YjA2 Njc4OThmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVz b3VyY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJj ZS5jcHAKQEAgLTQwOCw5ICs0MDgsOSBAQCBkb3VibGUgQ2FjaGVkUmVzb3VyY2U6OmZyZXNobmVz c0xpZmV0aW1lKCkgY29uc3QKICAgICByZXR1cm4gMDsKIH0KIAotdm9pZCBDYWNoZWRSZXNvdXJj ZTo6c2V0UmVzcG9uc2UoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UpCit2b2lkIENh Y2hlZFJlc291cmNlOjpyZXNwb25zZVJlY2VpdmVkKGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJl c3BvbnNlKQogewotICAgIG1fcmVzcG9uc2UgPSByZXNwb25zZTsKKyAgICBzZXRSZXNwb25zZShy ZXNwb25zZSk7CiAgICAgbV9yZXNwb25zZVRpbWVzdGFtcCA9IGN1cnJlbnRUaW1lKCk7CiAgICAg U3RyaW5nIGVuY29kaW5nID0gcmVzcG9uc2UudGV4dEVuY29kaW5nTmFtZSgpOwogICAgIGlmICgh ZW5jb2RpbmcuaXNOdWxsKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2Fj aGUvQ2FjaGVkUmVzb3VyY2UuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRS ZXNvdXJjZS5oCmluZGV4IDA3NDRjODQ2OTIyNTcyYWRjMTkwNTI3MzBhZDVmY2NhM2RlNTZkMjYu LmZhZmY3NjNjOGQ4MjU1MGJjY2YzNGMxMDcxNmI0MGNmYjljMjM1ZTEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZS5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZS5oCkBAIC0xODUsNyArMTg1LDggQEAg cHVibGljOgogICAgIFJlc291cmNlQnVmZmVyKiByZXNvdXJjZUJ1ZmZlcigpIGNvbnN0IHsgQVNT RVJUKCFtX3B1cmdlYWJsZURhdGEpOyByZXR1cm4gbV9kYXRhLmdldCgpOyB9CiAKICAgICB2aXJ0 dWFsIHZvaWQgd2lsbFNlbmRSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYsIGNvbnN0IFJlc291cmNl UmVzcG9uc2UmKSB7IG1fcmVxdWVzdGVkRnJvbU5ldHdvcmtpbmdMYXllciA9IHRydWU7IH0KLSAg ICB2aXJ0dWFsIHZvaWQgc2V0UmVzcG9uc2UoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYpOworICAg IHZpcnR1YWwgdm9pZCByZXNwb25zZVJlY2VpdmVkKGNvbnN0IFJlc291cmNlUmVzcG9uc2UmKTsK KyAgICB2b2lkIHNldFJlc3BvbnNlKGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlKSB7 IG1fcmVzcG9uc2UgPSByZXNwb25zZTsgfQogICAgIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJl c3BvbnNlKCkgY29uc3QgeyByZXR1cm4gbV9yZXNwb25zZTsgfQogCiAgICAgLy8gU2V0cyB0aGUg c2VyaWFsaXplZCBtZXRhZGF0YSByZXRyaWV2ZWQgZnJvbSB0aGUgcGxhdGZvcm0ncyBjYWNoZS4K