From 4db33d47fd3e76b8b3dfde81837062b69205f07d Mon Sep 17 00:00:00 2001 From: Justin Erenkrantz Date: Tue, 4 Sep 2001 07:59:55 +0000 Subject: [PATCH] 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 --- modules/experimental/mod_charset_lite.c | 4 ++-- modules/experimental/mod_disk_cache.c | 2 +- server/mpm/experimental/perchild/perchild.c | 2 +- server/mpm/perchild/perchild.c | 2 +- server/protocol.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/experimental/mod_charset_lite.c b/modules/experimental/mod_charset_lite.c index 5022676f01..e4ea92de69 100644 --- a/modules/experimental/mod_charset_lite.c +++ b/modules/experimental/mod_charset_lite.c @@ -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) { diff --git a/modules/experimental/mod_disk_cache.c b/modules/experimental/mod_disk_cache.c index b2d54bcb61..38bf561b12 100644 --- a/modules/experimental/mod_disk_cache.c +++ b/modules/experimental/mod_disk_cache.c @@ -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); } } diff --git a/server/mpm/experimental/perchild/perchild.c b/server/mpm/experimental/perchild/perchild.c index 2f781aed91..aeb70a5b09 100644 --- a/server/mpm/experimental/perchild/perchild.c +++ b/server/mpm/experimental/perchild/perchild.c @@ -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; } diff --git a/server/mpm/perchild/perchild.c b/server/mpm/perchild/perchild.c index 2f781aed91..aeb70a5b09 100644 --- a/server/mpm/perchild/perchild.c +++ b/server/mpm/perchild/perchild.c @@ -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; } diff --git a/server/protocol.c b/server/protocol.c index 0762861002..80fa2ee191 100644 --- a/server/protocol.c +++ b/server/protocol.c @@ -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 */ -- 2.50.1