summaryrefslogtreecommitdiff
path: root/lib/cgi.rb
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-03-16 09:47:18 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-03-16 09:47:18 +0000
commit883b76c59e152f6db82dba45fd3f29592149317e (patch)
treefcc0d01eb54ef39581daed7ea082b27101e6803b /lib/cgi.rb
parent36eced764b169e5b655b3ac01c8a7a9be3b2d61e (diff)
* merge -c 12050
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@12072 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/cgi.rb')
-rw-r--r--lib/cgi.rb3
1 files changed, 2 insertions, 1 deletions
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 +