nagachika	2013-07-14 00:13:21 +0900 (Sun, 14 Jul 2013)

  New Revision: 41953

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

  Log:
    merge revision(s) 41883,41885:
    
    * test/net/http/test_http.rb (TestNetHTTP_v1_2#test_get,
      TestNetHTTP_v1_2_chunked#test_get): shoudn't check
      HttpResponse#decode_content if Zlib is not available.
      ko1 complained via IRC.
      TestNetHTTP_v1_2_chunked#test_get): shouldn't check

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/test/net/http/test_http.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 41952)
+++ ruby_2_0_0/ChangeLog	(revision 41953)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sun Jul 14 00:13:01 2013  NAKAMURA Usaku  <usa@r...>
+
+	* test/net/http/test_http.rb (TestNetHTTP_v1_2#test_get,
+	  TestNetHTTP_v1_2_chunked#test_get): shouldn't check
+	  HttpResponse#decode_content if Zlib is not available.
+	  ko1 complained via IRC.
+
 Sat Jul 13 23:50:00 2013  Tadayoshi Funaba  <tadf@d...>
 
 	* ext/date/date_core.c: fixed coding error [ruby-core:55337].
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 41952)
+++ ruby_2_0_0/version.h	(revision 41953)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2013-07-13"
-#define RUBY_PATCHLEVEL 266
+#define RUBY_RELEASE_DATE "2013-07-14"
+#define RUBY_PATCHLEVEL 267
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 13
+#define RUBY_RELEASE_DAY 14
 
 #include "ruby/version.h"
 
Index: ruby_2_0_0/test/net/http/test_http.rb
===================================================================
--- ruby_2_0_0/test/net/http/test_http.rb	(revision 41952)
+++ ruby_2_0_0/test/net/http/test_http.rb	(revision 41953)
@@ -233,7 +233,7 @@ module TestNetHTTP_version_1_1_methods https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/net/http/test_http.rb#L233
       http.get('/', { 'User-Agent' => 'test' }.freeze)
     }
 
-    assert res.decode_content, '[Bug #7924]'
+    assert res.decode_content, '[Bug #7924]' if Net::HTTP::HAVE_ZLIB
   end
 
   def _test_get__iter(http)
@@ -460,7 +460,7 @@ module TestNetHTTP_version_1_2_methods https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/net/http/test_http.rb#L460
       assert_equal $test_net_http_data.size, res.body.size
       assert_equal $test_net_http_data, res.body
 
-      refute res.decode_content, 'Bug #7831'
+      refute res.decode_content, 'Bug #7831' if Net::HTTP::HAVE_ZLIB
     }
   end
 

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r41883,41885


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