stas 2004/02/13 20:50:32
Modified: src/modules/perl modperl_env.c
Log:
move modperl_env_default_populate to where it was before (after
modperl_env_table_populate), so that GATEWAY_INTERFACE will be
CGI-Perl/1.1 and not CGI/1.1.
Revision Changes Path
1.31 +6 -3 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.30
retrieving revision 1.31
diff -u -u -r1.30 -r1.31
--- modperl_env.c 12 Feb 2004 23:06:24 -0000 1.30
+++ modperl_env.c 14 Feb 2004 04:50:32 -0000 1.31
@@ -309,12 +309,15 @@
ap_add_common_vars(r);
ap_add_cgi_vars(r);
-#ifdef MP_COMPAT_1X
- modperl_env_default_populate(aTHX); /* reset GATEWAY_INTERFACE */
-#endif
}
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
