From bb2c875c0573564798aafa0489a0a867566bd2d1 Mon Sep 17 00:00:00 2001
From: Rafael Monnerat <rafael@nexedi.com>
Date: Fri, 24 Mar 2017 11:50:35 +0100
Subject: [PATCH] apache-frontend: Enable HTTP/2.0
---
software/apache-frontend/buildout.hash.cfg | 4 ++--
software/apache-frontend/templates/apache.conf.in | 1 +
.../apache-frontend/templates/default-virtualhost.conf.in | 4 ++++
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/software/apache-frontend/buildout.hash.cfg b/software/apache-frontend/buildout.hash.cfg
index 55edcd3f7..c221ff880 100644
--- a/software/apache-frontend/buildout.hash.cfg
+++ b/software/apache-frontend/buildout.hash.cfg
@@ -39,7 +39,7 @@ md5sum = 665e83d660c9b779249b2179d7ce4b4e
[template-apache-frontend-configuration]
filename = templates/apache.conf.in
-md5sum = 0382e39cd6ed7ce68c07ef906049dbcf
+md5sum = dda0a7567d83924658fa515e784ff7ea
[template-custom-slave-list]
filename = templates/apache-custom-slave-list.cfg.in
@@ -55,7 +55,7 @@ md5sum = d98a01182f38868612948c87d5231428
[template-default-slave-virtualhost]
filename = templates/default-virtualhost.conf.in
-md5sum = 49e025b77c8de08d977e5636220d40ed
+md5sum = 8fda2e88476ccb3652036302364f3506
[template-cached-slave-virtualhost]
filename = templates/cached-virtualhost.conf.in
diff --git a/software/apache-frontend/templates/apache.conf.in b/software/apache-frontend/templates/apache.conf.in
index cb839c8d7..dfdc5ccb3 100644
--- a/software/apache-frontend/templates/apache.conf.in
+++ b/software/apache-frontend/templates/apache.conf.in
@@ -80,6 +80,7 @@ LoadModule auth_basic_module {{ httpd_home }}/modules/mod_auth_basic.so
LoadModule authz_user_module {{ httpd_home }}/modules/mod_authz_user.so
LoadModule authn_file_module {{ httpd_home }}/modules/mod_authn_file.so
LoadModule filter_module {{ httpd_home }}/modules/mod_filter.so
+LoadModule http2_module {{ httpd_home }}/modules/mod_http2.so
# The following directives modify normal HTTP response behavior to
# handle known problems with browser implementations.
diff --git a/software/apache-frontend/templates/default-virtualhost.conf.in b/software/apache-frontend/templates/default-virtualhost.conf.in
index dcd6a28c1..a39994b0d 100644
--- a/software/apache-frontend/templates/default-virtualhost.conf.in
+++ b/software/apache-frontend/templates/default-virtualhost.conf.in
@@ -33,6 +33,8 @@
SSLProtocol all -SSLv2 -SSLv3
SSLCipherSuite ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:HIGH:!aNULL:!MD5
SSLHonorCipherOrder on
+ Protocols h2 http/1.1
+
{% for key, value in ssl_configuration_list -%}
{% if value in slave_parameter -%}
@@ -121,6 +123,8 @@
# Remove "Secure" from cookies, as backend may be https
Header edit Set-Cookie "(?i)^(.+);secure$" "$1"
+ Protocols h2 http/1.1
+
{% if disable_no_cache_header %}
RequestHeader unset Cache-Control
RequestHeader unset Pragma
--
GitLab