diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-08 08:09:40 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-08 08:09:40 +0000 |
commit | 751a5cfa0cb4ac1718c23aa6e63f33ac90790422 (patch) | |
tree | d51ece39819be5229f1557f303b5b778b59cc8e3 | |
parent | c5089caba939f78eb30fada173325eddfd1cd249 (diff) |
merges r29786 from trunk into ruby_1_9_2.
--
Prevent timing failure.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30139 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | test/cgi/test_cgi_header.rb | 2 | ||||
-rw-r--r-- | version.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/cgi/test_cgi_header.rb b/test/cgi/test_cgi_header.rb index 58f82ba3bc..6b110a07f6 100644 --- a/test/cgi/test_cgi_header.rb +++ b/test/cgi/test_cgi_header.rb @@ -134,6 +134,7 @@ class CGIHeaderTest < Test::Unit::TestCase ## 'nph' is true ENV['SERVER_SOFTWARE'] = 'Apache 2.2.0' actual1 = cgi.header('nph'=>true) + now = Time.now ## when old IIS, NPH-mode is forced ENV['SERVER_SOFTWARE'] = 'IIS/4.0' actual2 = cgi.header @@ -143,7 +144,6 @@ class CGIHeaderTest < Test::Unit::TestCase actual4 = cgi.header actual5 = cgi.header('status'=>'REDIRECT', 'location'=>'http://www.example.com/') ## assertion - now = Time.now expected = "HTTP/1.1 200 OK\r\n" expected << "Date: #{CGI.rfc1123_date(now)}\r\n" expected << "Server: Apache 2.2.0\r\n" @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 92 +#define RUBY_PATCHLEVEL 93 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |