dgaudet 98/02/18 12:44:20
Modified: src CHANGES
src/modules/standard mod_mime_magic.c
Log:
Report filename when read error occurs.
PR: 1827
Submitted by: "M.D.Parker" <[EMAIL PROTECTED]>
Reviewed by: Dean Gaudet
Revision Changes Path
1.637 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.636
retrieving revision 1.637
diff -u -r1.636 -r1.637
--- CHANGES 1998/02/18 10:01:05 1.636
+++ CHANGES 1998/02/18 20:44:16 1.637
@@ -1,5 +1,8 @@
Changes with Apache 1.3b6
+ *) mod_mime_magic error message should indicate the filename when
+ reads fail. ["M.D.Parker" <[EMAIL PROTECTED]>] PR#1827
+
*) Previously Apache would permit </Files> to end <FilesMatch> (and
similary for Location and Directory), now this is diagnosed as an
error. Improve error messages for mismatched sections (<Files>,
1.25 +2 -1 apache-1.3/src/modules/standard/mod_mime_magic.c
Index: mod_mime_magic.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_mime_magic.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mod_mime_magic.c 1998/01/25 03:52:18 1.24
+++ mod_mime_magic.c 1998/02/18 20:44:19 1.25
@@ -2191,7 +2191,8 @@
*newch = (unsigned char *) palloc(r->pool, n);
if ((n = read(fileno(fout), *newch, n)) <= 0) {
destroy_pool(sub_pool);
- aplog_error(APLOG_MARK, APLOG_ERR, r->server, MODNAME ": read failed");
+ aplog_error(APLOG_MARK, APLOG_ERR, r->server,
+ MODNAME ": read failed %s", r->filename);
return -1;
}
destroy_pool(sub_pool);
