dgaudet 98/05/28 16:59:40
Modified: src CHANGES
src/main http_main.c
src/include conf.h
Log:
PORT: QNX needed a #include <sys/mman.h>; and now it uses flock
serialized accept to handle multiple sockets.
PR: 2295, 2296
Submitted by: Rob Saccoccio <[EMAIL PROTECTED]>
Revision Changes Path
1.872 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.871
retrieving revision 1.872
diff -u -r1.871 -r1.872
--- CHANGES 1998/05/28 23:27:59 1.871
+++ CHANGES 1998/05/28 23:59:33 1.872
@@ -1,5 +1,9 @@
Changes with Apache 1.3b8
+ *) PORT: QNX needed a #include <sys/mman.h>; and now it uses flock
+ serialized accept to handle multiple sockets.
+ [Rob Saccoccio <[EMAIL PROTECTED]>] PR#2295, 2296
+
*) Have NT properly set the directory for CGI scripts
(& other spawned children)
[W G Stoddard <[EMAIL PROTECTED]>]
1.355 +1 -0 apache-1.3/src/main/http_main.c
Index: http_main.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -r1.354 -r1.355
--- http_main.c 1998/05/21 04:07:21 1.354
+++ http_main.c 1998/05/28 23:59:35 1.355
@@ -1518,6 +1518,7 @@
}
#elif defined(USE_POSIX_SCOREBOARD)
+#include <sys/mman.h>
/*
* POSIX 1003.4 style
*
1.211 +2 -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.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- conf.h 1998/05/11 19:59:01 1.210
+++ conf.h 1998/05/28 23:59:39 1.211
@@ -626,6 +626,8 @@
#include <unix.h>
#define HAVE_MMAP 1
#define USE_POSIX_SCOREBOARD
+#define USE_FLOCK_SERIALIZED_ACCEPT
+#define SINGLE_LISTEN_UNSERIALIZED_ACCEPT
#define HAVE_SYSLOG 1
#elif defined(LYNXOS)