Commit a8aa2d88 authored by Graham Leggett's avatar Graham Leggett
Browse files

mod_userdir: Constify and save a few bytes in the conf pool when parsing 

"UserDir" directive

Submitted by: jailletc36
Reviewed by: jim, minfrin


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

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ 


Changes with Apache 2.4.21



  *) mod_userdir: Constify and save a few bytes in the conf pool when

     parsing the "UserDir" directive. [Christophe Jaillet]



  *) mod_cache: Fix (max-stale with no '=') and enforce (check

     integers after '=') Cache-Control header parsing.

     [Christophe Jaillet]

STATUS

+0 −5
Original line number Diff line number Diff line
@@ -114,11 +114,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  *) mod_userdir: Constify and save a few bytes in the conf pool when parsing

     "UserDir" directive

     trunk patch: http://svn.apache.org/r1745835

     2.4.x: trunk works

     +1: jailletc36, jim, minfrin





PATCHES PROPOSED TO BACKPORT FROM TRUNK:

modules/mappers/mod_userdir.c

+4 −4
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ module AP_MODULE_DECLARE_DATA userdir_module; 


typedef struct {

    int globally_disabled;

    char *userdir;

    const char *userdir;

    apr_table_t *enabled_users;

    apr_table_t *disabled_users;

} userdir_config;
@@ -137,7 +137,7 @@ static const char *set_user_dir(cmd_parms *cmd, void *dummy, const char *arg) 
                                                 &userdir_module);

    char *username;

    const char *usernames = arg;

    char *kw = ap_getword_conf(cmd->pool, &usernames);

    char *kw = ap_getword_conf(cmd->temp_pool, &usernames);

    apr_table_t *usertable;



    /* Since we are a raw argument, it is possible for us to be called with
@@ -173,7 +173,7 @@ static const char *set_user_dir(cmd_parms *cmd, void *dummy, const char *arg) 
         * If the first (only?) value isn't one of our keywords, just copy

         * the string to the userdir string.

         */

        s_cfg->userdir = apr_pstrdup(cmd->pool, arg);

        s_cfg->userdir = arg;

        return NULL;

    }

    /*
@@ -182,7 +182,7 @@ static const char *set_user_dir(cmd_parms *cmd, void *dummy, const char *arg) 
     */

    while (*usernames) {

        username = ap_getword_conf(cmd->pool, &usernames);

        apr_table_setn(usertable, username, kw);

        apr_table_setn(usertable, username, "1");

    }

    return NULL;

}