dgaudet 97/04/16 12:50:02
Modified: src mod_cgi.c
Log:
Close script_in before trying to eat up script_err to prevent a deadlock.
Submitted by: Ralf
Reviewed by: Roy, Dean
Revision Changes Path
1.38 +1 -2 apache/src/mod_cgi.c
Index: mod_cgi.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_cgi.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -C3 -r1.37 -r1.38
*** mod_cgi.c 1997/04/06 07:43:40 1.37
--- mod_cgi.c 1997/04/16 19:49:59 1.38
***************
*** 521,526 ****
--- 521,527 ----
send_http_header(r);
if (!r->header_only)
send_fd(script_in, r);
+ pfclose (r->main ? r->main->pool : r->pool, script_in);
/* Soak up stderr */
soft_timeout("soaking script stderr", r);
***************
*** 528,535 ****
!r->connection->aborted)
continue;
kill_timeout(r);
-
- pfclose (r->main ? r->main->pool : r->pool, script_in);
pfclose (r->main ? r->main->pool : r->pool, script_err);
}
--- 529,534 ----
