Commit eea9bc16 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

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
parent cdaa8f0c

CHANGES

+4 −0
Original line number Diff line number Diff line 
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]

modules/metadata/mod_mime_magic.c

+5 −1
Original line number Diff line number Diff line
@@ -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;

    }