Get mod_include working again. This still needs to be re-written, but

at least now we are serving SHTML files again.
PR:	6641

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

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index e9aeea84a852334a2d8ebaeba5439bd02f65747e..60b2dae02ff9013ff3151423be5cd01e65ce6cb2 100644 (file)
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -223,7 +223,7 @@ static ap_bucket *find_string(ap_bucket *dptr, const char *str, ap_bucket *end)
                      * that we catch cases like <<--#.  This makes the 
                      * second check after the original check fails.
                      */
-                     if (*c == buf[state]) {
+                     if (*c == str[state]) {
                          state++;
                      }
                 }
@@ -347,9 +347,10 @@ static char *get_tag(apr_pool_t *p, ap_bucket *in, char *tag, int tagbuf_len, in
     --tagbuf_len;
 
     /* Remove all whitespace */
-    while (dptr) { 
+    do {
         ap_bucket_read(dptr, &str, &length, 0);
         c = str + *offset;
+        *offset = 0;
         while (c - str < length) {
             if (!apr_isspace(*c)) {
                 break;
@@ -359,7 +360,7 @@ static char *get_tag(apr_pool_t *p, ap_bucket *in, char *tag, int tagbuf_len, in
             break;
         }
         dptr = AP_BUCKET_NEXT(dptr);
-    }
+    } while (dptr);
 
     /* tags can't start with - */
     if (*c == '-') {
@@ -2423,7 +2424,7 @@ static void send_parsed_content(ap_bucket_brigade **bb, request_rec *r,
                     ap_rputs(error, r);
                 }
             }
-/*            AP_BRIGADE_UNSPLICE(dptr, AP_BUCKET_PREV(endsec)); */
+            *bb = ap_brigade_split(tag_and_after, endsec); 
             dptr = AP_BUCKET_PREV(endsec);
         }
         else {