Fix a minor issue with Jeff Trawick's mod_include

patch. Without this patch, the code will just allocate
more bytes in get_combined_directive than are needed.

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

diff --git a/CHANGES b/CHANGES
index a26c0e9ef0c7e770322c1aa29e5c808a9eb24b0a..fb4694b7cd1c08292614d88052cb50bfc632285a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0.25-dev
 
+  *) Fix a minor issue with Jeff Trawick's mod_include
+     patch. Without this patch, the code will just allocate
+     more bytes in get_combined_directive than are needed.
+
   *) Added the LDAP authentication module mod_auth_ldap.
      [Dave Carrigan <dave@rudedog.org>, Graham Leggett]
 

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index 78ff6a38b3bc66affdd82b0f13b8ee61c00f3c5a..0dad62053686a994475a3c7e37d7353c2f8da872 100644 (file)
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -275,6 +275,7 @@ static apr_bucket *find_end_sequence(apr_bucket *dptr, include_ctx_t *ctx, apr_b
                 if (ctx->state == PARSE_DIRECTIVE) {
                     /* gonna start over parsing the directive next time through */
                     ctx->directive_length = 0;
+                    ctx->tag_length       = 0;
                 }
                 return dptr;
             }