From d5caba5e11bd04482f48323e014859358a34ccd8 Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Sun, 6 Jan 2019 12:54:34 +0100
Subject: [PATCH 1/3] Fixes #431: Use HTTP/2 as default for all SSL connections

---
 README.md          | 6 +++++-
 docker-compose.yml | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index cf3578c3..946eb647 100644
--- a/README.md
+++ b/README.md
@@ -401,6 +401,10 @@ The Devilbox has everything setup for you. The only thing you will have to insta
 
 <table>
 <tbody>
+  <tr>
+    <td width="220" style="width:220px;">:star: HTTP/2 support</td>
+    <td>All HTTPS connections will offer <a href="https://en.wikipedia.org/wiki/HTTP/2">HTTP/2</a> as the default protocol, except for Apache 2.2 which does not support it.</td>
+  </tr>
   <tr>
     <td width="220" style="width:220px;">:star: Auto virtual hosts</td>
     <td>New virtual hosts are created automatically and instantly whenever you add a project directory. This is done internally via <a href="https://travis-ci.org/devilbox/vhost-gen">vhost-gen</a> and <a href="https://github.com/devilbox/watcherd">watcherd</a>.</td>
@@ -423,7 +427,7 @@ The Devilbox has everything setup for you. The only thing you will have to insta
   </tr>
   <tr>
     <td>:star: Custom domains</td>
-    <td>Choose whatever development domain you desire: <code>*.loc</code>, <code>*.local</code>, <code>*.dev</code> or use real domains as well: <code>*.example.com</code></td>
+    <td>Choose whatever development domain you desire: <code>*.loc</code>, <code>*.dev</code> or use real domains as well: <code>*.example.com</code></td>
   </tr>
   <tr>
     <td>:star: Auto DNS</td>
diff --git a/docker-compose.yml b/docker-compose.yml
index de086d3e..2473d453 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -210,7 +210,7 @@ services:
   # Web Server
   # ------------------------------------------------------------
   httpd:
-    image: devilbox/${HTTPD_SERVER}:0.25
+    image: devilbox/${HTTPD_SERVER}:0.26
     hostname: httpd
 
     environment:

From 9fb398a5ee9b801fc371a14da9dc283767c799bb Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Sun, 6 Jan 2019 12:58:26 +0100
Subject: [PATCH 2/3] Bump version

---
 .devilbox/www/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devilbox/www/config.php b/.devilbox/www/config.php
index ac75da30..bc064fdb 100644
--- a/.devilbox/www/config.php
+++ b/.devilbox/www/config.php
@@ -14,7 +14,7 @@ putenv('RES_OPTIONS=retrans:1 retry:1 timeout:1 attempts:1');
 
 
 $DEVILBOX_VERSION = 'v0.15';
-$DEVILBOX_DATE = '2019-01-02';
+$DEVILBOX_DATE = '2019-01-06';
 $DEVILBOX_API_PAGE = 'devilbox-api/status.json';
 
 //

From eb53315861a23d2b03bef45e9ebbb34cd68b3bc9 Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Sun, 6 Jan 2019 13:02:38 +0100
Subject: [PATCH 3/3] Update vhost-gen templates

---
 cfg/vhost-gen/apache24.yml-example-rproxy | 3 ++-
 cfg/vhost-gen/apache24.yml-example-vhost  | 3 ++-
 cfg/vhost-gen/nginx.yml-example-rproxy    | 2 +-
 cfg/vhost-gen/nginx.yml-example-vhost     | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/cfg/vhost-gen/apache24.yml-example-rproxy b/cfg/vhost-gen/apache24.yml-example-rproxy
index c5170b0a..0bbc9c3d 100644
--- a/cfg/vhost-gen/apache24.yml-example-rproxy
+++ b/cfg/vhost-gen/apache24.yml-example-rproxy
@@ -40,7 +40,8 @@
 ###
 vhost: |
   <VirtualHost __DEFAULT_VHOST__:__PORT__>
-      ServerName   __VHOST_NAME__
+      ServerName __VHOST_NAME__
+      Protocols  __HTTP_PROTO__
 
       CustomLog  "__ACCESS_LOG__" combined
       ErrorLog   "__ERROR_LOG__"
diff --git a/cfg/vhost-gen/apache24.yml-example-vhost b/cfg/vhost-gen/apache24.yml-example-vhost
index ca8a036f..061428ad 100644
--- a/cfg/vhost-gen/apache24.yml-example-vhost
+++ b/cfg/vhost-gen/apache24.yml-example-vhost
@@ -46,7 +46,8 @@
 ###
 vhost: |
   <VirtualHost __DEFAULT_VHOST__:__PORT__>
-      ServerName   __VHOST_NAME__
+      ServerName __VHOST_NAME__
+      Protocols  __HTTP_PROTO__
 
       CustomLog  "__ACCESS_LOG__" combined
       ErrorLog   "__ERROR_LOG__"
diff --git a/cfg/vhost-gen/nginx.yml-example-rproxy b/cfg/vhost-gen/nginx.yml-example-rproxy
index 26729ab4..25167b13 100644
--- a/cfg/vhost-gen/nginx.yml-example-rproxy
+++ b/cfg/vhost-gen/nginx.yml-example-rproxy
@@ -40,7 +40,7 @@
 ###
 vhost: |
   server {
-      listen       __PORT____DEFAULT_VHOST__;
+      listen       __PORT____HTTP_PROTO____DEFAULT_VHOST__;
       server_name  __VHOST_NAME__;
 
       access_log   "__ACCESS_LOG__" combined;
diff --git a/cfg/vhost-gen/nginx.yml-example-vhost b/cfg/vhost-gen/nginx.yml-example-vhost
index 44c4c09f..524ca691 100644
--- a/cfg/vhost-gen/nginx.yml-example-vhost
+++ b/cfg/vhost-gen/nginx.yml-example-vhost
@@ -46,7 +46,7 @@
 ###
 vhost: |
   server {
-      listen       __PORT____DEFAULT_VHOST__;
+      listen       __PORT____HTTP_PROTO____DEFAULT_VHOST__;
       server_name  __VHOST_NAME__;
 
       access_log   "__ACCESS_LOG__" combined;