From: Frank Brehm <frank@brehm-online.com>
Date: Sun, 8 Apr 2018 10:47:05 +0000 (+0200)
Subject: saving uncommitted changes in /etc prior to emerge run
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=122adb92a9d9a198b552f36af376578e9e8745ae;p=config%2Fbruni%2Fetc.git

saving uncommitted changes in /etc prior to emerge run
---

diff --git a/apache2/modules.d/00_apache_manual.conf b/apache2/modules.d/00_apache_manual.conf
index fcd0e010..208d1c26 100644
--- a/apache2/modules.d/00_apache_manual.conf
+++ b/apache2/modules.d/00_apache_manual.conf
@@ -5,9 +5,9 @@
 <IfModule negotiation_module>
 <IfModule setenvif_module>
 <IfDefine MANUAL>
-AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.4.27-r1/manual$1"
+AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.4.29-r1/manual$1"
 
-<Directory "/usr/share/doc/apache-2.4.27-r1/manual">
+<Directory "/usr/share/doc/apache-2.4.29-r1/manual">
 	Options Indexes
 	AllowOverride None
 	Require all granted
diff --git a/apache2/modules.d/41_mod_http2.conf b/apache2/modules.d/41_mod_http2.conf
index 68b4838c..e4c9454e 100644
--- a/apache2/modules.d/41_mod_http2.conf
+++ b/apache2/modules.d/41_mod_http2.conf
@@ -4,6 +4,6 @@
     #LogLevel http2:info
 
     #Enable HTTP/2 support
-    Protocols h2 http/1.1
+    Protocols h2 h2c http/1.1
   </IfModule>
 </IfDefine>