You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2001/12/15 14:56:36 UTC
cvs commit: httpd-2.0/support envvars-std.in .cvsignore Makefile.in apachectl.in
trawick 01/12/15 05:56:36
Modified: . CHANGES Makefile.in configure.in
support .cvsignore Makefile.in apachectl.in
Added: support envvars-std.in
Log:
Move any load library path environment variables out of
apachectl and into a separate environment variable file which
can be more easily tailored by the admin. The environment
variable file as built by Apache may have additional system-
specific settings. For example, on OS/390 we tailor the heap
settings to allow lots of threads.
Revision Changes Path
1.476 +7 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.475
retrieving revision 1.476
diff -u -r1.475 -r1.476
--- CHANGES 2001/12/14 16:29:43 1.475
+++ CHANGES 2001/12/15 13:56:36 1.476
@@ -1,5 +1,12 @@
Changes with Apache 2.0.30-dev
+ *) Move any load library path environment variables out of
+ apachectl and into a separate environment variable file which
+ can be more easily tailored by the admin. The environment
+ variable file as built by Apache may have additional system-
+ specific settings. For example, on OS/390 we tailor the heap
+ settings to allow lots of threads. [Jeff Trawick]
+
*) Use the new APR pool code to reduce pool-related lock
contention in the worker MPM. [Sander Striker]
1.95 +6 -0 httpd-2.0/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-2.0/Makefile.in,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- Makefile.in 2001/12/07 19:06:58 1.94
+++ Makefile.in 2001/12/15 13:56:36 1.95
@@ -76,6 +76,12 @@
$(INSTALL_DATA) $(sysconfdir)/$$i $(sysconfdir)/$$file; \
fi; \
done
+ @if test -f "$(builddir)/envvars-std"; then \
+ cp -p envvars-std $(sbindir); \
+ if test ! -f $(sbindir)/envvars; then \
+ cp -p envvars-std $(sbindir)/envvars ; \
+ fi ; \
+ fi
install-build:
@echo Installing build system files
1.191 +15 -1 httpd-2.0/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/httpd-2.0/configure.in,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- configure.in 2001/12/12 19:39:54 1.190
+++ configure.in 2001/12/15 13:56:36 1.191
@@ -240,6 +240,19 @@
bindprocessor \
)
+dnl ## Set up any appropriate OS-specific environment variables for apachectl
+
+case $host in
+ *aix*)
+ OS_SPECIFIC_VARS="set LDR_CNTRL=\"MAXDATA=0x80000000\" ; export LDR_CNTRL ; set AIXTHREAD_SCOPE=S ; export AIXTHREAD_SCOPE"
+ ;;
+ *os390*)
+ OS_SPECIFIC_VARS="export _CEE_RUNOPTS=\"(STACK(,,ANY))\" ; export _EDC_ADD_ERRNO2=1"
+ ;;
+ *)
+ OS_SPECIFIC_VARS=""
+esac
+
AC_ARG_WITH(port,APACHE_HELP_STRING(--with-port=PORT,Port on which to listen (default is 80)),
[if test "$withval" = "yes"; then AC_MSG_ERROR('option --with-port requires a value (the TCP port number)'); else PORT="$withval"; fi],
[PORT=80])
@@ -262,6 +275,7 @@
APACHE_SUBST(OS_DIR)
APACHE_SUBST(BUILTIN_LIBS)
APACHE_SUBST(SHLIBPATH_VAR)
+APACHE_SUBST(OS_SPECIFIC_VARS)
PRE_SHARED_CMDS='echo ""'
POST_SHARED_CMDS='echo ""'
@@ -437,7 +451,7 @@
;;
esac
-AC_OUTPUT($APACHE_OUTPUT_FILES support/apxs support/apachectl support/dbmmanage support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk,,[
+AC_OUTPUT($APACHE_OUTPUT_FILES support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk,,[
APACHE_GEN_MAKEFILES
])
1.15 +1 -0 httpd-2.0/support/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/httpd-2.0/support/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 2001/10/27 13:00:55 1.14
+++ .cvsignore 2001/12/15 13:56:36 1.15
@@ -18,6 +18,7 @@
apachectl
checkgid
dbmmanage
+envvars-std
log_server_status
logresolve.pl
split-logfile
1.31 +6 -0 httpd-2.0/support/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-2.0/support/Makefile.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Makefile.in 2001/12/12 19:39:55 1.30
+++ Makefile.in 2001/12/15 13:56:36 1.31
@@ -21,6 +21,12 @@
chmod 755 $(sbindir)/$$i; \
fi ; \
done
+ @if test -f "$(builddir)/envvars-std"; then \
+ cp -p envvars-std $(sbindir); \
+ if test ! -f $(sbindir)/envvars; then \
+ cp -p envvars-std $(sbindir)/envvars ; \
+ fi ; \
+ fi
htpasswd_OBJECTS = htpasswd.lo
htpasswd: $(htpasswd_OBJECTS)
1.9 +6 -6 httpd-2.0/support/apachectl.in
Index: apachectl.in
===================================================================
RCS file: /home/cvs/httpd-2.0/support/apachectl.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- apachectl.in 2001/12/03 18:00:04 1.8
+++ apachectl.in 2001/12/15 13:56:36 1.9
@@ -20,6 +20,7 @@
# When multiple arguments are given, only the error from the _last_
# one is reported. Run "apachectl help" for usage info
#
+ARGV="$@"
#
# |||||||||||||||||||| START CONFIGURATION SECTION ||||||||||||||||||||
# -------------------- --------------------
@@ -30,10 +31,10 @@
# the path to your httpd binary, including options if necessary
HTTPD='@prefix@/bin/@progname@'
#
-# the following lines are automatically uncommented for
-# binary builds
-#binbuild @SHLIBPATH_VAR@='@prefix@/lib/:$@SHLIBPATH_VAR@'
-#binbuild export @SHLIBPATH_VAR@
+# pick up any necessary environment variables
+if test -f @prefix@/bin/envvars; then
+ . @prefix@/bin/envvars
+fi
#
# a command that outputs a formatted text version of the HTML at the
# url given on the command line. Designed for lynx, however other
@@ -48,12 +49,11 @@
# |||||||||||||||||||| END CONFIGURATION SECTION ||||||||||||||||||||
ERROR=0
-ARGV="$@"
if [ "x$ARGV" = "x" ] ; then
ARGS="help"
fi
-for ARG in $@ $ARGS
+for ARG in $ARGV $ARGS
do
# check for pidfile
if [ -f $PIDFILE ] ; then
1.1 httpd-2.0/support/envvars-std.in
Index: envvars-std.in
===================================================================
# envvars-std - default environment variables for apachectl
#
# This file is generated from envvars-std.in
#
# the following lines are automatically uncommented for
# binary builds
#binbuild @SHLIBPATH_VAR@='@prefix@/lib/:$@SHLIBPATH_VAR@'
#binbuild export @SHLIBPATH_VAR@
#
@OS_SPECIFIC_VARS@