Commit 2eeb1487 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

Build (and do so cleanly) when !APR_HAS_OTHER_CHILD. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88986 13f79535-47bb-0310-9956-ffa450edef68
parent 07db30e6

modules/generators/mod_cgid.c

+2 −2
Original line number Diff line number Diff line
@@ -226,9 +226,9 @@ static char **create_argv(apr_pool_t *p, char *path, char *user, char *group, 
    return av;

}



#if APR_HAS_OTHER_CHILD

static void cgid_maint(int reason, void *data, apr_wait_t status)

{

#if APR_HAS_OTHER_CHILD

    pid_t *sd = data;

    switch (reason) {

        case APR_OC_REASON_DEATH:
@@ -246,8 +246,8 @@ static void cgid_maint(int reason, void *data, apr_wait_t status) 
            kill(*sd, SIGHUP);

            break;

    }

#endif

}

#endif



static void get_req(int fd, request_rec *r, char **argv0, char ***env, int *req_type) 

{

server/mpm_common.c

+4 −1
Original line number Diff line number Diff line
@@ -170,7 +170,9 @@ void ap_reclaim_child_processes(int terminate) 
                break;

            }

        }

#if APR_HAS_OTHER_CHILD

        apr_proc_other_child_check();

#endif

        if (!not_dead_yet) {

            /* nothing left to wait for */

            break;
@@ -288,7 +290,8 @@ AP_DECLARE(uid_t) ap_uname2id(const char *name) 
    if (name[0] == '#')

        return (atoi(&name[1]));



    if (!(ent = getpwnam(name))) {                                                      ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "%s: bad user name %s", ap_server_argv0, name);

    if (!(ent = getpwnam(name))) {

        ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "%s: bad user name %s", ap_server_argv0, name);

        exit(1);

    }

    return (ent->pw_uid);