You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2004/01/13 22:03:06 UTC
cvs commit: apache-1.3/src/modules/standard mod_mime_magic.c
trawick 2004/01/13 13:03:06
Modified: src CHANGES
src/modules/standard mod_mime_magic.c
Log:
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.
Submitted by: Jeff Trawick
Reviewed by: Jim Jagielski, Martin Kraemer
Revision Changes Path
1.1920 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1919
retrieving revision 1.1920
diff -u -r1.1919 -r1.1920
--- CHANGES 13 Jan 2004 19:09:39 -0000 1.1919
+++ CHANGES 13 Jan 2004 21:03:06 -0000 1.1920
@@ -1,5 +1,9 @@
Changes with Apache 1.3.30
+ *) 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]
+
*) Linux 2.4+: If Apache is started as root and you code
CoreDumpDirectory, coredumps are enabled via the prctl() syscall.
Backport of a 2.x feature by Greg Ames. [Jeff Trawick]
1.52 +5 -1 apache-1.3/src/modules/standard/mod_mime_magic.c
Index: mod_mime_magic.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_mime_magic.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- mod_mime_magic.c 1 Jan 2004 13:32:56 -0000 1.51
+++ mod_mime_magic.c 13 Jan 2004 21:03:06 -0000 1.52
@@ -832,9 +832,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, r,
+ MODNAME ": unexpected state %d; could be caused by bad "
+ "data in magic file",
+ state);
return HTTP_INTERNAL_SERVER_ERROR;
}