httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1060802 - in /httpd/httpd/trunk: include/ap_mmn.h include/httpd.h modules/proxy/mod_proxy_balancer.c server/util.c
Date Wed, 19 Jan 2011 13:08:09 GMT
Author: jim
Date: Wed Jan 19 13:08:08 2011
New Revision: 1060802

URL: http://svn.apache.org/viewvc?rev=1060802&view=rev
Log:
Make it clear that '_' is a possible char and accepted

Modified:
    httpd/httpd/trunk/include/ap_mmn.h
    httpd/httpd/trunk/include/httpd.h
    httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c
    httpd/httpd/trunk/server/util.c

Modified: httpd/httpd/trunk/include/ap_mmn.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_mmn.h?rev=1060802&r1=1060801&r2=1060802&view=diff
==============================================================================
--- httpd/httpd/trunk/include/ap_mmn.h (original)
+++ httpd/httpd/trunk/include/ap_mmn.h Wed Jan 19 13:08:08 2011
@@ -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" */

Modified: httpd/httpd/trunk/include/httpd.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/httpd.h?rev=1060802&r1=1060801&r2=1060802&view=diff
==============================================================================
--- httpd/httpd/trunk/include/httpd.h (original)
+++ httpd/httpd/trunk/include/httpd.h Wed Jan 19 13:08:08 2011
@@ -1829,8 +1829,8 @@ AP_DECLARE(apr_status_t) ap_timeout_para
 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(requ
  * @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 */
 /**

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c?rev=1060802&r1=1060801&r2=1060802&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c Wed Jan 19 13:08:08 2011
@@ -736,7 +736,7 @@ static int balancer_post_config(apr_pool
             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,

Modified: httpd/httpd/trunk/server/util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util.c?rev=1060802&r1=1060801&r2=1060802&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util.c (original)
+++ httpd/httpd/trunk/server/util.c Wed Jan 19 13:08:08 2011
@@ -2256,7 +2256,7 @@ AP_DECLARE_NONSTD(apr_status_t) ap_pool_
     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(co
     
 }
 
-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)



Mime
View raw message