From: Jim Jagielski <jim@apache.org>
Date: Mon, 28 Sep 2015 12:25:04 +0000 (+0000)
Subject: Merge r1704099 from trunk:
X-Git-Tag: 2.4.17~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9990064de650b21a583b2dc39e2a0ceea3a4e918;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1704099 from trunk:

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.
Submitted by: jailletc36
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705665 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 0098cb986de..8fe258abaa8 100644
--- a/STATUS
+++ b/STATUS
@@ -109,11 +109,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_xml2enc: fix spurious (and harmless) test
-     trunk patch: http://svn.apache.org/r1704099
-     2.4.x patch: trunk works
-     +1: jailletc36, minfrin, ylavic
- 
   *) mod_logio: Fix %^FB on initial request on SSL connection by not counting
      handshake writes as first byte. Also fix processing per Yann's observations
      about potential problems with e.g. write completion.
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;