You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2003/07/14 20:31:26 UTC
cvs commit: apache-1.3/src/support rotatelogs.c
jim 2003/07/14 11:31:26
Modified: src CHANGES
src/support rotatelogs.c
Log:
Add in the rotatelogs fix
Revision Changes Path
1.1899 +6 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1898
retrieving revision 1.1899
diff -u -r1.1898 -r1.1899
--- CHANGES 7 Jul 2003 00:34:09 -0000 1.1898
+++ CHANGES 14 Jul 2003 18:31:26 -0000 1.1899
@@ -1,5 +1,11 @@
Changes with Apache 1.3.28
+ *) SECURITY: CAN-2003-0460 (cve.mitre.org)
+ Fix the rotatelogs support program on Win32 and OS/2 to ignore
+ special control characters received over the pipe. Previously
+ such characters could cause it to quit logging and exit.
+ [Andr� Malo]
+
*) Prevent the server from crashing when entering infinite loops. The
new LimitInternalRecursion directive configures limits of subsequent
internal redirects and nested subrequests, after which the request
1.18 +8 -0 apache-1.3/src/support/rotatelogs.c
Index: rotatelogs.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/support/rotatelogs.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rotatelogs.c 26 Dec 2001 17:14:06 -0000 1.17
+++ rotatelogs.c 14 Jul 2003 18:31:26 -0000 1.18
@@ -12,6 +12,10 @@
#include <errno.h>
#include <fcntl.h>
+#if defined(WIN32) || defined(OS2)
+#include <io.h>
+#endif
+
#define BUFSIZE 65536
#define ERRMSGSZ 82
#ifndef MAX_PATH
@@ -66,6 +70,10 @@
fprintf(stderr, "Rotation time must be > 0\n");
exit(6);
}
+
+#if defined(WIN32) || defined(OS2)
+ setmode(0, O_BINARY);
+#endif
use_strftime = (strstr(szLogRoot, "%") != NULL);
for (;;) {