From 9d5c0ea4a316fab37436f7aaa9473b76a39f017f Mon Sep 17 00:00:00 2001
From: knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 12 Mar 2007 17:48:10 +0000
Subject: * 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].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12048 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/cgi.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib/cgi.rb')

diff --git a/lib/cgi.rb b/lib/cgi.rb
index 92ec1b6d57..99dd0aae16 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -566,7 +566,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 +
-- 
cgit v1.2.3