www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-11 13:22:44 +03:00
Code Activity

Make it clear that '_' is a possible char and accepted

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1060802 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jim Jagielski
2011-01-19 13:08:08 +00:00
parent ceb1766d2d
commit 334ae2f5a2
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/ap_mmn.h
View File

@@ -297,7 +297,7 @@
* 20110117.0 (2.3.11-dev) Merge <If> sections in separate step (ap_if_walk). * 20110117.0 (2.3.11-dev) Merge <If> sections in separate step (ap_if_walk).
* Add core_dir_config->sec_if. Add ap_add_if_conf(). * Add core_dir_config->sec_if. Add ap_add_if_conf().
* Add pool argument to ap_add_file_conf(). * Add pool argument to ap_add_file_conf().
* 20110117.1 (2.3.11-dev) Add ap_pstr2alnum() and ap_str2alnum() * 20110117.1 (2.3.11-dev) Add ap_pstr2_alnum() and ap_str2_alnum()
*/ */
#define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */ #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */

12
include/httpd.h
View File

@@ -1829,8 +1829,8 @@ AP_DECLARE(apr_status_t) ap_timeout_parameter_parse(
AP_DECLARE(int) ap_request_has_body(request_rec *r); AP_DECLARE(int) ap_request_has_body(request_rec *r);
/** /**
* Cleanup a string. * Cleanup a string (mainly to be filesystem safe)
* We only allow alphanumeric chars. Non-printable * We only allow '_' and alphanumeric chars. Non-printable
* map to 'x' and all others map to '_' * map to 'x' and all others map to '_'
* *
* @param p pool to use to allocate dest * @param p pool to use to allocate dest
@@ -1838,18 +1838,18 @@ AP_DECLARE(int) ap_request_has_body(request_rec *r);
* @param dest cleaned up, allocated string * @param dest cleaned up, allocated string
* @return Status value indicating whether the cleaning was successful or not. * @return Status value indicating whether the cleaning was successful or not.
*/ */
AP_DECLARE(apr_status_t) ap_pstr2alnum(apr_pool_t *p, const char *src, char **dest); AP_DECLARE(apr_status_t) ap_pstr2_alnum(apr_pool_t *p, const char *src, char **dest);
/** /**
* Cleanup a string. * Cleanup a string (mainly to be filesystem safe)
* We only allow alphanumeric chars. Non-printable * We only allow '_' and alphanumeric chars. Non-printable
* map to 'x' and all others map to '_' * map to 'x' and all others map to '_'
* *
* @param src string to clean up * @param src string to clean up
* @param dest cleaned up, pre-allocated string * @param dest cleaned up, pre-allocated string
* @return Status value indicating whether the cleaning was successful or not. * @return Status value indicating whether the cleaning was successful or not.
*/ */
AP_DECLARE(apr_status_t) ap_str2alnum(const char *src, char *dest); AP_DECLARE(apr_status_t) ap_str2_alnum(const char *src, char *dest);
/* Misc system hackery */ /* Misc system hackery */
/** /**

2
modules/proxy/mod_proxy_balancer.c
View File

@@ -736,7 +736,7 @@ static int balancer_post_config(apr_pool_t *pconf, apr_pool_t *plog,
ap_slotmem_instance_t *new = NULL; ap_slotmem_instance_t *new = NULL;
balancer->max_workers = balancer->workers->nelts + balancer->growth; balancer->max_workers = balancer->workers->nelts + balancer->growth;
ap_pstr2alnum(pconf, balancer->name, &balancer->sname); ap_pstr2_alnum(pconf, balancer->name, &balancer->sname);
/* Create global mutex */ /* Create global mutex */
rv = ap_global_mutex_create(&(balancer->mutex), NULL, balancer_mutex_type, rv = ap_global_mutex_create(&(balancer->mutex), NULL, balancer_mutex_type,

4
server/util.c
View File

@@ -2256,7 +2256,7 @@ AP_DECLARE_NONSTD(apr_status_t) ap_pool_cleanup_set_null(void *data_)
return APR_SUCCESS; return APR_SUCCESS;
} }
AP_DECLARE(apr_status_t) ap_str2alnum(const char *src, char *dest) { AP_DECLARE(apr_status_t) ap_str2_alnum(const char *src, char *dest) {
for ( ; *src; src++, dest++) for ( ; *src; src++, dest++)
{ {
@@ -2272,7 +2272,7 @@ AP_DECLARE(apr_status_t) ap_str2alnum(const char *src, char *dest) {
} }
AP_DECLARE(apr_status_t) ap_pstr2alnum(apr_pool_t *p, const char *src, char **dest) AP_DECLARE(apr_status_t) ap_pstr2_alnum(apr_pool_t *p, const char *src, char **dest)
{ {
*dest = apr_palloc(p, strlen(src)+1); *dest = apr_palloc(p, strlen(src)+1);
if (!*dest) if (!*dest)