httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/winnt service.c
Date Mon, 09 Jul 2001 14:44:33 GMT
stoddard    01/07/09 07:44:33

  Modified:    server/mpm/winnt service.c
  Log:
  Recover from some APR cont --> pool conversions by D. Reid.
  
  Submitted by: Mladen Turk
  
  Revision  Changes    Path
  1.34      +2 -2      httpd-2.0/server/mpm/winnt/service.c
  
  Index: service.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/winnt/service.c,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- service.c	2001/05/16 18:38:36	1.33
  +++ service.c	2001/07/09 14:44:32	1.34
  @@ -517,7 +517,7 @@
       const char *ignored;
   
       /* args and service names live in the same pool */
  -    mpm_service_set_name(mpm_new_argv->cont, &ignored, argv[0]);
  +    mpm_service_set_name(mpm_new_argv->pool, &ignored, argv[0]);
   
       globdat.ssStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS;
       globdat.ssStatus.dwCurrentState = SERVICE_START_PENDING;
  @@ -585,7 +585,7 @@
           char **cmb_data;
   
           mpm_new_argv->nalloc = mpm_new_argv->nelts + argc - 1;
  -        cmb_data = apr_palloc(mpm_new_argv->cont,
  +        cmb_data = apr_palloc(mpm_new_argv->pool,
                                 mpm_new_argv->nalloc * sizeof(const char *));
   
           /* mpm_new_argv remains first (of lower significance) */
  
  
  

Mime
View raw message