Fixed a bug in the handling of nested if-statements in shtml files

PR: 9866

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

diff --git a/CHANGES b/CHANGES
index 75ea893de7dd328a4515a545d409bdd150048c1a..d2d8665d31e418d791d1475a5d06908bae02ed37 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.38
 
+  *) Fixed the handling of nested if-statements in shtml files.
+     PR 9866  [Brian Pane]
+
   *) Allow 'make install DESTDIR=/path'.  This allows packagers to install
      into a directory different from the one that was configured.  This 
      also mirrors the root= feature from 1.3.  We cannot use prefix=,

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index 311c61e64a10e2611db6ccf1012af86735c70d30..3c208efcb362181a720134d34311ee3846bce09a 100644 (file)
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -2579,7 +2579,7 @@ static int handle_if(include_ctx_t *ctx, apr_bucket_brigade **bb,
     char debug_buf[MAX_DEBUG_SIZE];
 
     *inserted_head = NULL;
-    if (!ctx->flags & FLAG_PRINTING) {
+    if (!(ctx->flags & FLAG_PRINTING)) {
         ctx->if_nesting_level++;
     }
     else {