httpd-bugs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bugzi...@apache.org
Subject DO NOT REPLY [Bug 21095] - SSI error
Date Fri, 11 Jul 2003 09:23:19 GMT
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
<http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21095>.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21095

SSI error





------- Additional Comments From jwoolley@apache.org  2003-07-11 09:23 -------
Sigh.  It's always something.  After hours of debugging, I figured out that deleting the 
bucket at this point turns out to be a bad idea because it gets deleted again later (or 
at least will once another mod_include patch we're working on gets committed).  So, 
we compromise.  The following version of the patch does what I'd expect it to do given 
the most rigorous and torturous test case I could contrive for mod_include.  So 
assuming it still fixes your bug (which I can't tell from the attachments you gave 
whether it does or not for some reason), which it should, then I feel this patch is safe 
for production use.  As soon as I get the confirmation from you, I'll commit it to 
httpd-2.1-dev and propose it for inclusion in 2.0.48. 
 
Index: mod_include.c 
=================================================================== 
RCS file: /home/cvs/httpd-2.0/modules/filters/mod_include.c,v 
retrieving revision 1.233 
diff -u -d -r1.233 mod_include.c 
--- mod_include.c       3 Feb 2003 17:53:01 -0000       1.233 
+++ mod_include.c       11 Jul 2003 09:15:58 -0000 
@@ -429,7 +429,11 @@ 
         } 
 
         if (len == 0) { /* end of pipe? */ 
-            break; 
+            dptr = APR_BUCKET_NEXT(dptr); 
+            if (dptr == APR_BRIGADE_SENTINEL(bb)) { 
+                break; 
+            } 
+            continue; 
         } 
 
         /* Set our buffer to use. */ 
@@ -600,7 +604,11 @@ 
         } 
 
         if (len == 0) { /* end of pipe? */ 
-            break; 
+            dptr = APR_BUCKET_NEXT(dptr); 
+            if (dptr == APR_BRIGADE_SENTINEL(bb)) { 
+                break; 
+            } 
+            continue; 
         } 
         if (dptr == ctx->tag_start_bucket) { 
             c = buf + ctx->tag_start_index;

---------------------------------------------------------------------
To unsubscribe, e-mail: bugs-unsubscribe@httpd.apache.org
For additional commands, e-mail: bugs-help@httpd.apache.org


Mime
View raw message