httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject cvs commit: httpd-2.0/server/mpm/experimental/perchild perchild.c
Date Fri, 11 Oct 2002 15:41:53 GMT
rbb         2002/10/11 08:41:52

  Modified:    server/mpm/experimental/perchild perchild.c
  Log:
  If the server is configured with an accept mutex type that isn't comaptible
  with perchild, then force it to be FCNTL.
  
  PR:	13311
  
  Revision  Changes    Path
  1.135     +8 -0      httpd-2.0/server/mpm/experimental/perchild/perchild.c
  
  Index: perchild.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/experimental/perchild/perchild.c,v
  retrieving revision 1.134
  retrieving revision 1.135
  diff -u -r1.134 -r1.135
  --- perchild.c	11 Oct 2002 15:29:22 -0000	1.134
  +++ perchild.c	11 Oct 2002 15:41:52 -0000	1.135
  @@ -1328,6 +1328,14 @@
   
       ap_server_conf = s;
   
  +    if ((ap_accept_lock_mech == APR_LOCK_SYSVSEM) || 
  +        (ap_accept_lock_mech == APR_LOCK_POSIXSEM)) {
  +        ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s,
  +                     "Server configured for an accept lock mechanism that "
  +                     "cannot be used with perchild.  Falling back to FCNTL.");
  +        ap_accept_lock_mech = APR_LOCK_FCNTL;
  +    }
  +
       /* Initialize cross-process accept lock */
       ap_lock_fname = apr_psprintf(_pconf, "%s.%u",
                                    ap_server_root_relative(_pconf, ap_lock_fname),
  
  
  

Mime
View raw message