brian 98/05/28 17:16:03
Modified: src CHANGES
src/include conf.h httpd.h
src/main http_main.c
Log:
various OS/2 cleanups.
Revision Changes Path
1.873 +2 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.872
retrieving revision 1.873
diff -u -r1.872 -r1.873
--- CHANGES 1998/05/28 23:59:33 1.872
+++ CHANGES 1998/05/29 00:15:51 1.873
@@ -1,5 +1,7 @@
Changes with Apache 1.3b8
+ *) Various OS/2 cleanups ["Brian Havard" <[EMAIL PROTECTED]>]
+
*) 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
1.212 +1 -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.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- conf.h 1998/05/28 23:59:39 1.211
+++ conf.h 1998/05/29 00:15:56 1.212
@@ -679,6 +679,7 @@
#define MAXSOCKETS 4096
#define USE_OS2_SCOREBOARD
#define NO_RELIABLE_PIPED_LOGS
+#define HAVE_SYS_SELECT_H 1
#elif defined(__MACHTEN__)
typedef int rlim_t;
1.218 +3 -0 apache-1.3/src/include/httpd.h
Index: httpd.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- httpd.h 1998/05/28 19:57:07 1.217
+++ httpd.h 1998/05/29 00:15:56 1.218
@@ -887,6 +887,9 @@
API_EXPORT(int) ap_strcmp_match(const char *str, const char *exp);
API_EXPORT(int) ap_strcasecmp_match(const char *str, const char *exp);
API_EXPORT(char *) ap_uudecode(pool *, const char *);
+#ifdef __EMX__
+void os2pathname(char *path);
+#endif
API_EXPORT(char *) ap_pregsub(pool *p, const char *input, const char *source,
size_t nmatch, regmatch_t pmatch[]);
1.356 +1 -1 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.355
retrieving revision 1.356
diff -u -r1.355 -r1.356
--- http_main.c 1998/05/28 23:59:35 1.355
+++ http_main.c 1998/05/29 00:15:59 1.356
@@ -189,6 +189,7 @@
#ifdef USE_OS2_SCOREBOARD
/* Add MMAP style functionality to OS/2 */
#define INCL_DOSMEMMGR
+#define INCL_DOSEXCEPTIONS
#include <os2.h>
#include <umalloc.h>
#include <stdio.h>
@@ -1485,7 +1486,6 @@
{
caddr_t m;
- char errstr[MAX_STRING_LEN];
int rc;
m = (caddr_t) create_shared_heap("\\SHAREMEM\\SCOREBOARD",
SCOREBOARD_SIZE);
