rev 1.248 of this file removed the default locking mechanism

from unixware 7.0.  instead it should have just defined
SINGLE_LISTEN_UNSERIALIZED_ACCEPT (since locking is always required for
multiple sockets).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@91856 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/CHANGES b/src/CHANGES
index e5383c851d0a90094fd313b823773cb33580ac1f..2f217e0c67b5b53d361a7e1a3b8f05df209dcb3a 100644 (file)
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 1.3.23
 
+  *) Unixware 7.0 and later did not have a default locking
+     mechanism defined.  This bug was introduced in apache 1.3.4.
+     [Dean Gaudet]
+
   *) Prevent an Apache module from being loaded or added twice due
      to duplicate LoadModule or AddModule directives (or a missing
      ClearModuleList directive).

diff --git a/src/include/ap_config.h b/src/include/ap_config.h
index 01a5426b006ba1ccbd92af2560d6d88aa1db5308..d63e52887b83d6946a7d2957766f8d45b15b4e47 100644 (file)
--- a/src/include/ap_config.h
+++ b/src/include/ap_config.h
@@ -631,10 +631,12 @@ extern char *crypt();
 #endif /*_OSD_POSIX*/
 
 #elif defined(UW)
-#if UW < 700
 #define HAVE_FCNTL_SERIALIZED_ACCEPT
+#if UW < 700
 #define NO_LINGCLOSE
 #define NO_KILLPG
+#else
+#define SINGLE_LISTEN_UNSERIALIZED_ACCEPT
 #endif
 #undef  NO_SETSID
 #undef NEED_STRDUP