]> granicus.if.org Git - apache/commitdiff
Add back in the daemon commands so that User/Group are OK
authorDavid Reid <dreid@apache.org>
Thu, 8 Nov 2001 22:49:12 +0000 (22:49 +0000)
committerDavid Reid <dreid@apache.org>
Thu, 8 Nov 2001 22:49:12 +0000 (22:49 +0000)
in the conf file.

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

server/mpm/beos/beos.c

index fa98a58b04de64090700d09464a612461de99b88..a872b7654f9c1174aa27e876290ef4f4ab6223fd 100644 (file)
@@ -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"),