httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Brian Behlendorf <br...@hyperreal.org>
Subject Re: mod_include broken?
Date Tue, 19 May 1998 19:55:50 GMT

Ben, is this how, in general, one would change occurances of spawn_child
to ap_spawn_child_err_buff?  Seems simple enough but this is unfamiliar
enough to me that I thought I would seek a second opinion.

Index: mod_include.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_include.c,v
retrieving revision 1.88
diff -u -r1.88 mod_include.c
--- mod_include.c	1998/05/19 19:19:01	1.88
+++ mod_include.c	1998/05/19 19:51:22
@@ -811,20 +811,18 @@
 static int include_cmd(char *s, request_rec *r)
 {
     include_cmd_arg arg;
-    FILE *f;
+    BUFF *script_out, *script_in, *script_err;
 
     arg.r = r;
     arg.s = s;
 
-    if (!spawn_child(r->pool, include_cmd_child, &arg,
-                     kill_after_timeout, NULL, &f)) {
+    if (!ap_spawn_child_err_buff(r->pool, include_cmd_child, &arg,
+                     kill_after_timeout, &script_out, &script_in, &script_err))
{
         return -1;
     }
 
-    ap_send_fd(f, r);
-    ap_pfclose(r->pool, f);        /* will wait for zombie when
-                                 * r->pool is cleared
-                                 */
+    ap_send_fb(script_in, r);
+    ap_bclose(script_in);
     return 0;
 }
 #endif


Mime
View raw message