diff options
| author | Jeff Trawick <trawick@apache.org> | 2001-05-04 18:42:51 +0000 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2001-05-04 18:42:51 +0000 |
| commit | 7ed1b1021778ecd263b77cfa2abeea86f5fb6925 (patch) | |
| tree | f31860b34b6ba2ebdbb267d4d1f13992d09a211f | |
| parent | cbbb07650c79bdc38af0f10495001ca02bac4440 (diff) | |
| download | httpd-7ed1b1021778ecd263b77cfa2abeea86f5fb6925.tar.gz | |
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
| -rw-r--r-- | modules/generators/mod_cgid.c | 4 | ||||
| -rw-r--r-- | server/mpm_common.c | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c index 40bb90d010..cbb09d3525 100644 --- a/modules/generators/mod_cgid.c +++ b/modules/generators/mod_cgid.c @@ -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) { diff --git a/server/mpm_common.c b/server/mpm_common.c index 784aee3eba..d024c24978 100644 --- a/server/mpm_common.c +++ b/server/mpm_common.c @@ -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); |