nagachika	2014-05-28 00:26:28 +0900 (Wed, 28 May 2014)

  New Revision: 46186

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=46186

  Log:
    merge revision(s) r45529: [Backport #8182]
    
    * 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]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/lib/xmlrpc/client.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 46185)
+++ ruby_2_1/ChangeLog	(revision 46186)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Wed May 28 00:23:11 2014  NARUSE, Yui  <naruse@r...>
+
+	* 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@d...>
 
 	* ext/date/date_core.c (d_lite_cmp): should compare with #<.
Index: ruby_2_1/lib/xmlrpc/client.rb
===================================================================
--- ruby_2_1/lib/xmlrpc/client.rb	(revision 46185)
+++ ruby_2_1/lib/xmlrpc/client.rb	(revision 46186)
@@ -507,8 +507,6 @@ module XMLRPC # :nodoc: https://github.com/ruby/ruby/blob/trunk/ruby_2_1/lib/xmlrpc/client.rb#L507
       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"))
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 46185)
+++ ruby_2_1/version.h	(revision 46186)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #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

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r45529


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/