You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2001/02/01 23:09:13 UTC
cvs commit: httpd-2.0/modules/generators mod_cgid.c
trawick 01/02/01 14:09:12
Modified: modules/generators mod_cgid.c
Log:
keep mod_cgid from segfaulting on SIGHUP; it assumed
access to a pid, but that wasn't passed to apr_register_other_child
Revision Changes Path
1.66 +3 -3 httpd-2.0/modules/generators/mod_cgid.c
Index: mod_cgid.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/generators/mod_cgid.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- mod_cgid.c 2001/01/31 22:45:17 1.65
+++ mod_cgid.c 2001/02/01 22:09:08 1.66
@@ -210,7 +210,7 @@
static void cgid_maint(int reason, void *data, apr_wait_t status)
{
#if APR_HAS_OTHER_CHILD
- int *sd = data;
+ pid_t *sd = data;
switch (reason) {
case APR_OC_REASON_DEATH:
case APR_OC_REASON_LOST:
@@ -558,12 +558,12 @@
cgid_server(main_server);
exit(-1);
}
- procnew = apr_pcalloc(p, sizeof(*procnew));
+ procnew = apr_pcalloc(p, sizeof(*procnew));
procnew->pid = pid;
procnew->err = procnew->in = procnew->out = NULL;
apr_note_subprocess(p, procnew, kill_after_timeout);
#if APR_HAS_OTHER_CHILD
- apr_register_other_child(procnew, cgid_maint, NULL, NULL, p);
+ apr_register_other_child(procnew, cgid_maint, &procnew->pid, NULL, p);
#endif
}
}