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/prefork prefork.c
Date Thu, 07 Jun 2001 16:49:10 GMT
trawick     01/06/07 09:49:09

  Modified:    server/mpm/prefork prefork.c
  Log:
  check the pod in the child at a different spot so that we check it
  when we get a new connection; we were (essentially) never checking it
  before
  
  we check it when weird errors occur too but that shouldn't matter
  
  Revision  Changes    Path
  1.178     +2 -2      httpd-2.0/server/mpm/prefork/prefork.c
  
  Index: prefork.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/prefork/prefork.c,v
  retrieving revision 1.177
  retrieving revision 1.178
  diff -u -r1.177 -r1.178
  --- prefork.c	2001/06/07 00:09:16	1.177
  +++ prefork.c	2001/06/07 16:49:03	1.178
  @@ -665,8 +665,6 @@
   		    clean_child_exit(0);
   		}
   		stat = apr_accept(&csd, sd, ptrans);
  -		if (stat == APR_SUCCESS || !APR_STATUS_IS_EINTR(stat))
  -		    break;
                   /* In reality, this could be done later, but to keep it
                    * consistent with MPMs that have a thread race-condition,
                    * we will do it here.
  @@ -674,6 +672,8 @@
                   if (!ap_mpm_pod_check(pod)) {
                       die_now = 1;
                   }
  +		if (stat == APR_SUCCESS || !APR_STATUS_IS_EINTR(stat))
  +		    break;
   	    }
   
   	    if (stat == APR_SUCCESS)
  
  
  

Mime
View raw message