httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/winnt mpm_winnt.c
Date Sat, 18 May 2002 21:41:37 GMT
wrowe       02/05/18 14:41:37

  Modified:    server/mpm/winnt mpm_winnt.c
  Log:
    Begin passing about apr types instead of odd local conventions.
    It seems there may be other uses for tracking information within
    an ap_listen_rec, outside of the socket.  One of my hassles (that
    FirstBill found another way around) was tracking the current
    accept socket when the only common data was the listen socket.
  
  Revision  Changes    Path
  1.273     +10 -7     httpd-2.0/server/mpm/winnt/mpm_winnt.c
  
  Index: mpm_winnt.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/winnt/mpm_winnt.c,v
  retrieving revision 1.272
  retrieving revision 1.273
  diff -u -r1.272 -r1.273
  --- mpm_winnt.c	17 May 2002 11:11:39 -0000	1.272
  +++ mpm_winnt.c	18 May 2002 21:41:36 -0000	1.273
  @@ -2284,13 +2284,17 @@
   }
   
   
  -static int winnt_pre_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp) 
  +static int winnt_pre_config(apr_pool_t *pconf_, apr_pool_t *plog, apr_pool_t *ptemp) 
   {
       /* Handle the following SCM aspects in this phase:
        *
        *   -k runservice [WinNT errors logged from rewrite_args]
        */
   
  +    /* Initialize shared static objects. 
  +     */
  +    pconf = pconf_;
  +    
       if (ap_exists_config_define("ONE_PROCESS") ||
           ap_exists_config_define("DEBUG"))
           one_process = -1;
  @@ -2314,16 +2318,11 @@
       return OK;
   }
   
  -static int winnt_post_config(apr_pool_t *pconf_, apr_pool_t *plog, apr_pool_t *ptemp, server_rec*
s)
  +static int winnt_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec*
s)
   {
       static int restart_num = 0;
       apr_status_t rv = 0;
   
  -    /* Initialize shared static objects. 
  -     */
  -    pconf = pconf_;
  -    ap_server_conf = s;
  -    
       /* Handle the following SCM aspects in this phase:
        *
        *   -k install
  @@ -2453,6 +2452,10 @@
    */
   static int winnt_open_logs(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp, server_rec
*s)
   {
  +    /* Initialize shared static objects. 
  +     */
  +    ap_server_conf = s;
  +
       if (parent_pid != my_pid) {
           return OK;
       }
  
  
  

Mime
View raw message