From: Hiroshi NAKAMURA Date: 2010-09-09T17:26:18+09:00 Subject: [ruby-core:32221] [Ruby 1.9-Feature#3622] Net::HTTP does not wait to send request body with Expect: 100-continue --mimepart_4c8899bb438d9_eed918538662cb Content-Type: text/plain Content-Transfer-Encoding: Quoted-printable Content-Disposition: inline Issue #3622 has been updated by Hiroshi NAKAMURA. File expect-continue.diff added Here's a modified version of the patch. [expect-continue.diff] I'll write test case. Eric: Would you please confirm that this patch works for you? Thanks in a= dvance. ---------------------------------------- http://redmine.ruby-lang.org/issues/show/3622 ---------------------------------------- http://redmine.ruby-lang.org --mimepart_4c8899bb438d9_eed918538662cb Content-Type: application/octet-stream; name=expect-continue.diff Content-Transfer-Encoding: Base64 Content-Disposition: attachment; filename=expect-continue.diff SW5kZXg6IGxpYi9uZXQvaHR0cC5yYgo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBsaWIvbmV0L2h0dHAucmIJKHJldmlzaW9uIDI5MjAxKQorKysgbGli L25ldC9odHRwLnJiCSh3b3JraW5nIGNvcHkpCkBAIC01MTcsNiArNTE3LDcg QEAKICAgICAgIEBzdGFydGVkID0gZmFsc2UKICAgICAgIEBvcGVuX3RpbWVv dXQgPSBuaWwKICAgICAgIEByZWFkX3RpbWVvdXQgPSA2MAorICAgICAgQGNv bnRpbnVlX3RpbWVvdXQgPSBuaWwKICAgICAgIEBkZWJ1Z19vdXRwdXQgPSBu aWwKICAgICAgIEB1c2Vfc3NsID0gZmFsc2UKICAgICAgIEBzc2xfY29udGV4 dCA9IG5pbApAQCAtNTcwLDYgKzU3MSwxNiBAQAogICAgICAgQHJlYWRfdGlt ZW91dCA9IHNlYwogICAgIGVuZAogCisgICAgIyBTZWNvbmRzIHRvIHdhaXQg Zm9yIDEwMCBDb250aW51ZSByZXNwb25zZS4gIElmIHRoZSBIVFRQIG9iamVj dCBkb2VzIG5vdAorICAgICMgcmVjZWl2ZSBhIHJlc3BvbnNlIGluIHRoaXMg bWFueSBzZWNvbmRzIGl0IHNlbmRzIHRoZSByZXF1ZXN0IGJvZHkuCisgICAg YXR0cl9yZWFkZXIgOmNvbnRpbnVlX3RpbWVvdXQKKworICAgICMgU2V0dGVy IGZvciB0aGUgY29udGludWVfdGltZW91dCBhdHRyaWJ1dGUuCisgICAgZGVm IGNvbnRpbnVlX3RpbW91dD0oc2VjKQorICAgICAgQHNvY2tldC5jb250aW51 ZV90aW1lb3V0ID0gc2VjIGlmIEBzb2NrZXQKKyAgICAgIEBjb250aW51ZV90 aW1lb3V0ID0gc2VjCisgICAgZW5kCisKICAgICAjIHJldHVybnMgdHJ1ZSBp ZiB0aGUgSFRUUCBzZXNzaW9uIGlzIHN0YXJ0ZWQuCiAgICAgZGVmIHN0YXJ0 ZWQ/CiAgICAgICBAc3RhcnRlZApAQCAtMTE5MCwxMiArMTIwMSwxNSBAQAog CiAgICAgZGVmIHRyYW5zcG9ydF9yZXF1ZXN0KHJlcSkKICAgICAgIGJlZ2lu X3RyYW5zcG9ydCByZXEKLSAgICAgIHJlcS5leGVjIEBzb2NrZXQsIEBjdXJy X2h0dHBfdmVyc2lvbiwgZWRpdF9wYXRoKHJlcS5wYXRoKQotICAgICAgYmVn aW4KLSAgICAgICAgcmVzID0gSFRUUFJlc3BvbnNlLnJlYWRfbmV3KEBzb2Nr ZXQpCi0gICAgICBlbmQgd2hpbGUgcmVzLmtpbmRfb2Y/KEhUVFBDb250aW51 ZSkKLSAgICAgIHJlcy5yZWFkaW5nX2JvZHkoQHNvY2tldCwgcmVxLnJlc3Bv bnNlX2JvZHlfcGVybWl0dGVkPykgewotICAgICAgICB5aWVsZCByZXMgaWYg YmxvY2tfZ2l2ZW4/CisgICAgICByZXMgPSBjYXRjaCg6cmVzcG9uc2UpIHsK KyAgICAgICAgcmVxLmV4ZWMgQHNvY2tldCwgQGN1cnJfaHR0cF92ZXJzaW9u LCBlZGl0X3BhdGgocmVxLnBhdGgpCisgICAgICAgIGJlZ2luCisgICAgICAg ICAgcmVzID0gSFRUUFJlc3BvbnNlLnJlYWRfbmV3KEBzb2NrZXQpCisgICAg ICAgIGVuZCB3aGlsZSByZXMua2luZF9vZj8oSFRUUENvbnRpbnVlKQorICAg ICAgICByZXMucmVhZGluZ19ib2R5KEBzb2NrZXQsIHJlcS5yZXNwb25zZV9i b2R5X3Blcm1pdHRlZD8pIHsKKyAgICAgICAgICB5aWVsZCByZXMgaWYgYmxv Y2tfZ2l2ZW4/CisgICAgICAgIH0KKyAgICAgICAgcmVzCiAgICAgICB9CiAg ICAgICBlbmRfdHJhbnNwb3J0IHJlcSwgcmVzCiAgICAgICByZXMKQEAgLTE3 MzksNiArMTc1Myw3IEBACiAgICAgICBzZWxmLmNvbnRlbnRfbGVuZ3RoID0g Ym9keS5ieXRlc2l6ZQogICAgICAgZGVsZXRlICdUcmFuc2Zlci1FbmNvZGlu ZycKICAgICAgIHN1cHBseV9kZWZhdWx0X2NvbnRlbnRfdHlwZQorICAgICAg d2FpdF9mb3JfY29udGludWUgc29jaywgdmVyIGlmIHNvY2suY29udGludWVf dGltZW91dAogICAgICAgd3JpdGVfaGVhZGVyIHNvY2ssIHZlciwgcGF0aAog ICAgICAgc29jay53cml0ZSBib2R5CiAgICAgZW5kCkBAIC0xNzQ5LDYgKzE3 NjQsNyBAQAogICAgICAgICAgICAgIkNvbnRlbnQtTGVuZ3RoIG5vdCBnaXZl biBhbmQgVHJhbnNmZXItRW5jb2RpbmcgaXMgbm90IGBjaHVua2VkJyIKICAg ICAgIGVuZAogICAgICAgc3VwcGx5X2RlZmF1bHRfY29udGVudF90eXBlCisg ICAgICB3YWl0X2Zvcl9jb250aW51ZSBzb2NrLCB2ZXIgaWYgc29jay5jb250 aW51ZV90aW1lb3V0CiAgICAgICB3cml0ZV9oZWFkZXIgc29jaywgdmVyLCBw YXRoCiAgICAgICBpZiBjaHVua2VkPwogICAgICAgICB3aGlsZSBzID0gZi5y ZWFkKDEwMjQpCkBAIC0xNzY4LDYgKzE3ODQsMjIgQEAKICAgICAgIHNldF9j b250ZW50X3R5cGUgJ2FwcGxpY2F0aW9uL3gtd3d3LWZvcm0tdXJsZW5jb2Rl ZCcKICAgICBlbmQKIAorICAgICMjCisgICAgIyBXYWl0cyB1cCB0byB0aGUg Y29udGludWUgdGltZW91dCBmb3IgYSByZXNwb25zZSBmcm9tIHRoZSBzZXJ2 ZXIgcHJvdmlkZWQKKyAgICAjIHdlJ3JlIHNwZWFraW5nIEhUVFAgMS4xIGFu ZCBhcmUgZXhwZWN0aW5nIGEgMTAwLWNvbnRpbnVlIHJlc3BvbnNlLgorCisg ICAgZGVmIHdhaXRfZm9yX2NvbnRpbnVlKHNvY2ssIHZlcikKKyAgICAgIGlm IHZlciA+PSAnMS4xJyBhbmQgQGhlYWRlclsnZXhwZWN0J10gYW5kCisgICAg ICAgICAgQGhlYWRlclsnZXhwZWN0J10uaW5jbHVkZT8oJzEwMC1jb250aW51 ZScpIHRoZW4KKyAgICAgICAgaWYgSU8uc2VsZWN0IFtzb2NrLmlvXSwgbmls LCBuaWwsIHNvY2suY29udGludWVfdGltZW91dCB0aGVuCisgICAgICAgICAg cmVzID0gSFRUUFJlc3BvbnNlLnJlYWRfbmV3IHNvY2sKKyAgICAgICAgICB1 bmxlc3MgcmVzLmtpbmRfb2Y/KE5ldDo6SFRUUENvbnRpbnVlKQorICAgICAg ICAgICAgdGhyb3cgOnJlc3BvbnNlLCByZXMKKyAgICAgICAgICBlbmQKKyAg ICAgICAgZW5kCisgICAgICBlbmQKKyAgICBlbmQKKwogICAgIGRlZiB3cml0 ZV9oZWFkZXIoc29jaywgdmVyLCBwYXRoKQogICAgICAgYnVmID0gIiN7QG1l dGhvZH0gI3twYXRofSBIVFRQLyN7dmVyfVxyXG4iCiAgICAgICBlYWNoX2Nh cGl0YWxpemVkIGRvIHxrLHZ8CkluZGV4OiBsaWIvbmV0L3Byb3RvY29sLnJi Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGxpYi9uZXQvcHJvdG9jb2wu cmIJKHJldmlzaW9uIDI5MjAxKQorKysgbGliL25ldC9wcm90b2NvbC5yYgko d29ya2luZyBjb3B5KQpAQCAtNTAsMTIgKzUwLDE0IEBACiAgICAgZGVmIGlu aXRpYWxpemUoaW8pCiAgICAgICBAaW8gPSBpbwogICAgICAgQHJlYWRfdGlt ZW91dCA9IDYwCisgICAgICBAY29udGludWVfdGltZW91dCA9IDAuNQogICAg ICAgQGRlYnVnX291dHB1dCA9IG5pbAogICAgICAgQHJidWYgPSAnJwogICAg IGVuZAogCiAgICAgYXR0cl9yZWFkZXIgOmlvCiAgICAgYXR0cl9hY2Nlc3Nv ciA6cmVhZF90aW1lb3V0CisgICAgYXR0cl9hY2Nlc3NvciA6Y29udGludWVf dGltZW91dAogICAgIGF0dHJfYWNjZXNzb3IgOmRlYnVnX291dHB1dAogCiAg ICAgZGVmIGluc3BlY3QK --mimepart_4c8899bb438d9_eed918538662cb--