From 5391a9beb25ff182889d175356652b09d50248ac Mon Sep 17 00:00:00 2001 From: Olli Hauer Date: Sat, 31 Jan 2015 15:22:51 +0000 Subject: - update to 2.4.12 - change MPM backend from static to dynamic, but keep mpm_prefork for compatiblity with e.g. php modules - install dedicated MPM load file in case httpd was build with modular MPM (modules.d/000_mpm_prefork_fallback.conf) - disable SSLv3 and SSLv2 fallback in sample httpd-ssl-conf - use @sample macro instead EXAMPLESDIR - add some SSLCipherSuite examples for OpenSSL >= 1.0.x - add libressl support [1] - add pkg-install script (to handle new modular MPM build) - build now most all modules, so users using packages don't have to run a custom build for missing modules - fix suexec mode PR: 196139 [1] MFH: 2015Q1 --- www/apache24/files/patch-support__apachectl.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'www/apache24/files/patch-support__apachectl.in') diff --git a/www/apache24/files/patch-support__apachectl.in b/www/apache24/files/patch-support__apachectl.in index bd23406991e5..b093f49ae438 100644 --- a/www/apache24/files/patch-support__apachectl.in +++ b/www/apache24/files/patch-support__apachectl.in @@ -1,6 +1,6 @@ ---- ./support/apachectl.in.orig 2012-02-01 04:47:28.000000000 +0100 -+++ ./support/apachectl.in 2013-03-22 18:55:53.000000000 +0100 -@@ -43,6 +43,7 @@ +--- support/apachectl.in.orig 2012-02-01 03:47:28 UTC ++++ support/apachectl.in +@@ -43,6 +43,7 @@ ARGV="$@" # # the path to your httpd binary, including options if necessary HTTPD='@exp_sbindir@/@progname@' @@ -8,7 +8,7 @@ # # pick up any necessary environment variables if test -f @exp_sbindir@/envvars; then -@@ -66,19 +67,21 @@ +@@ -66,19 +67,21 @@ ULIMIT_MAX_FILES="@APACHECTL_ULIMIT@" # -------------------- -------------------- # |||||||||||||||||||| END CONFIGURATION SECTION |||||||||||||||||||| @@ -34,7 +34,7 @@ ERROR=$? ;; startssl|sslstart|start-SSL) -@@ -88,11 +91,13 @@ +@@ -88,11 +91,13 @@ startssl|sslstart|start-SSL) ERROR=2 ;; configtest) -- cgit v1.2.3