]> granicus.if.org Git - apache/commitdiff
Recover from some APR cont --> pool conversions by D. Reid.
authorBill Stoddard <stoddard@apache.org>
Mon, 9 Jul 2001 14:44:32 +0000 (14:44 +0000)
committerBill Stoddard <stoddard@apache.org>
Mon, 9 Jul 2001 14:44:32 +0000 (14:44 +0000)
Submitted by: Mladen Turk

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89522 13f79535-47bb-0310-9956-ffa450edef68

server/mpm/winnt/service.c

index 474402a0b5848a96dfb110740b46ca6c1261dc5a..523bf92970bed091934f5f79673f4f3396f2ac42 100644 (file)
@@ -517,7 +517,7 @@ static void __stdcall service_nt_main_fn(DWORD argc, LPTSTR *argv)
     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 @@ static void __stdcall service_nt_main_fn(DWORD argc, LPTSTR *argv)
         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) */