backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1733279 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 96672871d89d13bcad43e77ba2d630616f5a403e..6cccc2624f77ff26e013cae768fffadb8aa35412 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -112,15 +112,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) Save a few bytes in conf pool when parsing some directives
-     Trunk patch:
-         http://svn.apache.org/r1732252
-         http://svn.apache.org/r1732353
-         http://svn.apache.org/r1732369
-     2.4.x patch:
-         Trunk version of patch works
-     +1: jailletc36, ylavic, icing
-
   *) core: Track the useragent_host per-request when mod_remoteip or similar
      modules track a per-request useragent_ip.  Modules should be updated
      to inquire for ap_get_useragent_host() in place of ap_get_remote_host().

diff --git a/server/core.c b/server/core.c
index 024bf8ddc38380171a8ec3307093f8fa9b86112d..7ace95a5e8562ca87b14e42d83e8fa636987035d 100644 (file)
--- a/server/core.c
+++ b/server/core.c
@@ -1455,7 +1455,7 @@ static const char *set_document_root(cmd_parms *cmd, void *dummy,
     /* TODO: ap_configtestonly */
     if (apr_filepath_merge((char**)&conf->ap_document_root, NULL, arg,
                            APR_FILEPATH_TRUENAME, cmd->pool) != APR_SUCCESS
-        || !ap_is_directory(cmd->pool, arg)) {
+        || !ap_is_directory(cmd->temp_pool, arg)) {
         if (cmd->server->is_virtual) {
             ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0,
                           cmd->pool, APLOGNO(00112)
@@ -2897,7 +2897,7 @@ static const char *set_runtime_dir(cmd_parms *cmd, void *dummy, const char *arg)
     }
 
     if ((apr_filepath_merge((char**)&ap_runtime_dir, NULL,
-                            ap_server_root_relative(cmd->pool, arg),
+                            ap_server_root_relative(cmd->temp_pool, arg),
                             APR_FILEPATH_TRUENAME, cmd->pool) != APR_SUCCESS)
         || !ap_is_directory(cmd->temp_pool, ap_runtime_dir)) {
         return "DefaultRuntimeDir must be a valid directory, absolute or relative to ServerRoot";

diff --git a/server/util_mutex.c b/server/util_mutex.c
index e49cca5570e352cb49e2ddedddc522eafe87088a..9605aa482ad514f088b03e37b76dfaf5fc7ecbd2 100644 (file)
--- 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);
     }