package apache: upgrade to 2.4.25

- refresh patches

Signed-off-by: heil <heil@terminal-consulting.de>
This commit is contained in:
heil
2016-12-26 23:42:01 +01:00
parent c785ad365c
commit f8b42ce2c9
6 changed files with 68 additions and 41 deletions
+16 -13
View File
@@ -1,14 +1,16 @@
--- a/docs/conf/httpd.conf.in
+++ b/docs/conf/httpd.conf.in
@@ -52,7 +52,6 @@ Listen @@Port@@
Index: httpd-2.4.25/docs/conf/httpd.conf.in
===================================================================
--- httpd-2.4.25.orig/docs/conf/httpd.conf.in
+++ httpd-2.4.25/docs/conf/httpd.conf.in
@@ -63,7 +63,6 @@ Listen @@Port@@
# Example:
# LoadModule foo_module modules/mod_foo.so
#
-@@LoadModule@@
<IfModule !mpm_netware_module>
<IfModule !mpm_winnt_module>
@@ -64,8 +63,8 @@ Listen @@Port@@
<IfModule unixd_module>
#
@@ -74,8 +73,8 @@ Listen @@Port@@
# It is usually good practice to create a dedicated user and group for
# running httpd, as with most system services.
#
@@ -18,8 +20,8 @@
+Group nogroup
</IfModule>
</IfModule>
@@ -192,7 +191,7 @@ ErrorLog "@rel_logfiledir@/error_log"
@@ -188,7 +187,7 @@ ErrorLog "@rel_logfiledir@/error_log"
# Possible values include: debug, info, notice, warn, error, crit,
# alert, emerg.
#
@@ -28,7 +30,7 @@
<IfModule log_config_module>
#
@@ -337,7 +336,7 @@ DefaultType text/plain
@@ -330,7 +329,7 @@ LogLevel warn
# contents of the file itself to determine its type. The MIMEMagicFile
# directive tells the module where the hint definitions are located.
#
@@ -37,16 +39,16 @@
#
# Customizable error responses come in three flavors:
@@ -366,7 +365,7 @@ DefaultType text/plain
# broken on your system.
@@ -360,7 +359,7 @@ LogLevel warn
# Defaults: EnableMMAP On, EnableSendfile Off
#
#EnableMMAP off
-#EnableSendfile off
-#EnableSendfile on
+EnableSendfile off
# Supplemental configuration
#
@@ -412,7 +411,7 @@ DefaultType text/plain
@@ -411,8 +410,8 @@ Include @rel_sysconfdir@/extra/proxy-htm
# starting without SSL on platforms with no /dev/random equivalent
# but a statically compiled-in mod_ssl.
#
@@ -58,3 +60,4 @@
+#SSLRandomSeed startup builtin
+#SSLRandomSeed connect builtin
+#</IfModule>