httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jaillet...@apache.org
Subject svn commit: r1732369 - /httpd/httpd/trunk/server/util_mutex.c
Date Thu, 25 Feb 2016 21:00:46 GMT
Author: jailletc36
Date: Thu Feb 25 21:00:46 2016
New Revision: 1732369

URL: http://svn.apache.org/viewvc?rev=1732369&view=rev
Log:
Save a few bytes in conf pool when parsing 'Mutex' directive on some OS.

Modified:
    httpd/httpd/trunk/server/util_mutex.c

Modified: httpd/httpd/trunk/server/util_mutex.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_mutex.c?rev=1732369&r1=1732368&r2=1732369&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_mutex.c (original)
+++ httpd/httpd/trunk/server/util_mutex.c Thu Feb 25 21:00:46 2016
@@ -165,6 +165,7 @@ AP_DECLARE_NONSTD(const char *)ap_set_mu
                                             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_mu
                            " (" 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);
     }



Mime
View raw message