From 78e5ddbf6752a477694f21ccb1301d97d9da22bf Mon Sep 17 00:00:00 2001 From: "Ralf S. Engelschall" Date: Thu, 31 Jul 1997 08:50:02 +0000 Subject: [PATCH] handle_else was being used to handle endif. Submitted by: Howard Fear Reviewed by: Ralf S. Engelschall, Jim Jagielski, Randy Terbush git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3@78829 13f79535-47bb-0310-9956-ffa450edef68 --- APACHE_1_2_X/src/CHANGES | 4 ++++ APACHE_1_2_X/src/modules/standard/mod_include.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/APACHE_1_2_X/src/CHANGES b/APACHE_1_2_X/src/CHANGES index d98b4dff823..41e377d4e07 100644 --- a/APACHE_1_2_X/src/CHANGES +++ b/APACHE_1_2_X/src/CHANGES @@ -1,5 +1,9 @@ Changes with Apache 1.2.2 + *) mod_include cleanup showed that handle_else was being used to handle + endif. It didn't cause problems, but it was cleaned up too. + [Howard Fear] + *) Last official synchonisation of mod_rewrite with author version (because mod_rewrite is now directly developed by the author at the Apache Group): o added diff between mod_rewrite 3.0.6+ and 3.0.9 diff --git a/APACHE_1_2_X/src/modules/standard/mod_include.c b/APACHE_1_2_X/src/modules/standard/mod_include.c index 5872333c563..96e38fb4725 100644 --- a/APACHE_1_2_X/src/modules/standard/mod_include.c +++ b/APACHE_1_2_X/src/modules/standard/mod_include.c @@ -1589,6 +1589,7 @@ int handle_endif(FILE *in, request_rec *r, char *error, #ifdef DEBUG_INCLUDE rvputs(r,"**** endif conditional_status=\"", *conditional_status ? "1" : "0", "\"\n", NULL); #endif + *printing = 1; *conditional_status = 1; return 0; } else { @@ -1704,8 +1705,7 @@ void send_parsed_content(FILE *f, request_rec *r) continue; } else if(!strcmp(directive,"endif")) { if (!if_nesting) { - ret=handle_else(f, r, error, &conditional_status, &printing); - printing = 1; + ret = handle_endif(f, r, error, &conditional_status, &printing); } else { if_nesting--; } -- 2.47.2