dgaudet 98/02/21 03:46:00
Modified: src CHANGES
src/modules/standard mod_include.c
Log:
Work around a broken cpp.
PR: 1717
Revision Changes Path
1.648 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.647
retrieving revision 1.648
diff -u -r1.647 -r1.648
--- CHANGES 1998/02/21 10:43:42 1.647
+++ CHANGES 1998/02/21 11:45:56 1.648
@@ -1,5 +1,8 @@
Changes with Apache 1.3b6
+ *) Work around a broken C preprocessor in mod_include.
+ [Dean Gaudet] PR#1717
+
*) Use SA_RESETHAND or SA_ONESHOT when installing the coredump handlers.
In particular the handlers could trigger themselves into an infinite
loop if RLimitMem was used with a small amount of memory -- too small
1.72 +3 -1 apache-1.3/src/modules/standard/mod_include.c
Index: mod_include.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_include.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- mod_include.c 1998/02/03 09:30:48 1.71
+++ mod_include.c 1998/02/21 11:45:59 1.72
@@ -1049,9 +1049,11 @@
}
else {
int l, x;
-#if defined(BSD) && BSD > 199305
+#if defined(BSD)
+#if BSD > 199305
/* ap_snprintf can't handle %qd */
sprintf(tag, "%qd", finfo.st_size);
+#endif
#else
ap_snprintf(tag, sizeof(tag), "%ld", finfo.st_size);
#endif
