You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ia...@apache.org on 2002/02/21 17:18:11 UTC
cvs commit: httpd-2.0/modules/filters mod_include.c
ianh 02/02/21 08:18:11
Modified: . CHANGES
modules/filters mod_include.c
Log:
fix problem where a unmatched tag was not sent if it was at the
end of a bucket
Obtained from: Alla Teper noticed it
Reviewed by: Cliff/Justin
Revision Changes Path
1.601 +3 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.600
retrieving revision 1.601
diff -u -r1.600 -r1.601
--- CHANGES 21 Feb 2002 14:22:04 -0000 1.600
+++ CHANGES 21 Feb 2002 16:18:10 -0000 1.601
@@ -1,5 +1,8 @@
Changes with Apache 2.0.33-dev
+ *) fix bug in mod-include where it wouldn't send a unmatched
+ part if it was at the end of a bucket [Ian Holsman]
+
*) worker MPM: Improve logging of errors with the interface between
the listener thread and worker threads. [Jeff Trawick]
1.189 +12 -1 httpd-2.0/modules/filters/mod_include.c
Index: mod_include.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/filters/mod_include.c,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- mod_include.c 21 Jan 2002 01:43:30 -0000 1.188
+++ mod_include.c 21 Feb 2002 16:18:11 -0000 1.189
@@ -429,7 +429,18 @@
return found_start_sequence(dptr, ctx, c - buf);
}
- /* False alarm... */
+ /* False alarm...
+ * send out the unmatched part
+ */
+ if (ctx->parse_pos > 0) {
+ apr_bucket *tmp_buck;
+ tmp_buck = apr_bucket_pool_create(apr_pstrndup(ctx->pool,
+ ctx->start_seq,
+ ctx->parse_pos),
+ ctx->parse_pos,
+ ctx->pool);
+ APR_BUCKET_INSERT_BEFORE(dptr, tmp_buck);
+ }
ctx->state = PRE_HEAD;
}