You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by dr...@apache.org on 2001/11/08 23:49:13 UTC

cvs commit: httpd-2.0/server/mpm/beos beos.c

dreid       01/11/08 14:49:13

  Modified:    server/mpm/beos beos.c
  Log:
  Add back in the daemon commands so that User/Group are OK
  in the conf file.
  
  Revision  Changes    Path
  1.65      +3 -2      httpd-2.0/server/mpm/beos/beos.c
  
  Index: beos.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/beos/beos.c,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- beos.c	2001/11/07 05:29:58	1.64
  +++ beos.c	2001/11/08 22:49:12	1.65
  @@ -375,7 +375,7 @@
           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 @@
   
           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 @@
               break;
           }
           apr_pool_clear(ptrans);
  -
       }
   
       ap_update_child_status(0, child_slot, SERVER_DEAD, (request_rec*)NULL);
  @@ -1088,6 +1088,7 @@
   }
   
   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"),