* merge -c 12050

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@12072 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 11 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 9f7393d52e..4ecb146179 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Mar 16 18:05:40 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/cgi.rb (CGI::header): IIS >= 5.0 does not need the nph
+	  assumption any more; submitted by MIYASAKA Masaru <alkaid AT
+	  coral.ocn.ne.jp> in [ruby-dev:30537].
+
 Tue Mar 13 17:29:43 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
 
 	* stable version 1.8.5-p35 released.
diff --git a/lib/cgi.rb b/lib/cgi.rb
index 49dbe3f179..d4bea54e7e 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -556,7 +556,8 @@ class CGI
     end
 
     options.delete("nph") if defined?(MOD_RUBY)
-    if options.delete("nph") or /IIS/n.match(env_table['SERVER_SOFTWARE'])
+    if options.delete("nph") or
+        (/IIS\/(\d+)/n.match(env_table['SERVER_SOFTWARE']) and $1.to_i < 5)
       buf += (env_table["SERVER_PROTOCOL"] or "HTTP/1.0")  + " " +
              (HTTP_STATUS[options["status"]] or options["status"] or "200 OK") +
              EOL +
diff --git a/version.h b/version.h
index b495e3e8a4..ec45a9a81f 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.5"
 #define RUBY_RELEASE_DATE "2007-03-13"
 #define RUBY_VERSION_CODE 185
-#define RUBY_RELEASE_CODE 20070313
-#define RUBY_PATCHLEVEL 35
+#define RUBY_RELEASE_CODE 20070316
+#define RUBY_PATCHLEVEL 36
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 5
 #define RUBY_RELEASE_YEAR 2007
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 13
+#define RUBY_RELEASE_DAY 16
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];