diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | test/net/http/test_http.rb | 4 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 12 insertions, 5 deletions
@@ -1,3 +1,10 @@ +Sun Jul 14 00:13:01 2013 NAKAMURA Usaku <usa@ruby-lang.org> + + * 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@dotrb.org> * ext/date/date_core.c: fixed coding error [ruby-core:55337]. diff --git a/test/net/http/test_http.rb b/test/net/http/test_http.rb index 0b3eeeb6bf..0a0b6ca809 100644 --- a/test/net/http/test_http.rb +++ b/test/net/http/test_http.rb @@ -233,7 +233,7 @@ module TestNetHTTP_version_1_1_methods 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 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 @@ -1,10 +1,10 @@ #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" |