You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fi...@hyperreal.org on 1997/11/06 03:57:24 UTC
cvs commit: apachen/src/main conf.h
fielding 97/11/05 18:57:24
Modified: src/main conf.h
Log:
USE_PTHREAD_SERIALIZED_ACCEPT results in locking problems when the
child that has the current lock gets killed by the parent. Restore
USE_FCNTL_SERIALIZED_ACCEPT as the default for Solaris2, at least
until we get one of the other locking mechanisms to work reliably.
Reviewed by: Dean Gaudet
Revision Changes Path
1.152 +2 -5 apachen/src/main/conf.h
Index: conf.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/conf.h,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- conf.h 1997/11/05 12:48:15 1.151
+++ conf.h 1997/11/06 02:57:23 1.152
@@ -124,12 +124,9 @@
#undef NO_SETSID
#define HAVE_SYS_RESOURCE_H
#define bzero(a,b) memset(a,0,b)
-/*#define USE_FCNTL_SERIALIZED_ACCEPT */
-/*#define USE_SYSVSEM_SERIALIZED_ACCEPT */
-#if SOLARIS2 < 250
+#if !defined(USE_SYSVSEM_SERIALIZED_ACCEPT) && \
+ !defined(USE_PTHREAD_SERIALIZED_ACCEPT)
#define USE_FCNTL_SERIALIZED_ACCEPT
-#else
-#define USE_PTHREAD_SERIALIZED_ACCEPT
#endif
#define NEED_UNION_SEMUN
#define HAVE_MMAP