Commit 631cf83c authored by Jim Jagielski's avatar Jim Jagielski
Browse files

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
parent e0b81138

STATUS

+0 −5
Original line number Diff line number Diff line
@@ -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.

modules/filters/mod_xml2enc.c

+1 −1
Original line number Diff line number Diff line
@@ -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;