]> granicus.if.org Git - apache/commitdiff
Fix a spurious test where a condition is always true:
authorChristophe Jaillet <jailletc36@apache.org>
Sun, 20 Sep 2015 06:35:37 +0000 (06:35 +0000)
committerChristophe Jaillet <jailletc36@apache.org>
Sun, 20 Sep 2015 06:35:37 +0000 (06:35 +0000)
      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

modules/filters/mod_xml2enc.c

index d28c97d1be66fbb2b2728f0dd7e459cbf87d1a7e..7b34c717af99af403138de9c086faf664252aa3d 100644 (file)
@@ -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;