httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/server mpm_common.c
Date Thu, 07 Jun 2001 15:18:33 GMT
trawick     01/06/07 08:18:32

  Modified:    server   mpm_common.c
  Log:
  improve ap_mpm_pod_signal() by not let it loop until it fills the pipe
  
  it still doesn't handle the pipe being full for other reasons (bazillions
  of child processes?), but I'm not sure that is a real occurrence
  
  Revision  Changes    Path
  1.49      +7 -12     httpd-2.0/server/mpm_common.c
  
  Index: mpm_common.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm_common.c,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- mpm_common.c	2001/06/07 00:09:15	1.48
  +++ mpm_common.c	2001/06/07 15:18:28	1.49
  @@ -394,18 +394,13 @@
       apr_size_t one = 1;
   
       do {
  -        if ((rv = apr_file_write(pod->pod_out, &char_of_death, &one))
  -                                 != APR_SUCCESS) {
  -            if (APR_STATUS_IS_EINTR(rv)) {
  -                continue;
  -            }
  -            else {
  -                ap_log_error(APLOG_MARK, APLOG_WARNING, rv, ap_server_conf,
  -                             "write pipe_of_death");
  -                return rv;
  -            }
  -        }
  -    } while (1);
  +        rv = apr_file_write(pod->pod_out, &char_of_death, &one);
  +    } while (APR_STATUS_IS_EINTR(rv));
  +    if (rv != APR_SUCCESS) {
  +        ap_log_error(APLOG_MARK, APLOG_WARNING, rv, ap_server_conf,
  +                     "write pipe_of_death");
  +        return rv;
  +    }
       
       apr_sockaddr_info_get(&sa, "127.0.0.1", APR_UNSPEC, ap_listeners->bind_addr->port,
0, pod->p);
       apr_socket_create(&sock, sa->family, SOCK_STREAM, pod->p);
  
  
  

Mime
View raw message