]> granicus.if.org Git - apache/commit
Merge r1704099 from trunk:
authorJim Jagielski <jim@apache.org>
Mon, 28 Sep 2015 12:25:04 +0000 (12:25 +0000)
committerJim Jagielski <jim@apache.org>
Mon, 28 Sep 2015 12:25:04 +0000 (12:25 +0000)
commit9990064de650b21a583b2dc39e2a0ceea3a4e918
tree53439e01d8cccd412c3c788bc1de80fdbf9d4868
parent3185dbdc47dce842e7274e865380cb08cd85f429
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
STATUS
modules/filters/mod_xml2enc.c