e249e1729b
- Upgrade to apache 2.4.2 ** ATTENTION, before installing this update YOU MUST READ http://httpd.apache.org/docs/2.4/upgrading.html CAREFULLY otherwise your server will most likely fail to start due to backward incompatible changes. * You can read the huge complete list of changes at http://httpd.apache.org/docs/2.4/new_features_2_4.html OBS-URL: https://build.opensuse.org/request/show/129508 OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=370
56 lines
1.4 KiB
Plaintext
56 lines
1.4 KiB
Plaintext
--- support/apachectl.in.orig
|
|
+++ support/apachectl.in
|
|
@@ -42,17 +42,32 @@ ARGV="$@"
|
|
# -------------------- --------------------
|
|
#
|
|
# the path to your httpd binary, including options if necessary
|
|
-HTTPD='@exp_sbindir@/@progname@'
|
|
+HTTPD='@exp_sbindir@/httpd2'
|
|
#
|
|
# pick up any necessary environment variables
|
|
if test -f @exp_sbindir@/envvars; then
|
|
. @exp_sbindir@/envvars
|
|
fi
|
|
+
|
|
+pname=apache2
|
|
+sysconfig_apache=/etc/sysconfig/$pname
|
|
+sysconfdir=/etc/$pname
|
|
+
|
|
+test -s $sysconfig_apache && source $sysconfig_apache
|
|
+httpd_conf=${APACHE_HTTPD_CONF:-$sysconfdir/httpd.conf}
|
|
+
|
|
#
|
|
# a command that outputs a formatted text version of the HTML at the
|
|
# url given on the command line. Designed for lynx, however other
|
|
# programs may work.
|
|
-LYNX="@LYNX_PATH@ -dump"
|
|
+
|
|
+if [ -x "`which w3m`" ]; then
|
|
+ LYNX="w3m -dump -cols ${COLUMNS:-80}"
|
|
+elif [ -x "`which lynx`" ]; then
|
|
+ LYNX="lynx -dump -width=${COLUMNS:-80}"
|
|
+fi
|
|
+
|
|
+
|
|
#
|
|
# the URL to your server's mod_status status page. If you do not
|
|
# have one, then status and fullstatus will not work.
|
|
@@ -78,7 +93,7 @@ fi
|
|
|
|
case $ACMD in
|
|
start|stop|restart|graceful|graceful-stop)
|
|
- $HTTPD -k $ARGV
|
|
+ $HTTPD ${httpd_conf+-f $httpd_conf} -k $ARGV
|
|
ERROR=$?
|
|
;;
|
|
startssl|sslstart|start-SSL)
|
|
@@ -88,7 +103,7 @@ startssl|sslstart|start-SSL)
|
|
ERROR=2
|
|
;;
|
|
configtest)
|
|
- $HTTPD -t
|
|
+ $HTTPD ${httpd_conf+-f $httpd_conf} -t
|
|
ERROR=$?
|
|
;;
|
|
status)
|