www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

mod_example_hooks: fix global "trace" string lifetime.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1883709 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2020-11-22 01:08:06 +00:00
parent b11bbeebd6
commit 856e12699d
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/examples/mod_example_hooks.c
View File

@@ -743,7 +743,7 @@ static int x_pre_config(apr_pool_t *pconf, apr_pool_t *plog,
/* /*
* Log the call and exit. * Log the call and exit.
*/ */
trace_startup(ptemp, NULL, NULL, "x_pre_config()"); trace_startup(pconf, NULL, NULL, "x_pre_config()");
return OK; return OK;
} }
@@ -764,7 +764,7 @@ static int x_check_config(apr_pool_t *pconf, apr_pool_t *plog,
/* /*
* Log the call and exit. * Log the call and exit.
*/ */
trace_startup(ptemp, s, NULL, "x_check_config()"); trace_startup(pconf, s, NULL, "x_check_config()");
return OK; return OK;
} }
@@ -801,7 +801,7 @@ static int x_open_logs(apr_pool_t *pconf, apr_pool_t *plog,
/* /*
* Log the call and exit. * Log the call and exit.
*/ */
trace_startup(ptemp, s, NULL, "x_open_logs()"); trace_startup(pconf, s, NULL, "x_open_logs()");
return OK; return OK;
} }
@@ -821,7 +821,7 @@ static int x_post_config(apr_pool_t *pconf, apr_pool_t *plog,
/* /*
* Log the call and exit. * Log the call and exit.
*/ */
trace_startup(ptemp, s, NULL, "x_post_config()"); trace_startup(pconf, s, NULL, "x_post_config()");
return OK; return OK;
} }
@@ -1465,6 +1465,7 @@ static int x_monitor(apr_pool_t *p, server_rec *s)
*/ */
static void x_register_hooks(apr_pool_t *p) static void x_register_hooks(apr_pool_t *p)
{ {
trace = NULL;
ap_hook_pre_config(x_pre_config, NULL, NULL, APR_HOOK_MIDDLE); ap_hook_pre_config(x_pre_config, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_check_config(x_check_config, NULL, NULL, APR_HOOK_MIDDLE); ap_hook_check_config(x_check_config, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_test_config(x_test_config, NULL, NULL, APR_HOOK_MIDDLE); ap_hook_test_config(x_test_config, NULL, NULL, APR_HOOK_MIDDLE);