29943 2009-09-30 17:43:36 -0700 307 redirects should pass along http body and Content-Type header 2009-09-30 21:16:08 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 mjs mjs oldest_to_newest 151408 0 mjs 2009-09-30 17:43:36 -0700 307 redirects should pass along the http body and Content-Type header, in addition to the method. These are dropped by CFNetwork when converting the redirect to a GET. 151412 1 40413 mjs 2009-09-30 17:55:57 -0700 Created attachment 40413 patch v1 151414 2 40413 beidson 2009-09-30 18:00:09 -0700 Comment on attachment 40413 patch v1 r=me with style issues to be fixed: > Index: WebCore/platform/network/mac/ResourceHandleMac.mm > =================================================================== > --- WebCore/platform/network/mac/ResourceHandleMac.mm (revision 48858) > +++ WebCore/platform/network/mac/ResourceHandleMac.mm (working copy) > @@ -596,6 +596,15 @@ void ResourceHandle::receivedCancellatio > if (!equalIgnoringCase(originalMethod, String([newRequest HTTPMethod]))) { > NSMutableURLRequest *mutableRequest = [newRequest mutableCopy]; > [mutableRequest setHTTPMethod:originalMethod]; > + > + FormData* body = m_handle->request().httpBody(); > + if (!equalIgnoringCase(originalMethod, "GET") && body && !body->isEmpty()) > + WebCore::setHTTPBody(mutableRequest, body); > + > + String originalContentType = m_handle->request().httpContentType(); > + if (!originalContentType.isEmpty()) > + [mutableRequest setValue:originalContentType forHTTPHeaderField:@"Content-Type"]; > + > newRequest = [mutableRequest autorelease]; > } > } There's tabs here (and therefore, maybe elsewhere in the change?) - please replace with spaces. Maybe as a result, the indentation here is off. 151443 3 mjs 2009-09-30 21:14:10 -0700 Committed, and I fixed the tabs. 151444 4 mjs 2009-09-30 21:16:08 -0700 Committed r48953. http://trac.webkit.org/changeset/48953 Also requires r48956 for Windows. http://trac.webkit.org/changeset/48956 Also r48957. http://trac.webkit.org/changeset/48957 40413 2009-09-30 17:55:57 -0700 2009-09-30 18:00:09 -0700 patch v1 307-body.patch.txt text/plain 6402 mjs SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0ODk1MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMDktMDktMzAgIE1hY2llaiBTdGFjaG93aWFrICA8bWpzQGFwcGxl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAz MDcgcmVkaXJlY3RzIHNob3VsZCBwYXNzIGFsb25nIGh0dHAgYm9keSBhbmQgQ29udGVudC1UeXBl IGhlYWRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 Mjk5NDMKKworICAgICAgICBGb2xsb3ctdXAgZml4IGZvcjoKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzM4MDI2NjA+IFNBUDogMzA3IChUZW1wb3JhcnkgUmVkaXJlY3QpIHJlc3BvbnNlcyBzaG91 bGQgdXNlIFBPU1QsIG5vdCBHRVQKKyAgICAgICAgCisgICAgICAgIFRlc3Q6IGh0dHAvdGVzdHMv bG9hZGluZy9yZXNvdXJjZXMvcmVkaXJlY3QtbWV0aG9kcy1yZXN1bHQucGhwCisKKyAgICAgICAg KiBwbGF0Zm9ybS9uZXR3b3JrL2NmL1Jlc291cmNlSGFuZGxlQ0ZOZXQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6d2lsbFNlbmRSZXF1ZXN0KTogUGFzcyBhbG9uZyBodHRwIGJvZHkgYW5kIENvbnRl bnQtVHlwZSBoZWFkZXIuCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9tYWMvUmVzb3VyY2VI YW5kbGVNYWMubW06CisgICAgICAgICgtW1dlYkNvcmVSZXNvdXJjZUhhbmRsZUFzRGVsZWdhdGUg Y29ubmVjdGlvbjp3aWxsU2VuZFJlcXVlc3Q6cmVkaXJlY3RSZXNwb25zZTpdKTogZGl0dG8KKwog MjAwOS0wOS0zMCAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IFNhbSBXZWluaWcuCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2Yv UmVzb3VyY2VIYW5kbGVDRk5ldC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL2NmL1Jlc291cmNlSGFuZGxlQ0ZOZXQuY3BwCShyZXZpc2lvbiA0ODg1OCkKKysrIFdl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9SZXNvdXJjZUhhbmRsZUNGTmV0LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTI4LDYgKzEyOCwxNSBAQCBDRlVSTFJlcXVlc3RSZWYgd2lsbFNlbmRSZXF1 ZXN0KENGVVJMQ29uCiAgICAgICAgICAgICBpZiAoQ0ZTdHJpbmdDb21wYXJlV2l0aE9wdGlvbnMo b3JpZ2luYWxNZXRob2QuZ2V0KCksIG5ld01ldGhvZC5nZXQoKSwgQ0ZSYW5nZU1ha2UoMCwgQ0ZT dHJpbmdHZXRMZW5ndGgob3JpZ2luYWxNZXRob2QuZ2V0KCkpKSwga0NGQ29tcGFyZUNhc2VJbnNl bnNpdGl2ZSkpIHsKICAgICAgICAgICAgICAgICBSZXRhaW5QdHI8Q0ZNdXRhYmxlVVJMUmVxdWVz dFJlZj4gbXV0YWJsZVJlcXVlc3QoQWRvcHRDRiwgQ0ZVUkxSZXF1ZXN0Q3JlYXRlTXV0YWJsZUNv cHkoMCwgY2ZSZXF1ZXN0KSk7CiAgICAgICAgICAgICAgICAgQ0ZVUkxSZXF1ZXN0U2V0SFRUUFJl cXVlc3RNZXRob2QobXV0YWJsZVJlcXVlc3QuZ2V0KCksIG9yaWdpbmFsTWV0aG9kLmdldCgpKTsK KworICAgICAgICAgICAgICAgIEZvcm1EYXRhKiBib2R5ID0gaGFuZGxlLT5yZXF1ZXN0KCkuaHR0 cEJvZHkoKTsKKyAgICAgICAgICAgICAgICBpZiAoIWVxdWFsSWdub3JpbmdDYXNlKGhhbmRsZS0+ cmVxdWVzdCgpLmh0dHBNZXRob2QoKSwgIkdFVCIpICYmIGJvZHkgJiYgIWJvZHktPmlzRW1wdHko KSkKKyAgICAgICAgICAgICAgICAgICAgV2ViQ29yZTo6c2V0SFRUUEJvZHkobXV0YWJsZVJlcXVl c3QsIGJvZHkpOworCisgICAgICAgICAgICAgICAgU3RyaW5nIG9yaWdpbmFsQ29udGVudFR5cGUg PSBtX2hhbmRsZS0+cmVxdWVzdC5odHRwQ29udGVudFR5cGUoKTsKKyAgICAgICAgICAgICAgICBp ZiAoIW9yaWdpbmFsQ29udGVudFR5cGUtPmlzRW1wdHkoKSkKKyAgICAgICAgICAgICAgICAgICAg Q0ZVUkxSZXF1ZXN0U2V0SFRUUEhlYWRlckZpZWxkVmFsdWUobXV0YWJsZVJlcXVlc3QuZ2V0KCks IENGU1RSKCJDb250ZW50LVR5cGUiKSwgb3JpZ2luYWxDb250ZW50VHlwZSk7CisKICAgICAgICAg ICAgICAgICByZXF1ZXN0ID0gbXV0YWJsZVJlcXVlc3QuZ2V0KCk7CiAgICAgICAgICAgICB9CiAg ICAgICAgIH0KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9tYWMvUmVzb3VyY2VIYW5k bGVNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL21hYy9SZXNv dXJjZUhhbmRsZU1hYy5tbQkocmV2aXNpb24gNDg4NTgpCisrKyBXZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvbWFjL1Jlc291cmNlSGFuZGxlTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC01OTYsNiAr NTk2LDE1IEBAIHZvaWQgUmVzb3VyY2VIYW5kbGU6OnJlY2VpdmVkQ2FuY2VsbGF0aW8KICAgICAg ICAgaWYgKCFlcXVhbElnbm9yaW5nQ2FzZShvcmlnaW5hbE1ldGhvZCwgU3RyaW5nKFtuZXdSZXF1 ZXN0IEhUVFBNZXRob2RdKSkpIHsKICAgICAgICAgICAgIE5TTXV0YWJsZVVSTFJlcXVlc3QgKm11 dGFibGVSZXF1ZXN0ID0gW25ld1JlcXVlc3QgbXV0YWJsZUNvcHldOwogICAgICAgICAgICAgW211 dGFibGVSZXF1ZXN0IHNldEhUVFBNZXRob2Q6b3JpZ2luYWxNZXRob2RdOworCSAgICAKKyAgICAg ICAgICAgIEZvcm1EYXRhKiBib2R5ID0gbV9oYW5kbGUtPnJlcXVlc3QoKS5odHRwQm9keSgpOwor ICAgICAgICAgICAgaWYgKCFlcXVhbElnbm9yaW5nQ2FzZShvcmlnaW5hbE1ldGhvZCwgIkdFVCIp ICYmIGJvZHkgJiYgIWJvZHktPmlzRW1wdHkoKSkKKyAgICAgICAgICAgICAgICBXZWJDb3JlOjpz ZXRIVFRQQm9keShtdXRhYmxlUmVxdWVzdCwgYm9keSk7CisKKwkgICAgU3RyaW5nIG9yaWdpbmFs Q29udGVudFR5cGUgPSBtX2hhbmRsZS0+cmVxdWVzdCgpLmh0dHBDb250ZW50VHlwZSgpOworCSAg ICBpZiAoIW9yaWdpbmFsQ29udGVudFR5cGUuaXNFbXB0eSgpKQorCSAgICAgICAgW211dGFibGVS ZXF1ZXN0IHNldFZhbHVlOm9yaWdpbmFsQ29udGVudFR5cGUgZm9ySFRUUEhlYWRlckZpZWxkOkAi Q29udGVudC1UeXBlIl07CisKICAgICAgICAgICAgIG5ld1JlcXVlc3QgPSBbbXV0YWJsZVJlcXVl c3QgYXV0b3JlbGVhc2VdOwogICAgICAgICB9CiAgICAgfQpJbmRleDogTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gNDg5 NTIpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwx NyBAQAorMjAwOS0wOS0zMCAgTWFjaWVqIFN0YWNob3dpYWsgIDxtanNAYXBwbGUuY29tPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIDMwNyByZWRpcmVj dHMgc2hvdWxkIHBhc3MgYWxvbmcgaHR0cCBib2R5IGFuZCBDb250ZW50LVR5cGUgaGVhZGVyCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yOTk0MworCisg ICAgICAgIEZvbGxvdy11cCBmaXggZm9yOgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzgwMjY2 MD4gU0FQOiAzMDcgKFRlbXBvcmFyeSBSZWRpcmVjdCkgcmVzcG9uc2VzIHNob3VsZCB1c2UgUE9T VCwgbm90IEdFVAorCisgICAgICAgICogaHR0cC90ZXN0cy9sb2FkaW5nL3JlZGlyZWN0LW1ldGhv ZHMuaHRtbDogVXBkYXRlZCB0ZXN0IHRvIHNob3cgdGhlIGh0dHAgYm9keSBhbmQgY29udGVudC10 eXBlIGhlYWRlci4KKyAgICAgICAgKiBodHRwL3Rlc3RzL2xvYWRpbmcvcmVkaXJlY3QtbWV0aG9k cy1leHBlY3RlZC50eHQ6CisgICAgICAgICogaHR0cC90ZXN0cy9sb2FkaW5nL3Jlc291cmNlcy9y ZWRpcmVjdC1tZXRob2RzLXJlc3VsdC5waHA6IAorCiAyMDA5LTA5LTMwICBKZXJlbXkgT3Jsb3cg IDxqb3Jsb3dAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERpbWl0cmkgR2xh emtvdi4KSW5kZXg6IExheW91dFRlc3RzL2h0dHAvdGVzdHMvbG9hZGluZy9yZWRpcmVjdC1tZXRo b2RzLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2xv YWRpbmcvcmVkaXJlY3QtbWV0aG9kcy1leHBlY3RlZC50eHQJKHJldmlzaW9uIDQ4ODU4KQorKysg TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9sb2FkaW5nL3JlZGlyZWN0LW1ldGhvZHMtZXhwZWN0ZWQu dHh0CSh3b3JraW5nIGNvcHkpCkBAIC0xMTcsNCArMTE3LDE1IEBAIGZyYW1lICIzIiAtIGRpZEhh bmRsZU9ubG9hZEV2ZW50c0ZvckZyYW0KIGZyYW1lICIzIiAtIGRpZEZpbmlzaExvYWRGb3JGcmFt ZQogVGhpcyB0ZXN0IGNoZWNrcyB0byBzZWUgd2hhdCBIVFRQIG1ldGhvZCBpcyB1c2VkIHRvIGZl dGNoIHRoZSBmaW5hbCByZXNvdXJjZSBpbiB0aGUgY2FzZSB3aGVyZSB0aGUgZmlyc3QgcmVxdWVz dCByZXN1bHRzIGluIGEgcmVkaXJlY3QuCiAzMDEsIDMwMiwgMzAzLCBhbmQgMzA3IGh0dHAgcmVk aXJlY3RzIGFyZSBhbGwgdGVzdGVkLgorMzAxIHJlZGlyZWN0CisKKworMzAyIHJlZGlyZWN0CisK KworMzAzIHJlZGlyZWN0CisKKworMzA3IHJlZGlyZWN0CisKIApJbmRleDogTGF5b3V0VGVzdHMv aHR0cC90ZXN0cy9sb2FkaW5nL3JlZGlyZWN0LW1ldGhvZHMuaHRtbAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBM YXlvdXRUZXN0cy9odHRwL3Rlc3RzL2xvYWRpbmcvcmVkaXJlY3QtbWV0aG9kcy5odG1sCShyZXZp c2lvbiA0ODg1OCkKKysrIExheW91dFRlc3RzL2h0dHAvdGVzdHMvbG9hZGluZy9yZWRpcmVjdC1t ZXRob2RzLmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTE1LDkgKzE1LDEzIEBAIHZhciB0ZXN0Q29k ZXMgPSBbMzAxLCAzMDIsIDMwMywgMzA3XTsKIAogZnVuY3Rpb24gY3JlYXRlRnJhbWUoaW5kZXgp CiB7CisgICAgdmFyIGg0ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiaDQiKTsKKyAgICBoNC5p bm5lckhUTUwgPSB0ZXN0Q29kZXNbaW5kZXhdICsgIiByZWRpcmVjdCI7CisgICAgZG9jdW1lbnQu Ym9keS5hcHBlbmRDaGlsZChoNCk7CiAgICAgdmFyIGlmcmFtZSA9IGRvY3VtZW50LmNyZWF0ZUVs ZW1lbnQoImlmcmFtZSIpOwogICAgIGlmcmFtZS5zZXRBdHRyaWJ1dGUoInRlc3RDb2RlIiwgdGVz dENvZGVzW2luZGV4XSk7CiAgICAgaWZyYW1lLnNldEF0dHJpYnV0ZSgiaWQiLCBpbmRleCk7Cisg ICAgaWZyYW1lLnNldEF0dHJpYnV0ZSgiaGVpZ2h0IiwgIjkwcHgiKTsKICAgICBkb2N1bWVudC5i b2R5LmFwcGVuZENoaWxkKGlmcmFtZSk7CiAgICAgaWZyYW1lLnNyYz0icmVzb3VyY2VzL3JlZGly ZWN0LW1ldGhvZHMtZm9ybS5odG1sIjsKICAgICBpZnJhbWUuc2V0QXR0cmlidXRlKCJvbmxvYWQi LCAiaWZyYW1lTG9hZGVkKCIgKyBpbmRleCArICIpOyIpOwpJbmRleDogTGF5b3V0VGVzdHMvaHR0 cC90ZXN0cy9sb2FkaW5nL3Jlc291cmNlcy9yZWRpcmVjdC1tZXRob2RzLXJlc3VsdC5waHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9sb2FkaW5nL3Jlc291cmNlcy9yZWRp cmVjdC1tZXRob2RzLXJlc3VsdC5waHAJKHJldmlzaW9uIDQ4ODU4KQorKysgTGF5b3V0VGVzdHMv aHR0cC90ZXN0cy9sb2FkaW5nL3Jlc291cmNlcy9yZWRpcmVjdC1tZXRob2RzLXJlc3VsdC5waHAJ KHdvcmtpbmcgY29weSkKQEAgLTUsNCArNSw2IEBAIGlmICgkc3RhdHVzID4gMjAwICYmICEkX0dF VFsncmVkaXJlY3RlZCcKICAgZXhpdCgpOwogfQogPz4KLVRoaXMgcGFnZSBsb2FkZWQgdXNpbmcg dGhlIDw/cGhwIGVjaG8gJF9TRVJWRVJbJ1JFUVVFU1RfTUVUSE9EJ10gPz4gbWV0aG9kLgorUmVx dWVzdCBNZXRob2Q6IDw/cGhwIGVjaG8gJF9TRVJWRVJbJ1JFUVVFU1RfTUVUSE9EJ10gPz48YnI+ IAorUmVxdWVzdCBCb2R5OiA8P3BocCBlY2hvIEBmaWxlX2dldF9jb250ZW50cygncGhwOi8vaW5w dXQnKSA/Pjxicj4KK1JlcXVlc3QgQ29udGVudC1UeXBlOiA8P3BocCBlY2hvICRfU0VSVkVSWyJD T05URU5UX1RZUEUiXTsgPz4K