diff options
author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-03-12 17:48:10 +0000 |
---|---|---|
committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-03-12 17:48:10 +0000 |
commit | 9d5c0ea4a316fab37436f7aaa9473b76a39f017f (patch) | |
tree | 98ef5bf213b5b0933538d9796acc5f646c2f1e43 | |
parent | 62d54a282e28fd38e032485aba4a434852f63686 (diff) | |
download | ruby-9d5c0ea4a316fab37436f7aaa9473b76a39f017f.tar.gz |
* 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
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | lib/cgi.rb | 3 | ||||
-rw-r--r-- | version.h | 6 |
3 files changed, 11 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Tue Mar 13 02:42:58 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]. + Mon Mar 12 10:53:28 2007 Akinori MUSHA <knu@iDaemons.org> * ext/openssl/ossl_asn1.c (Init_ossl_asn1): Let rdoc know about 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 + @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2007-03-12" +#define RUBY_RELEASE_DATE "2007-03-13" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20070312 +#define RUBY_RELEASE_CODE 20070313 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 12 +#define RUBY_RELEASE_DAY 13 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |