diff options
| author | David Reid <dreid@apache.org> | 2001-11-08 23:49:12 +0100 |
|---|---|---|
| committer | David Reid <dreid@apache.org> | 2001-11-08 23:49:12 +0100 |
| commit | 236df424d31478405b4136ff2f4cb137afd0e301 (patch) | |
| tree | 5a140c875277bf9794ce8b33eaa3390119162f78 | |
| parent | Reverse last nights commit - we'll deal with this another way! (diff) | |
| download | apache2-236df424d31478405b4136ff2f4cb137afd0e301.tar.xz apache2-236df424d31478405b4136ff2f4cb137afd0e301.zip | |
Add back in the daemon commands so that User/Group are OK
in the conf file.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91810 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | server/mpm/beos/beos.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/server/mpm/beos/beos.c b/server/mpm/beos/beos.c index fa98a58b04..a872b7654f 100644 --- a/server/mpm/beos/beos.c +++ b/server/mpm/beos/beos.c @@ -375,7 +375,7 @@ static int32 worker_thread(void * dummy) while (!this_worker_should_exit) { apr_int16_t event; apr_status_t ret; - + ret = apr_poll(pollset, &srv, -1); if (ret != APR_SUCCESS) { @@ -438,6 +438,7 @@ static int32 worker_thread(void * dummy) if (!this_worker_should_exit) { rv = apr_accept(&csd, sd, ptrans); + apr_lock_release(accept_mutex); if (rv != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_ERR, rv, ap_server_conf, @@ -452,7 +453,6 @@ static int32 worker_thread(void * dummy) break; } apr_pool_clear(ptrans); - } ap_update_child_status(0, child_slot, SERVER_DEAD, (request_rec*)NULL); @@ -1088,6 +1088,7 @@ static const char *set_threads_per_child (cmd_parms *cmd, void *dummy, const cha } static const command_rec beos_cmds[] = { +BEOS_DAEMON_COMMANDS LISTEN_COMMANDS AP_INIT_TAKE1( "StartServers", set_daemons_to_start, NULL, RSRC_CONF, "Number of child processes launched at server startup"), |