dgaudet 99/03/16 08:16:08
Modified: src CHANGES
src/include ap_config.h
Log:
switch back to fcntl() locking on linux
PR: 3531
Reviewed by: Lincoln Stein <[EMAIL PROTECTED]>
Revision Changes Path
1.1282 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1281
retrieving revision 1.1282
diff -u -r1.1281 -r1.1282
--- CHANGES 1999/03/16 00:38:53 1.1281
+++ CHANGES 1999/03/16 16:16:03 1.1282
@@ -1,5 +1,9 @@
Changes with Apache 1.3.5
+ *) PORT: Switch back to using fcntl() locking on Linux -- instabilities
+ have been reported with flock() locking (probably related to kernel
+ version). [Dean Gaudet] PR#3531
+
*) Using APACI, the main config file (usually httpd.conf) was
not being adjusted as $(TARGET).conf. [Wilfredo Sanchez
<[EMAIL PROTECTED]>]
1.252 +7 -1 apache-1.3/src/include/ap_config.h
Index: ap_config.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/include/ap_config.h,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -r1.251 -r1.252
--- ap_config.h 1999/03/10 11:37:52 1.251
+++ ap_config.h 1999/03/16 16:16:07 1.252
@@ -460,7 +460,13 @@
#define USE_MMAP_FILES
/* flock is faster ... but hasn't been tested on 1.x systems */
-#define USE_FLOCK_SERIALIZED_ACCEPT
+/* PR#3531 indicates flock() may not be stable, probably depends on
+ * kernel version. Go back to using fcntl, but provide a way for
+ * folks to tweak their Configuration to get flock.
+ */
+#ifndef USE_FLOCK_SERIALIZED_ACCEPT
+#define USE_FCNTL_SERIALIZED_ACCEPT
+#endif
#define SYS_SIGLIST _sys_siglist
