Commit 5dcb0ed7 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

keep mod_cgid from segfaulting on SIGHUP; it assumed 

access to a pid, but that wasn't passed to apr_register_other_child


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87950 13f79535-47bb-0310-9956-ffa450edef68
parent 23d8ef44

modules/generators/mod_cgid.c

+3 −3
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ static char **create_argv(apr_pool_t *p, char *path, char *user, char *group, 
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:
@@ -563,7 +563,7 @@ static void cgid_init(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp, 
        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

    }

}