dgaudet 98/02/18 12:52:55
Modified: src CHANGES
src/include conf.h
Log:
Linux 2.0.x RLIMIT_DATA doesn't do what's expected, RLIMIT_AS does. Deal
with it.
PR: 1816
Submitted by: Enrik Berkhan <[EMAIL PROTECTED]>
Reviewed by: Dean Gaudet
Revision Changes Path
1.638 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.637
retrieving revision 1.638
diff -u -r1.637 -r1.638
--- CHANGES 1998/02/18 20:44:16 1.637
+++ CHANGES 1998/02/18 20:52:51 1.638
@@ -1,5 +1,9 @@
Changes with Apache 1.3b6
+ *) Linux 2.0 and above implement RLIMIT_AS, RLIMIT_DATA has almost no
+ effect. Work around it by using RLIMIT_AS for the RLimitMEM
+ directive. [Enrik Berkhan <[EMAIL PROTECTED]>] PR#1816
+
*) mod_mime_magic error message should indicate the filename when
reads fail. ["M.D.Parker" <[EMAIL PROTECTED]>] PR#1827
1.181 +8 -0 apache-1.3/src/include/conf.h
Index: conf.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- conf.h 1998/02/14 13:37:03 1.180
+++ conf.h 1998/02/18 20:52:55 1.181
@@ -371,6 +371,14 @@
#if !defined(__GLIBC__) || __GLIBC__ < 2 || (__GLIBC__ == 2 &&
__GLIBC_MINOR__ < 1)
typedef int rlim_t;
#endif
+
+/* Linux 2.0 and above implement the new posix RLIMIT_AS rather than the
+ * older BSD semantics (some would actually call this a bug, like me -djg).
+ */
+#ifndef RLIMIT_VMEM
+#define RLIMIT_VMEM RLIMIT_AS
+#endif
+
/* flock is faster ... but hasn't been tested on 1.x systems */
#define USE_FLOCK_SERIALIZED_ACCEPT
