* lib/net/http/generic_request.rb (Net::HTTPGenericRequest):

nurse · nurse · commit 8b561ed2a344 · 2012-12-23T19:58:44.000Z
set content-length to zero on empty post requests by Gregory Ostermayr <gregory.ostermayr@gmail.com> ruby/ruby#201 fix GH-201 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38578 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/lib/net/http/generic_request.rb b/lib/net/http/generic_request.rb
@@ -89,6 +89,9 @@ def body_stream=(input)
   def set_body_internal(str)   #:nodoc: internal use only
     raise ArgumentError, "both of body argument and HTTPRequest#body set" if str and (@body or @body_stream)
     self.body = str if str
+    if @body.nil? && @body_stream.nil? && @body_data.nil? && request_body_permitted?
+      self.body = ''
+    end
   end
 
   #
diff --git a/test/net/http/test_http.rb b/test/net/http/test_http.rb
@@ -310,6 +310,7 @@ def test_post
     start {|http|
       _test_post__base http
       _test_post__file http
+      _test_post__no_data http
     }
   end
 
@@ -332,6 +333,14 @@ def _test_post__file(http)
     assert_equal data, f.string
   end
 
+  def _test_post__no_data(http)
+    unless self.is_a?(TestNetHTTP_v1_2_chunked)
+      data = nil
+      res = http.post('/', data)
+      assert_not_equal '411', res.code
+    end
+  end
+
   def test_s_post_form
     url = "http://#{config('host')}:#{config('port')}/"
     res = Net::HTTP.post_form(

Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,9 @@ def body_stream=(input)`
`89`	`89`	`def set_body_internal(str) #:nodoc: internal use only`
`90`	`90`	`raise ArgumentError, "both of body argument and HTTPRequest#body set" if str and (@body or @body_stream)`
`91`	`91`	`self.body = str if str`
	`92`	`+ if @body.nil? && @body_stream.nil? && @body_data.nil? && request_body_permitted?`
	`93`	`+ self.body = ''`
	`94`	`+ end`
`92`	`95`	`end`
`93`	`96`
`94`	`97`	`#`