dgaudet 98/01/21 16:00:00
Modified: src CHANGES Configure
src/main conf.h http_main.c
Log:
Found a great cleanup patch for unixware in PR#1282. Applied it with
slight modifications. This should cleanup SIGHUP, serialized accept
problems, and enable syslog support.
PR: 1082, 1282, 1499, 1553
Submitted by: Tom Hughes <[EMAIL PROTECTED]>
Revision Changes Path
1.588 +5 -2 apachen/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.587
retrieving revision 1.588
diff -u -r1.587 -r1.588
--- CHANGES 1998/01/21 23:49:02 1.587
+++ CHANGES 1998/01/21 23:59:52 1.588
@@ -1,7 +1,10 @@
Changes with Apache 1.3b4
- *) PORT: UnixWare 2.1.2 SMP appears to require USE_FCNTL_SERIALIZED_ACCEPT.
- It should be safe on all versions. [Dean Gaudet] PR#1553
+ *) PORT: UnixWare 2.1.2 SMP appears to require USE_FCNTL_SERIALIZED_ACCEPT,
+ as do various earlier versions. It should be safe on all versions.
+ Unixware 1.x appears to have the same SIGHUP bug as solaris does with
+ the slack code. A few other cleanups for Unixware.
+ [Tom Hughes <[EMAIL PROTECTED]>] PR#1082, PR#1282, PR#1499, PR#1553
*) PORT: A/UX can handle single-listen accepts without mutex
locking, so we add SAFE_UNSERIALIZED_ACCEPT. [Jim Jagielski]
1.178 +4 -4 apachen/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apachen/src/Configure,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- Configure 1998/01/21 17:12:34 1.177
+++ Configure 1998/01/21 23:59:54 1.178
@@ -428,23 +428,23 @@
*-unixware1)
DEF_WANTHSREGEX=yes
OS='Unixware'
- CFLAGS="$CFLAGS -DSVR4 -DNO_LINGCLOSE"
+ CFLAGS="$CFLAGS -DUW=100"
LIBS="$LIBS -lsocket -lnsl -lcrypt"
;;
*-unixware2)
DEF_WANTHSREGEX=yes
OS='Unixware'
- CFLAGS="$CFLAGS -DSVR4 -DNO_LINGCLOSE"
+ CFLAGS="$CFLAGS -DUW=200"
LIBS="$LIBS -lsocket -lnsl -lcrypt -lgen"
;;
*-unixware211)
OS='Unixware 2.1.1'
- CFLAGS="$CFLAGS -DUW"
+ CFLAGS="$CFLAGS -DUW=211"
LIBS="$LIBS -lsocket -lnsl -lcrypt -lgen"
;;
*-unixware212)
OS='Unixware 2.1.2'
- CFLAGS="$CFLAGS -DUW"
+ CFLAGS="$CFLAGS -DUW=212"
LIBS="$LIBS -lsocket -lnsl -lcrypt -lgen"
DBM_LIB=""
;;
1.173 +2 -0 apachen/src/main/conf.h
Index: conf.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/conf.h,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- conf.h 1998/01/21 23:49:06 1.172
+++ conf.h 1998/01/21 23:59:56 1.173
@@ -472,7 +472,9 @@
#define HAVE_SYS_SELECT_H
#define HAVE_SYS_RESOURCE_H
#include <sys/time.h>
+#if UW >= 200
#define _POSIX_SOURCE
+#endif
#define NET_SIZE_T size_t
#define HAVE_SYSLOG
#define USE_FCNTL_SERIALIZED_ACCEPT
1.271 +5 -0 apachen/src/main/http_main.c
Index: http_main.c
===================================================================
RCS file: /export/home/cvs/apachen/src/main/http_main.c,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -r1.270 -r1.271
--- http_main.c 1998/01/21 22:24:04 1.270
+++ http_main.c 1998/01/21 23:59:58 1.271
@@ -2499,6 +2499,11 @@
#define WORKAROUND_SOLARIS_BUG
#endif
+ /* PR#1282 Unixware 1.x appears to have the same problem as solaris */
+#if defined (UW) && UW < 200
+#define WORKAROUND_SOLARIS_BUG
+#endif
+
#ifndef WORKAROUND_SOLARIS_BUG
s = ap_slack(s, AP_SLACK_HIGH);
