]> granicus.if.org Git - apache/commitdiff
Save a few bytes in conf pool when parsing 'Mutex' directive on some OS.
authorChristophe Jaillet <jailletc36@apache.org>
Thu, 25 Feb 2016 21:00:46 +0000 (21:00 +0000)
committerChristophe Jaillet <jailletc36@apache.org>
Thu, 25 Feb 2016 21:00:46 +0000 (21:00 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1732369 13f79535-47bb-0310-9956-ffa450edef68

server/util_mutex.c

index 72bb8f6e0611cc306aef016f42fe62e847ad1847..fedd0332a59b30a00873ed7b2bb29056c6f8fe2f 100644 (file)
@@ -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);
     }