Commit 1113acc9 authored by Joe Orton's avatar Joe Orton
Browse files

Merge r1726705 from trunk: 

mod_filter: Fix AddOutputFilterByType with non-content-level filters.
PR: 58856

Submitted by: Micha Lenk
Reviewed by: covener, jim, ylavic


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

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ 


Changes with Apache 2.4.26



  *) mod_filter: Fix AddOutputFilterByType with non-content-level filters.

     PR 58856. [Micha Lenk <micha lenk.info>]

 

  *) mod_watchdog: Fix semaphore leak over restarts.  [Jim Jagielski]



  *) mod_http2: regression fix on PR 59348, on graceful restart, ongoing

modules/filters/mod_filter.c

+7 −5
Original line number Diff line number Diff line
@@ -444,6 +444,12 @@ static const char *add_filter(cmd_parms *cmd, void *CFG, 
    ap_expr_info_t *node;

    const char *err = NULL;



    /* if provider has been registered, we can look it up */

    provider_frec = ap_get_output_filter_handle(pname);

    if (!provider_frec) {

        return apr_psprintf(cmd->pool, "Unknown filter provider %s", pname);

    }



    /* fname has been declared with DeclareFilter, so we can look it up */

    frec = apr_hash_get(cfg->live_filters, fname, APR_HASH_KEY_STRING);
@@ -454,17 +460,13 @@ static const char *add_filter(cmd_parms *cmd, void *CFG, 
            return c;

        }

        frec = apr_hash_get(cfg->live_filters, fname, APR_HASH_KEY_STRING);

        frec->ftype = provider_frec->ftype;

    }



    if (!frec) {

        return apr_psprintf(cmd->pool, "Undeclared smart filter %s", fname);

    }



    /* if provider has been registered, we can look it up */

    provider_frec = ap_get_output_filter_handle(pname);

    if (!provider_frec) {

        return apr_psprintf(cmd->pool, "Unknown filter provider %s", pname);

    }

    provider = apr_palloc(cmd->pool, sizeof(ap_filter_provider_t));

    if (expr) {

        node = ap_expr_parse_cmd(cmd, expr, 0, &err, NULL);