Commit bd71f210 authored by Justin Erenkrantz's avatar Justin Erenkrantz
Browse files

Fix breakage from Brian Pane's util_filter switch to hash tables. 

There were some places that were expecting what you put into frec
would be what frec->name would be.  Not true anymore.

There are enough other places that were already doing the strcasecmp
that it makes more sense to just make it all strcasecmp across the
board rather than changing the UPPERCASE to lowercase.

(None of these with the exception of old_filter look to be in the
critical path anyway...)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90890 13f79535-47bb-0310-9956-ffa450edef68
parent 9a97d9b5

modules/experimental/mod_charset_lite.c

+2 −2
Original line number Diff line number Diff line
@@ -623,7 +623,7 @@ static void chk_filter_chain(ap_filter_t *f) 
    charset_filter_ctx_t *curctx, *last_xlate_ctx = NULL,

        *ctx = f->ctx;

    int debug = ctx->dc->debug;

    int output = !strcmp(f->frec->name, XLATEOUT_FILTER_NAME);

    int output = !strcasecmp(f->frec->name, XLATEOUT_FILTER_NAME);



    if (ctx->noop) {

        return;
@@ -634,7 +634,7 @@ static void chk_filter_chain(ap_filter_t *f) 
     */

    curf = output ? f->r->output_filters : f->r->input_filters;

    while (curf) {

        if (!strcmp(curf->frec->name, f->frec->name) &&

        if (!strcasecmp(curf->frec->name, f->frec->name) &&

            curf->ctx) {

            curctx = (charset_filter_ctx_t *)curf->ctx;

            if (!last_xlate_ctx) {

modules/experimental/mod_disk_cache.c

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static int disk_serve(request_rec *r) 
     * again.

     */

    for ((f = r->output_filters); (f = f->next);) {

        if (!strcmp(f->frec->name, "CACHE")) {

        if (!strcasecmp(f->frec->name, "CACHE")) {

            ap_remove_output_filter(f);

        }

    }

server/mpm/experimental/perchild/perchild.c

+1 −1
Original line number Diff line number Diff line
@@ -1490,7 +1490,7 @@ static int perchild_post_read(request_rec *r) 
                                                 &mpm_perchild_module);



    while (f) {

        if (!strcmp("PERCHILD_BUFFER", f->frec->name)) {

        if (!strcasecmp("PERCHILD_BUFFER", f->frec->name)) {

            ap_remove_output_filter(f);

            break;

        }

server/mpm/perchild/perchild.c

+1 −1
Original line number Diff line number Diff line
@@ -1490,7 +1490,7 @@ static int perchild_post_read(request_rec *r) 
                                                 &mpm_perchild_module);



    while (f) {

        if (!strcmp("PERCHILD_BUFFER", f->frec->name)) {

        if (!strcasecmp("PERCHILD_BUFFER", f->frec->name)) {

            ap_remove_output_filter(f);

            break;

        }

server/protocol.c

+1 −1
Original line number Diff line number Diff line
@@ -1064,7 +1064,7 @@ static apr_status_t buffer_output(request_rec *r, 


    /* this will typically exit on the first test */

    for (f = r->output_filters; f != NULL; f = f->next)

        if (strcmp("OLD_WRITE", f->frec->name) == 0)

        if (strcasecmp("OLD_WRITE", f->frec->name) == 0)

            break;

    if (f == NULL) {

        /* our filter hasn't been added yet */