yugui	2010-12-08 17:09:40 +0900 (Wed, 08 Dec 2010)

  New Revision: 30139

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

  Log:
    merges r29786 from trunk into ruby_1_9_2.
    --
    Prevent timing failure.

  Modified files:
    branches/ruby_1_9_2/test/cgi/test_cgi_header.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30138)
+++ ruby_1_9_2/version.h	(revision 30139)
@@ -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
Index: ruby_1_9_2/test/cgi/test_cgi_header.rb
===================================================================
--- ruby_1_9_2/test/cgi/test_cgi_header.rb	(revision 30138)
+++ ruby_1_9_2/test/cgi/test_cgi_header.rb	(revision 30139)
@@ -134,6 +134,7 @@
     ## '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 @@
     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"

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