httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/modules/metadata mod_mime_magic.c
Date Sat, 27 Oct 2001 13:36:57 GMT
trawick     01/10/27 06:36:57

  Modified:    .        CHANGES
               modules/metadata mod_mime_magic.c
  Log:
  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.
  
  Revision  Changes    Path
  1.406     +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.405
  retrieving revision 1.406
  diff -u -r1.405 -r1.406
  --- CHANGES	2001/10/26 18:33:22	1.405
  +++ CHANGES	2001/10/27 13:36:56	1.406
  @@ -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]
  
  
  
  1.49      +5 -1      httpd-2.0/modules/metadata/mod_mime_magic.c
  
  Index: mod_mime_magic.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_mime_magic.c,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- mod_mime_magic.c	2001/10/16 22:01:14	1.48
  +++ mod_mime_magic.c	2001/10/27 13:36:57	1.49
  @@ -845,9 +845,13 @@
   	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;
       }
   
  
  
  

Mime
View raw message