Commit 1252b46f authored by Stefan Eissing's avatar Stefan Eissing
Browse files

backport 

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

STATUS

+0 −9
Original line number Diff line number Diff line
@@ -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().

server/core.c

+2 −2
Original line number Diff line number Diff line
@@ -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";

server/util_mutex.c

+2 −1
Original line number Diff line number Diff line
@@ -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);

    }