Petr Gajdos
02a733cd83
- modified patches
% apache2-mod_proxy_uwsgi-fix-crash.patch (refreshed)
- modified sources
% apache2-loadmodule.conf
% apache2-manual.conf
% apache2-script-helpers
% apache2@.service
% sysconfig.apache2
- deleted patches
- deprecated-scripts-arch.patch (not needed)
- httpd-2.0.54-envvars.dif (not needed)
- httpd-2.1.3alpha-layout.dif
(renamed to apache2-system-dirs-layout.patch)
- httpd-2.2.0-apxs-a2enmod.dif (not needed)
- httpd-2.4.9-bnc690734.patch
(renamed to apache2-LimitRequestFieldSize-limits-headers.patch)
- httpd-2.4.x-fate317766-config-control-two-protocol-options.diff
(renamed to apache2-HttpContentLengthHeadZero-HttpExpectStrict.patch)
- httpd-2.x.x-logresolve.patch
(renamed to apache2-logresolve-tmp-security.patch)
- httpd-apachectl.patch
(renamed to apache2-apachectl.patch)
- httpd-implicit-pointer-decl.patch (not needed)
- httpd-visibility.patch (not needed)
- deleted sources
- SUSE-NOTICE (outdated)
- a2enflag (renamed to apache2-a2enflag)
- a2enmod (renamed to apache2-a2enmod)
- apache-22-24-upgrade (outdated)
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=624
28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
|
|
Index: httpd-2.4.46/support/apachectl.in
|
|
===================================================================
|
|
--- httpd-2.4.46.orig/support/apachectl.in 2012-02-01 04:47:28.000000000 +0100
|
|
+++ httpd-2.4.46/support/apachectl.in 2020-11-09 15:29:52.479823800 +0100
|
|
@@ -42,7 +42,7 @@ ARGV="$@"
|
|
# -------------------- --------------------
|
|
#
|
|
# the path to your httpd binary, including options if necessary
|
|
-HTTPD='@exp_sbindir@/@progname@'
|
|
+HTTPD='@exp_sbindir@/start_apache2'
|
|
#
|
|
# pick up any necessary environment variables
|
|
if test -f @exp_sbindir@/envvars; then
|
|
@@ -52,7 +52,11 @@ 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
|
|
# 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.
|