You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ma...@hyperreal.org on 1999/07/16 21:45:49 UTC

cvs commit: apache-apr/pthreads/src/main http_main.c

manoj       99/07/16 12:45:49

  Modified:    pthreads/src/main http_main.c
  Log:
  Ralf noted that accept_mutex_child_init() has to be done before changing
  the child's UID for platforms using the flock() mutex. Fix it in this
  tree.
  
  Revision  Changes    Path
  1.93      +2 -1      apache-apr/pthreads/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/pthreads/src/main/http_main.c,v
  retrieving revision 1.92
  retrieving revision 1.93
  diff -u -d -u -r1.92 -r1.93
  --- http_main.c	1999/06/10 06:26:09	1.92
  +++ http_main.c	1999/07/16 19:45:48	1.93
  @@ -1843,13 +1843,14 @@
   
       set_group_privs();
   
  +    accept_child_init(pchild, ap_threads_per_child);
  +
       if (!geteuid() && (setuid(ap_user_id) == -1)) {
           ap_log_error(APLOG_MARK, APLOG_ALERT, server_conf,
   		     "setuid: unable to change uid");
   	clean_child_exit(APEXIT_CHILDFATAL);
       }
   
  -    accept_child_init(pchild, ap_threads_per_child);
       ap_child_init_modules(pchild, server_conf);
   
       /*done with init critical section */