diff options
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | modules/metadata/mod_mime_magic.c | 6 |
2 files changed, 9 insertions, 1 deletions
@@ -1,5 +1,9 @@ Changes with Apache 2.0.27-dev + *) Some syntax errors in mod_mime_magic's magic file can result + in a 500 error, which previously was unlogged. Now we log the + error. [Jeff Trawick] + *) Add the support/checkgid helper app, which checks the run-time validity of group identifiers usable in the Group directive. [Ken Coar] diff --git a/modules/metadata/mod_mime_magic.c b/modules/metadata/mod_mime_magic.c index 564018e69c..6f1f039ab7 100644 --- a/modules/metadata/mod_mime_magic.c +++ b/modules/metadata/mod_mime_magic.c @@ -845,9 +845,13 @@ static int magic_rsl_to_request(request_rec *r) r->content_encoding = tmp; } - /* detect memory allocation errors */ + /* detect memory allocation or other errors */ if (!r->content_type || (state == rsl_encoding && !r->content_encoding)) { + ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, 0, r, + MODNAME ": unexpected state %d; could be caused by bad " + "data in magic file", + state); return HTTP_INTERNAL_SERVER_ERROR; } |