From: Jim Jagielski <jim@apache.org>
Date: Wed, 19 Jan 2011 13:08:08 +0000 (+0000)
Subject: Make it clear that '_' is a possible char and accepted
X-Git-Tag: 2.3.11~161
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=334ae2f5a2c409b9a1fdebea2382b04b78c5c17c;p=apache

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

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

diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 4add24d42e..c08c1782af 100644
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -297,7 +297,7 @@
  * 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 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" */
diff --git a/include/httpd.h b/include/httpd.h
index e85620d092..5268c57aac 100644
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -1829,8 +1829,8 @@ AP_DECLARE(apr_status_t) ap_timeout_parameter_parse(
 AP_DECLARE(int) ap_request_has_body(request_rec *r);
     
 /**
- * Cleanup a string.
- * We only allow alphanumeric chars. Non-printable
+ * Cleanup a string (mainly to be filesystem safe)
+ * We only allow '_' and alphanumeric chars. Non-printable
  * map to 'x' and all others map to '_'
  *
  * @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
  * @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.
- * We only allow alphanumeric chars. Non-printable
+ * Cleanup a string (mainly to be filesystem safe)
+ * We only allow '_' and alphanumeric chars. Non-printable
  * map to 'x' and all others map to '_'
  *
  * @param  src string to clean up
  * @param  dest cleaned up, pre-allocated string
  * @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 */
 /**
diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c
index 276ae48b6d..0923253ed2 100644
--- a/modules/proxy/mod_proxy_balancer.c
+++ b/modules/proxy/mod_proxy_balancer.c
@@ -736,7 +736,7 @@ static int balancer_post_config(apr_pool_t *pconf, apr_pool_t *plog,
             ap_slotmem_instance_t *new = NULL;
 
             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 */
             rv = ap_global_mutex_create(&(balancer->mutex), NULL, balancer_mutex_type,
diff --git a/server/util.c b/server/util.c
index d78a075b53..97f41610e8 100644
--- a/server/util.c
+++ b/server/util.c
@@ -2256,7 +2256,7 @@ AP_DECLARE_NONSTD(apr_status_t) ap_pool_cleanup_set_null(void *data_)
     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++)
     {
@@ -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);
     if (!*dest)