fielding 99/08/27 16:38:11
Modified: src CHANGES
src/main http_config.c
Log:
Move "handler not found" warning message to below the check
for a wildcard handler. Gee, you'd think someone would have
fixed it before seven PRs.
PR: 2584, 3349, 3436, 3548, 4384, 4795, 4807
Submitted by: Dirk <[EMAIL PROTECTED]>, Roy Fielding
Revision Changes Path
1.1425 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1424
retrieving revision 1.1425
diff -u -r1.1424 -r1.1425
--- CHANGES 1999/08/19 09:07:32 1.1424
+++ CHANGES 1999/08/27 23:38:05 1.1425
@@ -1,5 +1,9 @@
Changes with Apache 1.3.10
+ *) Move "handler not found" warning message to below the check
+ for a wildcard handler. [Dirk <[EMAIL PROTECTED]>, Roy Fielding]
+ PR#2584, PR#3349, PR#3436, PR#3548, PR#4384, PR#4795, PR#4807
+
*) Build errors in src/support stop with an error, just like all the
other recursive make calls. [David Harris <[EMAIL PROTECTED]>]
1.147 +4 -5 apache-1.3/src/main/http_config.c
Index: http_config.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/main/http_config.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- http_config.c 1999/08/06 16:21:33 1.146
+++ http_config.c 1999/08/27 23:38:10 1.147
@@ -512,11 +512,6 @@
}
}
- if (result == HTTP_INTERNAL_SERVER_ERROR && r->handler) {
- ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r,
- "handler \"%s\" not found for: %s", r->handler, r->filename);
- }
-
/* Pass two --- wildcard matches */
for (handp = wildhandlers; handp->hr.content_type; ++handp) {
@@ -529,6 +524,10 @@
}
}
+ if (result == HTTP_INTERNAL_SERVER_ERROR && r->handler && r->filename) {
+ ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r,
+ "handler \"%s\" not found for: %s", r->handler, r->filename);
+ }
return HTTP_INTERNAL_SERVER_ERROR;
}
