From: Christophe Jaillet <jailletc36@apache.org>
Date: Thu, 25 Feb 2016 21:00:46 +0000 (+0000)
Subject: Save a few bytes in conf pool when parsing 'Mutex' directive on some OS.
X-Git-Tag: 2.5.0-alpha~2007
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96588779122077892b8a99872dc53b31e14409e3;p=thirdparty%2Fapache%2Fhttpd.git

Save a few bytes in conf pool when parsing 'Mutex' directive on some OS.

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

diff --git a/server/util_mutex.c b/server/util_mutex.c
index 72bb8f6e061..fedd0332a59 100644
--- a/server/util_mutex.c
+++ b/server/util_mutex.c
@@ -165,6 +165,7 @@ AP_DECLARE_NONSTD(const char *)ap_set_mutex(cmd_parms *cmd, void *dummy,
                                             const char *arg)
 {
     apr_pool_t *p = cmd->pool;
+    apr_pool_t *ptemp = cmd->temp_pool;
     const char **elt;
     const char *mechdir;
     int no_mutex = 0, omit_pid = 0;
@@ -191,7 +192,7 @@ AP_DECLARE_NONSTD(const char *)ap_set_mutex(cmd_parms *cmd, void *dummy,
                            " (" AP_ALL_AVAILABLE_MUTEXES_STRING ")", NULL);
     }
     else if (rv == APR_BADARG
-             || (mutexdir && !ap_is_directory(p, mutexdir))) {
+             || (mutexdir && !ap_is_directory(ptemp, mutexdir))) {
         return apr_pstrcat(p, "Invalid Mutex directory in argument ",
                            mechdir, NULL);
     }