merge revision(s) r45529: [Backport ruby#8182]

nagachika · nagachika · commit d5705f53f21f · 2014-05-27T15:26:28.000Z
* lib/xmlrpc/client.rb (do_rpc): don't check body length. If HTTP content-encoding is used, the length may be different. [Bug ruby#8182] [ruby-core:53811] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46186 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+Wed May 28 00:23:11 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/xmlrpc/client.rb (do_rpc): don't check body length.
+	  If HTTP content-encoding is used, the length may be different.
+	  [Bug #8182] [ruby-core:53811]
+
 Wed May 28 00:18:29 2014  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* ext/date/date_core.c (d_lite_cmp): should compare with #<.
diff --git a/lib/xmlrpc/client.rb b/lib/xmlrpc/client.rb
@@ -507,8 +507,6 @@ def do_rpc(request, async=false)
       expected = resp["Content-Length"] || "<unknown>"
       if data.nil? or data.bytesize == 0
         raise "Wrong size. Was #{data.bytesize}, should be #{expected}"
-      elsif expected != "<unknown>" and expected.to_i != data.bytesize and resp["Transfer-Encoding"].nil?
-        raise "Wrong size. Was #{data.bytesize}, should be #{expected}"
       end
 
       parse_set_cookies(resp.get_fields("Set-Cookie"))
diff --git a/version.h b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.1.2"
 #define RUBY_RELEASE_DATE "2014-05-28"
-#define RUBY_PATCHLEVEL 107
+#define RUBY_PATCHLEVEL 108
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 5
