From fb21264fefc58528f9d91903192241e78ed7ce0f Mon Sep 17 00:00:00 2001 From: knu Date: Mon, 12 Mar 2007 17:55:03 +0000 Subject: * lib/cgi.rb (CGI::header): IIS >= 5.0 does not need the nph assumption any more; submitted by MIYASAKA Masaru in [ruby-dev:30537]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@12050 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ lib/cgi.rb | 3 ++- version.h | 6 +++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e806c37a12..3ab3d584ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Mar 13 02:54:17 2007 Akinori MUSHA + + * lib/cgi.rb (CGI::header): IIS >= 5.0 does not need the nph + assumption any more; submitted by MIYASAKA Masaru in [ruby-dev:30537]. + Mon Mar 12 11:07:44 2007 Akinori MUSHA * ext/openssl/ossl_asn1.c (Init_ossl_asn1): Let rdoc know about diff --git a/lib/cgi.rb b/lib/cgi.rb index a7cedd13aa..0c27f1f33a 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 91b3456f56..8b26a8fb79 100644 --- a/version.h +++ b/version.h @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2007-03-12" +#define RUBY_RELEASE_DATE "2007-03-13" #define RUBY_VERSION_CODE 186 -#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 6 #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[]; -- cgit v1.2.3