Commit d733899d authored by jailletc36's avatar jailletc36
Browse files

Follow up to r1847430. 

- These flags are not for apr_dir_ function. Clarify comment.
- Initialize 'depth', especially when AP_DIR_FLAG_RECURSIVE is explicitelly required.
- Avoid an harmless over-allocation .

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1853302 13f79535-47bb-0310-9956-ffa450edef68
parent f0e04d26

include/httpd.h

+1 −1
Original line number Diff line number Diff line
@@ -2560,7 +2560,7 @@ AP_DECLARE(int) ap_cstr_casecmp(const char *s1, const char *s2); 
AP_DECLARE(int) ap_cstr_casecmpn(const char *s1, const char *s2, apr_size_t n);



/**

 * Default flags for apr_dir_*().

 * Default flags for ap_dir_*fnmatch().

 */

#define AP_DIR_FLAG_NONE      0

server/config.c

+1 −0
Original line number Diff line number Diff line
@@ -1920,6 +1920,7 @@ AP_DECLARE(const char *) ap_process_fnmatch_configs(server_rec *s, 
    w.flags = (optional ? AP_DIR_FLAG_OPTIONAL : AP_DIR_FLAG_NONE) | AP_DIR_FLAG_RECURSIVE;

    w.cb = process_resource_config_cb;

    w.ctx = &cfgs;

    w.depth = 0;



    /* don't require conf/httpd.conf if we have a -C or -c switch */

    if ((ap_server_pre_read_config->nelts

server/util.c

+2 −2
Original line number Diff line number Diff line
@@ -3465,7 +3465,7 @@ static int fname_alphasort(const void *fn1, const void *fn2) 
AP_DECLARE(ap_dir_match_t *)ap_dir_cfgmatch(cmd_parms *cmd, int flags,

        const char *(*cb)(ap_dir_match_t *w, const char *fname), void *ctx)

{

    ap_dir_match_t *w = apr_palloc(cmd->temp_pool, sizeof(cmd_parms));

    ap_dir_match_t *w = apr_palloc(cmd->temp_pool, sizeof(*w));



    w->prefix = apr_pstrcat(cmd->pool, cmd->cmd->name, ": ", NULL);

    w->p = cmd->pool;