stas 2004/03/03 15:28:03
Modified: src/modules/perl modperl_env.c
t/response/TestModules cgi.pm
. Changes
Log:
Drop the support for making GATEWAY_INTERFACE special. It's not needed
as $ENV{MOD_PERL}, available in both mod_perl generations, should be
used to test whether the code is running under mod_perl.
Revision Changes Path
1.32 +0 -9 modperl-2.0/src/modules/perl/modperl_env.c
Index: modperl_env.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_env.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -u -r1.31 -r1.32
--- modperl_env.c 14 Feb 2004 04:50:32 -0000 1.31
+++ modperl_env.c 3 Mar 2004 23:28:02 -0000 1.32
@@ -54,9 +54,6 @@
static modperl_env_ent_t MP_env_const_vars[] = {
MP_ENV_ENT("MOD_PERL", MP_VERSION_STRING),
-#ifdef MP_COMPAT_1X
- MP_ENV_ENT("GATEWAY_INTERFACE", "CGI-Perl/1.1"),
-#endif
{ NULL }
};
@@ -312,12 +309,6 @@
}
modperl_env_table_populate(aTHX_ r->subprocess_env);
-
-#ifdef MP_COMPAT_1X
- if (! MpReqSETUP_ENV(rcfg)) {
- modperl_env_default_populate(aTHX); /* reset GATEWAY_INTERFACE */
- }
-#endif
/* don't set up CGI variables again this request.
* this also triggers modperl_env_request_unpopulate, which
1.12 +1 -6 modperl-2.0/t/response/TestModules/cgi.pm
Index: cgi.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestModules/cgi.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -u -r1.11 -r1.12
--- cgi.pm 22 May 2002 18:53:33 -0000 1.11
+++ cgi.pm 3 Mar 2004 23:28:03 -0000 1.12
@@ -15,11 +15,6 @@
die "\$ENV{MOD_PERL} is not set";
}
- my $gw = $ENV{GATEWAY_INTERFACE} || '';
- unless ($gw eq 'CGI-Perl/1.1') {
- die "\$ENV{GATEWAY_INTERFACE} is not properly set ($gw)";
- }
-
if ($CGI::Q) {
die "CGI.pm globals were not reset";
}
@@ -55,4 +50,4 @@
1;
__END__
SetHandler perl-script
-
+PerlOptions -SetupEnv
1.338 +4 -0 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -u -r1.337 -r1.338
--- Changes 3 Mar 2004 06:03:11 -0000 1.337
+++ Changes 3 Mar 2004 23:28:03 -0000 1.338
@@ -12,6 +12,10 @@
=item 1.99_13-dev
+Drop the support for making GATEWAY_INTERFACE special. It's not needed
+as $ENV{MOD_PERL}, available in both mod_perl generations, should be
+used to test whether the code is running under mod_perl. [Stas]
+
Handle correctly the situation when response HTTP headers are printed
from the handler and the response body starts with \000, which is the
case with some images like .ico. [Stas]
