stas 2004/02/16 17:47:26
Modified: src/modules/perl modperl_io.c
Log:
cleanup
Revision Changes Path
1.24 +4 -6 modperl-2.0/src/modules/perl/modperl_io.c
Index: modperl_io.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_io.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -u -r1.23 -r1.24
--- modperl_io.c 17 Feb 2004 01:22:41 -0000 1.23
+++ modperl_io.c 17 Feb 2004 01:47:26 -0000 1.24
@@ -97,9 +97,7 @@
MP_TRACE_o(MP_FUNC, "start");
- sv_setref_pv(sv, "Apache::RequestRec", (void*)r);
-
- /* STDIN could be closed or invalid */
+ /* if STDIN is open, dup it, to be restored at the end of response */
if (handle && SvTYPE(handle) == SVt_PVGV &&
IoTYPE(GvIO(handle)) != IoTYPE_CLOSED) {
handle_save = gv_fetchpv(Perl_form(aTHX_
@@ -120,6 +118,7 @@
Perl_do_close(aTHX_ handle, TRUE);
}
+ sv_setref_pv(sv, "Apache::RequestRec", (void*)r);
status = Perl_do_open9(aTHX_ handle, "<:Apache", 8, FALSE, O_RDONLY,
0, Nullfp, sv, 1);
if (status == 0) {
@@ -141,9 +140,7 @@
MP_TRACE_o(MP_FUNC, "start");
- sv_setref_pv(sv, "Apache::RequestRec", (void*)r);
-
- /* STDOUT could be closed or invalid */
+ /* if STDOUT is open, dup it, to be restored at the end of response */
if (handle && SvTYPE(handle) == SVt_PVGV &&
IoTYPE(GvIO(handle)) != IoTYPE_CLOSED) {
handle_save = gv_fetchpv(Perl_form(aTHX_
@@ -164,6 +161,7 @@
Perl_do_close(aTHX_ handle, TRUE);
}
+ sv_setref_pv(sv, "Apache::RequestRec", (void*)r);
status = Perl_do_open9(aTHX_ handle, ">:Apache", 8, FALSE, O_WRONLY,
0, Nullfp, sv, 1);
if (status == 0) {
