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

diff --git a/modules/experimental/mod_charset_lite.c b/modules/experimental/mod_charset_lite.c
index 5022676f015c8d5376ffd22a8316a687a185d723..e4ea92de69747cb743ee4eac91bdefefed98ff1e 100644 (file)
--- 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 b2d54bcb6150c0e10aa9cc742964cf7ac3a00312..38bf561b122c81e0800eff852dffee38a0f73215 100644 (file)
--- 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 2f781aed91b4146646b68e7febd0d1c03e7fbe4b..aeb70a5b0994905567538cc17c779ba4e803f83f 100644 (file)
--- 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 2f781aed91b4146646b68e7febd0d1c03e7fbe4b..aeb70a5b0994905567538cc17c779ba4e803f83f 100644 (file)
--- 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 0762861002e56006f97dd655f6043721b85a031d..80fa2ee1912570da325e10ba1b9958eab057c2a3 100644 (file)
--- 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 */