randy 99/06/22 14:55:31
Modified: src CHANGES Configure
src/helpers TestCompile
Log:
Add support for DSO on DGUX using gcc. Tested on x86 platforms.
Revision Changes Path
1.1384 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1383
retrieving revision 1.1384
diff -u -r1.1383 -r1.1384
--- CHANGES 1999/06/22 00:51:26 1.1383
+++ CHANGES 1999/06/22 21:54:41 1.1384
@@ -1,5 +1,8 @@
Changes with Apache 1.3.7
+ *) Add DSO support for DGUX 4.x using gcc. Tested on x86 platforms.
+ [Randy Terbush <[EMAIL PROTECTED]>]
+
*) Add the new mass-vhost module (mod_vhost_alias.c) developed and
used by Demon Internet, LTD. [Tony Finch <[EMAIL PROTECTED]>]
1.356 +12 -3 apache-1.3/src/Configure
Index: Configure
===================================================================
RCS file: /home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -r1.355 -r1.356
--- Configure 1999/06/18 07:53:38 1.355
+++ Configure 1999/06/22 21:54:42 1.356
@@ -1190,6 +1190,14 @@
SHCORE_IMPLIB='ApacheCoreOS2.a'
OS_MODULE_INCLUDE='Makefile.OS2'
;;
+ *-dgux)
+ case $CC in
+ */gcc|gcc ) CFLAGS_SHLIB="-fpic" ;;
+ esac
+ DEF_SHARED_CORE=yes
+ LDFLAGS_SHLIB="-G"
+ LDFLAGS_SHLIB_EXPORT=""
+ ;;
*)
## ok, no known explict support for shared objects
## on this platform, but we give not up immediately.
@@ -1358,11 +1366,12 @@
*-dg-dgux*)
# R4.11MU02 requires -lsocket -lnsl ... no idea if it's earlier or
# later than what we already knew about. PR#732
- if ./helpers/TestCompile lib socket; then
- LIBS="$LIBS -lsocket"
- fi
if ./helpers/TestCompile lib nsl; then
LIBS="$LIBS -lnsl"
+ TLIB='-lnsl'
+ fi
+ if TLIB=$TLIB ./helpers/TestCompile lib socket; then
+ LIBS="-lsocket $LIBS"
fi
;;
esac
1.32 +1 -1 apache-1.3/src/helpers/TestCompile
Index: TestCompile
===================================================================
RCS file: /home/cvs/apache-1.3/src/helpers/TestCompile,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- TestCompile 1999/06/09 10:45:02 1.31
+++ TestCompile 1999/06/22 21:54:54 1.32
@@ -77,7 +77,7 @@
if [ "x$2" = "x" ]; then
exit
fi
- TLIB="-l$2"
+ TLIB="-l$2 $TLIB"
if [ "x$VERBOSE" = "xyes" ]; then
ERRDIR=""
else
Modified: src/main http_main.c
Log:
Add some more debug info.
Revision Changes Path
1.448 +4 -4 apache-1.3/src/main/http_main.c
Index: http_main.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -r1.447 -r1.448
--- http_main.c 1999/06/22 00:51:30 1.447
+++ http_main.c 1999/06/22 21:55:25 1.448
@@ -3660,7 +3660,7 @@
if (setuid(ap_user_id) == -1) {
GETUSERMODE();
ap_log_error(APLOG_MARK, APLOG_ALERT, server_conf,
- "setuid: unable to change uid");
+ "setuid: unable to change to uid: %d", ap_user_id);
exit(1);
}
GETUSERMODE();
@@ -3673,7 +3673,7 @@
#endif
setuid(ap_user_id) == -1)) {
ap_log_error(APLOG_MARK, APLOG_ALERT, server_conf,
- "setuid: unable to change uid");
+ "setuid: unable to change to uid: %d", ap_user_id);
clean_child_exit(APEXIT_CHILDFATAL);
}
#endif
@@ -4823,7 +4823,7 @@
if (setuid(ap_user_id) == -1) {
GETUSERMODE();
ap_log_error(APLOG_MARK, APLOG_ALERT, server_conf,
- "setuid: unable to change uid");
+ "setuid: unable to change to uid: %d", ap_user_id);
exit(1);
}
GETUSERMODE();
@@ -4832,7 +4832,7 @@
/* Only try to switch if we're running as root */
if (!geteuid() && setuid(ap_user_id) == -1) {
ap_log_error(APLOG_MARK, APLOG_ALERT, server_conf,
- "setuid: unable to change uid");
+ "setuid: unable to change to uid: %d", ap_user_id);
exit(1);
}
#endif
