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/threaded threaded.c
Date Tue, 26 Jun 2001 16:33:19 GMT
trawick     01/06/26 09:33:18

  Modified:    server/mpm/threaded threaded.c
  Log:
  get rid of a duplicate assignment of ap_server_conf
  
  Revision  Changes    Path
  1.36      +2 -1      httpd-2.0/server/mpm/threaded/threaded.c
  
  Index: threaded.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/threaded/threaded.c,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- threaded.c	2001/06/15 18:33:09	1.35
  +++ threaded.c	2001/06/26 16:33:14	1.36
  @@ -1067,6 +1067,7 @@
   
       pconf = _pconf;
       ap_server_conf = s;
  +
       rv = apr_file_pipe_create(&pipe_of_death_in, &pipe_of_death_out, pconf);
       if (rv != APR_SUCCESS) {
           ap_log_error(APLOG_MARK, APLOG_ERR, rv,
  @@ -1081,7 +1082,7 @@
                        "apr_file_pipe_timeout_set (pipe_of_death)");
           exit(1);
       }
  -    ap_server_conf = s;
  +
       if ((num_listensocks = ap_setup_listeners(ap_server_conf)) < 1) {
           /* XXX: hey, what's the right way for the mpm to indicate a fatal error? */
           ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ALERT, 0, s,
  
  
  

Mime
View raw message