From: Christophe Jaillet <jailletc36@apache.org>
Date: Sun, 20 Sep 2015 06:35:37 +0000 (+0000)
Subject: Fix a spurious test where a condition is always true:
X-Git-Tag: 2.5.0-alpha~2822
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5a367921ce3335d7c7450766546a2471da52b34;p=thirdparty%2Fapache%2Fhttpd.git

Fix a spurious test where a condition is always true:
      if ((cfg->skipto != NULL) && (ctx->flags | ENC_SKIPTO)) {
                                    ^^^^^^^^^^^^^^^^^^^^^^^

This is apparently harmless because, in 'xml2enc_filter_init', the ENC_SKIPTO bit of 'flags' is set to ENC_SKIPTO if 'skipto' is non-NULL.

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

diff --git a/modules/filters/mod_xml2enc.c b/modules/filters/mod_xml2enc.c
index d28c97d1be6..7b34c717af9 100644
--- a/modules/filters/mod_xml2enc.c
+++ b/modules/filters/mod_xml2enc.c
@@ -127,7 +127,7 @@ static void fix_skipto(request_rec* r, xml2ctx* ctx)
 {
     apr_status_t rv;
     xml2cfg* cfg = ap_get_module_config(r->per_dir_config, &xml2enc_module);
-    if ((cfg->skipto != NULL) && (ctx->flags | ENC_SKIPTO)) {
+    if ((cfg->skipto != NULL) && (ctx->flags & ENC_SKIPTO)) {
         int found = 0;
         char* p = ap_strchr(ctx->buf, '<');
         tattr* starts = (tattr*) cfg->skipto->elts;