Commit 38fbba29 authored by Paul Querna's avatar Paul Querna
Browse files

'generate_name' is too generic to be in the public symbols. Rename it to... 

'generate_name' is too generic to be in the public symbols. Rename it to ap_cache_generate_name. No functional changes.


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

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ Changes with Apache 2.1.5 














  [Remove entries to the current 2.0 section below, when backported]



























  *) mod_cache: Rename 'generate_name' to 'ap_cache_generate_name'. 













     [Paul Querna]



























  *) SECURITY: CAN-2005-1268 (cve.mitre.org)















     mod_ssl: Fix possible crash on printing CRL details when















     debugging is enabled, if configured to use a CRL from

































modules/cache/cache_util.c



+2
−2






























Original line number
Diff line number
Diff line








@@ -489,7 +489,7 @@ static void cache_hash(const char *it, char *val, int ndepth, int nlength)













    val[i + 22 - k] = '\0';















}





























CACHE_DECLARE(char *)generate_name(apr_pool_t *p, int dirlevels,













CACHE_DECLARE(char *)ap_cache_generate_name(apr_pool_t *p, int dirlevels,















                                            int dirlength, const char *name)















{















    char hashfile[66];

































modules/cache/mod_cache.h



+3
−3






























Original line number
Diff line number
Diff line








@@ -253,7 +253,7 @@ CACHE_DECLARE(void) ap_cache_accept_headers(cache_handle_t *h, request_rec *r,





























CACHE_DECLARE(apr_time_t) ap_cache_hex2usec(const char *x);















CACHE_DECLARE(void) ap_cache_usec2hex(apr_time_t j, char *y);













CACHE_DECLARE(char *) generate_name(apr_pool_t *p, int dirlevels, 













CACHE_DECLARE(char *) ap_cache_generate_name(apr_pool_t *p, int dirlevels, 















                                             int dirlength, 















                                             const char *name);















CACHE_DECLARE(cache_provider_list *)ap_cache_get_providers(request_rec *r, cache_server_conf *conf, const char *url);

































modules/cache/mod_disk_cache.c



+4
−4






























Original line number
Diff line number
Diff line








@@ -112,8 +112,8 @@ static char *header_file(apr_pool_t *p, disk_cache_conf *conf,













                         disk_cache_object_t *dobj, const char *name)















{















    if (!dobj->hashfile) {













        dobj->hashfile = generate_name(p, conf->dirlevels, conf->dirlength,













                                       name);













        dobj->hashfile = ap_cache_generate_name(p, conf->dirlevels, 













                                                conf->dirlength, name);















    }















    return apr_pstrcat(p, conf->cache_root, "/", dobj->hashfile,















                       CACHE_HEADER_SUFFIX, NULL);









@@ -123,8 +123,8 @@ static char *data_file(apr_pool_t *p, disk_cache_conf *conf,













                       disk_cache_object_t *dobj, const char *name)















{















    if (!dobj->hashfile) {













        dobj->hashfile = generate_name(p, conf->dirlevels, conf->dirlength,













                                       name);













        dobj->hashfile = ap_cache_generate_name(p, conf->dirlevels, 













                                                conf->dirlength, name);















    }















    return apr_pstrcat(p, conf->cache_root, "/", dobj->hashfile,















                       CACHE_DATA_SUFFIX, NULL);