jim 98/07/18 08:30:47
Modified: src/helpers TestCompile
src/include ap_config.h
src/modules/standard mod_rewrite.c
Log:
Submitted by: Brian Havard" <[EMAIL PROTECTED]>
Reviewed by: Jim Jagielski
EMX OS/2 Port
Revision Changes Path
1.13 +1 -1 apache-1.3/src/helpers/TestCompile
Index: TestCompile
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/helpers/TestCompile,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TestCompile 1998/07/11 10:24:07 1.12
+++ TestCompile 1998/07/18 15:30:41 1.13
@@ -1,6 +1,6 @@
#!/bin/sh
exstat=1
-trap 'rm -f Makefile dummy testfunc.c testfunc; exit $exstat' 0 1 2 3 15
+trap 'rm -f Makefile dummy dummy.exe testfunc.c testfunc testfunc.exe; exit
$exstat' 0 1 2 3 15
#
# Yet another Apache Configure helper script.
# This script tests certain aspects of the compilation
1.227 +2 -0 apache-1.3/src/include/ap_config.h
Index: ap_config.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/ap_config.h,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- ap_config.h 1998/07/13 12:35:53 1.226
+++ ap_config.h 1998/07/18 15:30:43 1.227
@@ -662,6 +662,8 @@
#define NEED_STRNCASECMP
#define NO_SETSID
#define NO_TIMES
+/* ap_config_auto.h gets this wrong, force sys/select.h to be included */
+#define HAVE_SYS_SELECT_H
#define CASE_BLIND_FILESYSTEM
/* Add some drive name support */
#define chdir _chdir2
1.125 +1 -1 apache-1.3/src/modules/standard/mod_rewrite.c
Index: mod_rewrite.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- mod_rewrite.c 1998/07/12 15:47:39 1.124
+++ mod_rewrite.c 1998/07/18 15:30:46 1.125
@@ -3213,7 +3213,7 @@
"file %s", conf->rewritelockfile);
exit(1);
}
-#ifndef WIN32
+#if !defined(__EMX__) && !defined(WIN32)
/* make sure the childs have access to this file */
if (geteuid() == 0 /* is superuser */)
chown(conf->rewritelockfile, ap_user_id, -1 /* no gid change */);
