Rename the ap_escape_path_segment_b function as suggested by

Ruediger Pluem, and make a corresponding minor bump.

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

diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 5aa047bfe5c58e74262955f646d595e4a9faa11a..db4027e196cd9cbac3c08006887a12ecb8c5e7b4 100644 (file)
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -154,6 +154,7 @@
  * 20071108.12(2.3.0-dev)  Remove ap_expr_clone from the API (same day it was added)
  * 20080403.0 (2.3.0-dev)  Add condition field to core dir config
  * 20080403.1 (2.3.0-dev)  Add authn/z hook and provider registration wrappers.
+ * 20080403.2 (2.3.0-dev)  Add ap_escape_path_segment_buffer() and ap_unescape_all().
  */
 
 #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
@@ -161,7 +162,7 @@
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
 #define MODULE_MAGIC_NUMBER_MAJOR 20080403
 #endif
-#define MODULE_MAGIC_NUMBER_MINOR 1                     /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 2                     /* 0...n */
 
 /**
  * Determine if the server's current MODULE_MAGIC_NUMBER is at least a

diff --git a/include/httpd.h b/include/httpd.h
index 0b631070f927e9d4197a4c145de34edc8773f129..02c4cb347a2ffd08c78e648ef3634529024031a4 100644 (file)
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -1482,7 +1482,7 @@ AP_DECLARE(char *) ap_escape_path_segment(apr_pool_t *p, const char *s);
  * @param s The path to convert
  * @return The converted URL (c)
  */
-AP_DECLARE(char *) ap_escape_path_segment_b(char *c, const char *s);
+AP_DECLARE(char *) ap_escape_path_segment_buffer(char *c, const char *s);
 
 /**
  * convert an OS path to a URL in an OS dependant way.

diff --git a/server/util.c b/server/util.c
index 5b6a522b65ecc1ed970ca78244db383454f2ecc7..d052624866acf7003387e16e0fb6456b86cccca5 100644 (file)
--- a/server/util.c
+++ b/server/util.c
@@ -1690,7 +1690,7 @@ static APR_INLINE unsigned char *c2x(unsigned what, unsigned char prefix,
  * something with a '/' in it (and thus does not prefix "./").
  */
 
-AP_DECLARE(char *) ap_escape_path_segment_b(char *copy, const char *segment)
+AP_DECLARE(char *) ap_escape_path_segment_buffer(char *copy, const char *segment)
 {
     const unsigned char *s = (const unsigned char *)segment;
     unsigned char *d = (unsigned char *)copy;
@@ -1711,7 +1711,7 @@ AP_DECLARE(char *) ap_escape_path_segment_b(char *copy, const char *segment)
 
 AP_DECLARE(char *) ap_escape_path_segment(apr_pool_t *p, const char *segment)
 {
-    return ap_escape_path_segment_b(apr_palloc(p, 3 * strlen(segment) + 1), segment);
+    return ap_escape_path_segment_buffer(apr_palloc(p, 3 * strlen(segment) + 1), segment);
 }
 
 AP_DECLARE(char *) ap_os_escape_path(apr_pool_t *p, const char *path, int partial)