httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dr...@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/mpm/beos beos.c scoreboard.c
Date Wed, 09 Aug 2000 10:23:50 GMT
dreid       00/08/09 03:23:50

  Modified:    src/modules/mpm/beos beos.c scoreboard.c
  Log:
  Some tidying up of the beos mpm.
  
  Revision  Changes    Path
  1.20      +4 -3      apache-2.0/src/modules/mpm/beos/beos.c
  
  Index: beos.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/beos/beos.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- beos.c	2000/08/06 06:07:39	1.19
  +++ beos.c	2000/08/09 10:23:49	1.20
  @@ -442,8 +442,9 @@
           }
       got_fd:
           if (!this_worker_should_exit) {
  +            rv = apr_accept(&csd, sd, ptrans);
               apr_unlock(accept_mutex);
  -            if ((rv = apr_accept(&csd, sd, ptrans)) != APR_SUCCESS) {
  +            if (rv != APR_SUCCESS) {
                   ap_log_error(APLOG_MARK, APLOG_ERR, rv, ap_server_conf,
                     "apr_accept");
               } else {
  @@ -591,7 +592,7 @@
   static void server_main_loop(int remaining_threads_to_start)
   {
       int child_slot;
  -    apr_wait_t status;
  +    ap_wait_t status;
       apr_proc_t pid;
       int i;
   
  @@ -599,7 +600,7 @@
           ap_wait_or_timeout(&status, &pid, pconf);
            
           if (pid.pid >= 0) {
  -            ap_process_child_status(pid.pid, status);
  +            ap_process_child_status(&pid, status);
               /* non-fatal death... note that it's gone in the scoreboard. */
               child_slot = -1;
               for (i = 0; i < ap_max_child_assigned; ++i) {
  
  
  
  1.4       +1 -1      apache-2.0/src/modules/mpm/beos/scoreboard.c
  
  Index: scoreboard.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/beos/scoreboard.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- scoreboard.c	2000/08/02 05:27:03	1.3
  +++ scoreboard.c	2000/08/09 10:23:49	1.4
  @@ -191,7 +191,7 @@
               break;
           }
           array_slot = apr_push_array(key_list);
  -        *array_slot = apr_pstrdup(p, ss->key);
  +        *array_slot = (char*)apr_pstrdup(p, ss->key);
           i++;
       }
       return key_list;
  
  
  

Mime
View raw message