All uppercase. 6 of one, half-dozen of the other. -- justin
Index: ./modules/experimental/mod_charset_lite.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_charset_lite.c,v
retrieving revision 1.51
diff -u -r1.51 mod_charset_lite.c
--- ./modules/experimental/mod_charset_lite.c 2001/09/04 07:59:55 1.51
+++ ./modules/experimental/mod_charset_lite.c 2001/09/05 00:48:33
@@ -379,7 +379,7 @@
struct ap_filter_t *filter = filter_list;
while (filter) {
- if (!strcasecmp(filter_name, filter->frec->name)) {
+ if (!strcmp(filter_name, filter->frec->name)) {
return 1;
}
filter = filter->next;
@@ -623,7 +623,7 @@
charset_filter_ctx_t *curctx, *last_xlate_ctx = NULL,
*ctx = f->ctx;
int debug = ctx->dc->debug;
- int output = !strcasecmp(f->frec->name, XLATEOUT_FILTER_NAME);
+ int output = !strcmp(f->frec->name, XLATEOUT_FILTER_NAME);
if (ctx->noop) {
return;
@@ -634,7 +634,7 @@
*/
curf = output ? f->r->output_filters : f->r->input_filters;
while (curf) {
- if (!strcasecmp(curf->frec->name, f->frec->name) &&
+ if (!strcmp(curf->frec->name, f->frec->name) &&
curf->ctx) {
curctx = (charset_filter_ctx_t *)curf->ctx;
if (!last_xlate_ctx) {
Index: ./modules/experimental/mod_disk_cache.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_disk_cache.c,v
retrieving revision 1.10
diff -u -r1.10 mod_disk_cache.c
--- ./modules/experimental/mod_disk_cache.c 2001/09/04 07:59:55 1.10
+++ ./modules/experimental/mod_disk_cache.c 2001/09/05 00:48:33
@@ -94,7 +94,7 @@
* again.
*/
for ((f = r->output_filters); (f = f->next);) {
- if (!strcasecmp(f->frec->name, "CACHE")) {
+ if (!strcmp(f->frec->name, "CACHE")) {
ap_remove_output_filter(f);
}
}
Index: ./modules/experimental/cache_util.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/experimental/cache_util.c,v
retrieving revision 1.4
diff -u -r1.4 cache_util.c
--- ./modules/experimental/cache_util.c 2001/08/24 16:57:13 1.4
+++ ./modules/experimental/cache_util.c 2001/09/05 00:48:33
@@ -84,9 +84,9 @@
ap_filter_t *f = r->output_filters;
while (f) {
- if (!strcasecmp(f->frec->name, "CORE") ||
- !strcasecmp(f->frec->name, "CONTENT_LENGTH") ||
- !strcasecmp(f->frec->name, "HTTP_HEADER")) {
+ if (!strcmp(f->frec->name, "CORE") ||
+ !strcmp(f->frec->name, "CONTENT_LENGTH") ||
+ !strcmp(f->frec->name, "HTTP_HEADER")) {
f = f->next;
continue;
}
Index: ./modules/http/http_request.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/http/http_request.c,v
retrieving revision 1.113
diff -u -r1.113 http_request.c
--- ./modules/http/http_request.c 2001/08/31 03:49:42 1.113
+++ ./modules/http/http_request.c 2001/09/05 00:48:33
@@ -96,11 +96,11 @@
ap_filter_t *f = r->output_filters;
int has_core = 0, has_content = 0, has_http_header = 0;
while (f) {
- if(!strcasecmp(f->frec->name, "CORE"))
+ if(!strcmp(f->frec->name, "CORE"))
has_core = 1;
- else if(!strcasecmp(f->frec->name, "CONTENT_LENGTH"))
+ else if(!strcmp(f->frec->name, "CONTENT_LENGTH"))
has_content = 1;
- else if(!strcasecmp(f->frec->name, "HTTP_HEADER"))
+ else if(!strcmp(f->frec->name, "HTTP_HEADER"))
has_http_header = 1;
f = f->next;
}
Index: ./server/mpm/perchild/perchild.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/perchild/perchild.c,v
retrieving revision 1.78
diff -u -r1.78 perchild.c
--- ./server/mpm/perchild/perchild.c 2001/09/04 07:59:55 1.78
+++ ./server/mpm/perchild/perchild.c 2001/09/05 00:48:33
@@ -1490,7 +1490,7 @@
&mpm_perchild_module);
while (f) {
- if (!strcasecmp("PERCHILD_BUFFER", f->frec->name)) {
+ if (!strcmp("PERCHILD_BUFFER", f->frec->name)) {
ap_remove_output_filter(f);
break;
}
Index: ./server/protocol.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/protocol.c,v
retrieving revision 1.43
diff -u -r1.43 protocol.c
--- ./server/protocol.c 2001/09/04 07:59:55 1.43
+++ ./server/protocol.c 2001/09/05 00:48:33
@@ -1064,7 +1064,7 @@
/* this will typically exit on the first test */
for (f = r->output_filters; f != NULL; f = f->next)
- if (strcasecmp("OLD_WRITE", f->frec->name) == 0)
+ if (strcmp("OLD_WRITE", f->frec->name) == 0)
break;
if (f == NULL) {
/* our filter hasn't been added yet */
Index: ./server/util_filter.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/util_filter.c,v
retrieving revision 1.68
diff -u -r1.68 util_filter.c
--- ./server/util_filter.c 2001/09/04 16:28:45 1.68
+++ ./server/util_filter.c 2001/09/05 00:48:33
@@ -103,7 +103,7 @@
}
frec->name = apr_pstrdup(FILTER_POOL, name);
- ap_str_tolower((char *)frec->name);
+ ap_str_toupper((char *)frec->name);
frec->filter_func = filter_func;
frec->ftype = ftype;
@@ -152,7 +152,7 @@
/* Normalize the name to all lowercase to match register_filter() */
do {
- *dst++ = apr_tolower(*src++);
+ *dst++ = apr_toupper(*src++);
} while (--size);
frec = (ap_filter_rec_t *)apr_hash_get(reg_filter_set,
Index: include/httpd.h
===================================================================
RCS file: /home/cvs/httpd-2.0/include/httpd.h,v
retrieving revision 1.164
diff -u -r1.164 httpd.h
--- include/httpd.h 2001/08/27 02:57:54 1.164
+++ include/httpd.h 2001/09/05 00:48:34
@@ -1427,6 +1427,12 @@
AP_DECLARE(void) ap_str_tolower(char *s);
/**
+ * convert a string to all uppercase
+ * @param s The string to convert to uppercase
+ */
+AP_DECLARE(void) ap_str_toupper(char *s);
+
+/**
* Search a string from left to right for the first occurrence of a
* specific character
* @param str The string to search
Index: server/util.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/util.c,v
retrieving revision 1.112
diff -u -r1.112 util.c
--- server/util.c 2001/08/24 01:41:56 1.112
+++ server/util.c 2001/09/05 00:48:34
@@ -1748,6 +1748,14 @@
}
}
+AP_DECLARE(void) ap_str_toupper(char *str)
+{
+ while (*str) {
+ *str = apr_toupper(*str);
+ ++str;
+ }
+}
+
static char *find_fqdn(apr_pool_t *a, struct hostent *p)
{
int x;
