From 694fb6206b548e5772fbe9c1fd3cbc7fdbc69008 Mon Sep 17 00:00:00 2001 From: Greg Ames Date: Thu, 23 Aug 2001 15:35:50 +0000 Subject: [PATCH] whoops! replace two post 2.0.24 fixes I accidently wiped out yesterday. Reported by: Jeff Trawick, Paul Reder git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90553 13f79535-47bb-0310-9956-ffa450edef68 --- modules/filters/mod_include.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c index 6940667eac..220a747bff 100644 --- 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; } @@ -832,8 +833,9 @@ static int handle_include(include_ctx_t *ctx, apr_bucket_brigade **bb, request_r for (p = r; p != NULL && !founddupe; p = p->main) { request_rec *q; for (q = p; q != NULL; q = q->prev) { - if ( (strcmp(q->filename, rr->filename) == 0) || - (strcmp(q->uri, rr->uri) == 0) ){ + if ((q->filename && rr->filename && + (strcmp(q->filename, rr->filename) == 0)) || + (strcmp(q->uri, rr->uri) == 0)) { founddupe = 1; break; } -- 2.50.1