stas 2003/03/02 05:26:25
Modified: src/modules/perl mod_perl.c
. Changes
Log:
back out the last change to unbuffer STDOUT, exposing perl context has
opened a big pandora box. will look at it later.
Revision Changes Path
1.153 +3 -10 modperl-2.0/src/modules/perl/mod_perl.c
Index: mod_perl.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.c,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- mod_perl.c 2 Mar 2003 12:16:10 -0000 1.152
+++ mod_perl.c 2 Mar 2003 13:26:25 -0000 1.153
@@ -745,12 +745,10 @@
return modperl_wbucket_flush(rcfg->wbucket);
}
-static int modperl_response_handler_run(pTHX_ request_rec *r, int finish)
+static int modperl_response_handler_run(request_rec *r, int finish)
{
int retval;
- IoFLUSH_off(PL_defoutgv); /* $|=0 */
-
modperl_response_init(r);
retval = modperl_callback_per_dir(MP_RESPONSE_HANDLER, r);
@@ -771,16 +769,11 @@
int modperl_response_handler(request_rec *r)
{
- dTHX;
-
if (!strEQ(r->handler, "modperl")) {
return DECLINED;
}
-
- /* XXX: modperl_response_handler should select perl interpreter
- * just like modperl_response_handler_cgi does */
- return modperl_response_handler_run(aTHX_ r, TRUE);
+ return modperl_response_handler_run(r, TRUE);
}
int modperl_response_handler_cgi(request_rec *r)
@@ -823,7 +816,7 @@
modperl_env_request_tie(aTHX_ r);
- retval = modperl_response_handler_run(aTHX_ r, FALSE);
+ retval = modperl_response_handler_run(r, FALSE);
modperl_io_handle_untie(aTHX_ h_stdout);
modperl_io_handle_untie(aTHX_ h_stdin);
1.138 +0 -3 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- Changes 2 Mar 2003 12:16:10 -0000 1.137
+++ Changes 2 Mar 2003 13:26:25 -0000 1.138
@@ -10,9 +10,6 @@
=item 1.99_09-dev
-make sure that the non-tied STDOUT is buffered before calling the perl
-response handler. [Stas]
-
fix the input filters handling of DECLINED handlers (consume the data,
on behalf of the handler) + tests [Stas]
