summaryrefslogtreecommitdiffstats
path: root/include/util_mutex.h
diff options
context:
space:
mode:
authorJeff Trawick <trawick@apache.org>2010-02-22 18:16:29 +0100
committerJeff Trawick <trawick@apache.org>2010-02-22 18:16:29 +0100
commitec56aba06fbeabc8349dd81483f66fbb66aeeea2 (patch)
tree6ff3c62f756ba2e923a20fd9f1a2b76b1f74c013 /include/util_mutex.h
parentFix translation error in Polish 404 error message. (diff)
downloadapache2-ec56aba06fbeabc8349dd81483f66fbb66aeeea2.tar.xz
apache2-ec56aba06fbeabc8349dd81483f66fbb66aeeea2.zip
Fix startup segfault when the Mutex directive is used but no loaded
modules use httpd mutexes. Add an init call from core's pre-config hook to ensure init is performed before the config is parsed. PR: 48787 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@912666 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include/util_mutex.h')
-rw-r--r--include/util_mutex.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/util_mutex.h b/include/util_mutex.h
index e9dde52705..935e94e998 100644
--- a/include/util_mutex.h
+++ b/include/util_mutex.h
@@ -103,6 +103,9 @@ AP_DECLARE(apr_status_t) ap_parse_mutex(const char *arg, apr_pool_t *pool,
AP_DECLARE_NONSTD(const char *) ap_set_mutex(cmd_parms *cmd, void *dummy,
const char *arg);
+/* private function to initialize Mutex infrastructure */
+AP_DECLARE_NONSTD(void) ap_mutex_init(apr_pool_t *p);
+
/**
* option flags for ap_mutex_register(), ap_global_mutex_create(), and
* ap_proc_mutex_create()