Some syntax errors in mod_mime_magic's magic file can result

in a 500 error.  Log the error so that it isn't so darn
mysterious.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91674 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 1cbb91a92d77af8a578e86debb348dc18bb46b4d..74a3537b75c54c54ecc90cafdbadfbc3111b98f5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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 564018e69c7b62bb2d285aea46e3c4e42ace00e2..6f1f039ab7a1d7f62199ffef678a6ed516a49b44 100644 (file)
--- 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;
     }