usa	2014-05-27 11:46:43 +0900 (Tue, 27 May 2014)

  New Revision: 46153

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

  Log:
    merge revision(s) 45529: [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_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/lib/xmlrpc/client.rb
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 46152)
+++ ruby_2_0_0/ChangeLog	(revision 46153)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Tue May 27 11:46:03 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]
+
 Tue May 27 11:23:02 2014  Tadayoshi Funaba  <tadf@d...>
 
 	* ext/date/date_core.c (d_lite_cmp): should compare with #<.
Index: ruby_2_0_0/lib/xmlrpc/client.rb
===================================================================
--- ruby_2_0_0/lib/xmlrpc/client.rb	(revision 46152)
+++ ruby_2_0_0/lib/xmlrpc/client.rb	(revision 46153)
@@ -500,8 +500,6 @@ module XMLRPC # :nodoc: https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/xmlrpc/client.rb#L500
       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
 
       set_cookies = resp.get_fields("Set-Cookie")
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 46152)
+++ ruby_2_0_0/version.h	(revision 46153)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2014-05-27"
-#define RUBY_PATCHLEVEL 482
+#define RUBY_PATCHLEVEL 483
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 5

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


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