summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwakou <wakou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-07-05 05:04:25 +0000
committerwakou <wakou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-07-05 05:04:25 +0000
commitad9af3738b6236d33690d99dbaa175ab8d204277 (patch)
tree277878a42ee9e91d9bd90f93e33c5de1bc05bf5c
parent02b589fd43b6f83efed31cf59679c421ce17f019 (diff)
* lib/cgi.rb (CGI#initialize): improvement for mod_ruby.
thanks to Sean Chittenden <sean@ruby-lang.org>, Shugo Maeda <shugo@modruby.net> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2623 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--lib/cgi.rb5
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8fe3fd4f3c..ed128f884e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jul 5 05:00:40 2002 Wakou Aoyama <wakou@ruby-lang.org>
+
+ * lib/cgi.rb (CGI#initialize): improvement for mod_ruby.
+ thanks to Sean Chittenden <sean@ruby-lang.org>, Shugo Maeda
+ <shugo@modruby.net>
+
Thu Jul 4 23:43:26 2002 Minero Aoki <aamine@loveruby.net>
* parse.y: remove useless function str_extend_p().
diff --git a/lib/cgi.rb b/lib/cgi.rb
index 2bed0bdec4..eb476923e9 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -1897,7 +1897,10 @@ The hash keys are case sensitive. Ask the samples.
def initialize(type = "query")
- Apache.request.setup_cgi_env if defined?(MOD_RUBY)
+ if defined?(MOD_RUBY) && !ENV.key?("GATEWAY_INTERFACE")
+ Apache.request.setup_cgi_env
+ end
+
extend QueryExtension
if "POST" != env_table['REQUEST_METHOD']
initialize_query() # set @params, @cookies