Kristyna Streitova
de7dee913a
- access_compat shared also for 11sp3
- apache2-implicit-pointer-decl.patch renamed to
httpd-implicit-pointer-decl.patch to align with other
patches names
- apachectl is now wrapper to start_apache2; therefore, it honors
HTTPD_INSTANCE variable, see README-instances.txt for details
+ httpd-apachectl.patch
- httpd-2.4.10-apachectl.patch
- a2enmod/a2dismod and a2enflag/a2disflag now respect
HTTPD_INSTANCE=<instance_name> environment variable, which can be
used to specify apache instance name; sysconfig file is expected
at /etc/sysconfig/apache2@<instance_name>
(see README-instances.txt for details)
- provides suse_maintenance_mmn symbol [bnc#915666] (internal)
- credits to Roman Drahtmueller:
* add reference to /etc/permissions.local to output of %post if
setting the permissions of suexec2 fails
* do not enable mod_php5 by default any longer
* httpd-2.0.49-log_server_status.dif obsoleted
* apache2-mod_ssl_npn.patch removed because not used
* include mod_reqtimeout.conf in httpd.conf
* added cgid-timeout.conf, include
it in httpd.conf
- fix default value APACHE_MODULES in sysconfig file
- %service_* macros for apache2@.service
OBS-URL: https://build.opensuse.org/request/show/316550
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=453
28 lines
1.0 KiB
Diff
28 lines
1.0 KiB
Diff
|
|
Index: support/apachectl.in
|
|
===================================================================
|
|
--- support/apachectl.in.orig 2012-02-01 04:47:28.000000000 +0100
|
|
+++ support/apachectl.in 2015-07-13 17:09:06.651280087 +0200
|
|
@@ -42,7 +42,7 @@
|
|
# -------------------- --------------------
|
|
#
|
|
# 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 @@
|
|
# 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.
|