optimization:

- add comment about what subst_prefix_path function does
- reduce the use of fixed buffers
- get a rid of unnecessary memory operations

Justin adds:
Fixes // problem and rewrites subst_prefix_path to make it intelligble.

Backport of modules/mappers/mod_rewrite.c r1.162 from httpd-2.1
Submitted by:	Andr� Malo
Reviewed by:	Andr� Malo, Jeff Trawick, Justin Erenkrantz

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

diff --git a/CHANGES b/CHANGES
index 9c7b5630bb1faa132cb3cd0574da48c4a8e5ccb0..40272e389910beaaf4e24860d76798bb58d3780e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
 Changes with Apache 2.0.49
 
+  *) Fix RewriteBase directive to not add double slashes.  [André Malo]
+
   *) Improve 'configure --help' output for some modules.  [Astrid Keßler]
 
   *) Correct UseCanonicalName Off to properly check incoming port number.

diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index ed1d2e4c8397fd541ac4b3d7c1e4f599e6c4e6d3..4d85e855885c616c2e3291292fbca728baa503d2 100644 (file)
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -4229,47 +4229,49 @@ static cacheentry *retrieve_cache_string(cache *c, const char *res, char *key)
 ** +-------------------------------------------------------+
 */
 
+/*
+ * substitute the prefix path 'match' in 'input' with 'subst'
+ * (think of RewriteBase which substitutes the physical path with
+ *  the virtual path)
+ */
+
 static char *subst_prefix_path(request_rec *r, char *input, char *match,
                                const char *subst)
 {
-    char matchbuf[LONG_STRING_LEN];
-    char substbuf[LONG_STRING_LEN];
-    char *output;
-    int l;
-
-    output = input;
+    apr_size_t len = strlen(match);
 
-    /* first create a match string which always has a trailing slash */
-    l = apr_cpystrn(matchbuf, match, sizeof(matchbuf) - 1) - matchbuf;
-    if (!l || matchbuf[l-1] != '/') {
-       matchbuf[l] = '/';
-       matchbuf[l+1] = '\0';
-       l++;
+    if (len && match[len - 1] == '/') {
+        --len;
     }
-    /* now compare the prefix */
-    if (strncmp(input, matchbuf, l) == 0) {
-        rewritelog(r, 5, "strip matching prefix: %s -> %s", output, output+l);
-        output = apr_pstrdup(r->pool, output+l);
 
-        /* and now add the base-URL as replacement prefix */
-        l = apr_cpystrn(substbuf, subst, sizeof(substbuf) - 1) - substbuf;
-        if (!l || substbuf[l-1] != '/') {
-           substbuf[l] = '/';
-           substbuf[l+1] = '\0';
-           l++;
-        }
-        if (output[0] == '/') {
-            rewritelog(r, 4, "add subst prefix: %s -> %s%s",
-                       output, substbuf, output+1);
-            output = apr_pstrcat(r->pool, substbuf, output+1, NULL);
+    if (!strncmp(input, match, len) && input[len++] == '/') {
+        apr_size_t slen, outlen;
+        char *output;
+
+        rewritelog(r, 5, "strip matching prefix: %s -> %s", input, input+len);
+
+        slen = strlen(subst);
+        if (slen && subst[slen - 1] != '/') {
+            ++slen;
         }
-        else {
-            rewritelog(r, 4, "add subst prefix: %s -> %s%s",
-                       output, substbuf, output);
-            output = apr_pstrcat(r->pool, substbuf, output, NULL);
+
+        outlen = strlen(input) + slen - len;
+        output = apr_palloc(r->pool, outlen + 1); /* don't forget the \0 */
+
+        memcpy(output, subst, slen);
+        if (slen && !output[slen-1]) {
+            output[slen-1] = '/';
         }
+        memcpy(output+slen, input+len, outlen - slen);
+        output[outlen] = '\0';
+
+        rewritelog(r, 4, "add subst prefix: %s -> %s", input+len, output);
+
+        return output;
     }
-    return output;
+
+    /* prefix didn't match */
+    return input;
 }