Merge pull request #24 from devilbox/release-0.29

Add Via Header

Author: cytopia

Dockerfile

@@ -7,6 +7,7 @@ LABEL \
 	vendor="devilbox" \
 	license="MIT"
 
+
 ###
 ### Build arguments
 ###
@@ -34,10 +35,8 @@ ENV HTTPD_RELOAD="/usr/local/apache2/bin/httpd -k stop"
 
 
 ###
-### Installation
+### Install required packages
 ###
-
-# required packages
 RUN set -x \
 	&& apt-get update \
 	&& apt-get install --no-install-recommends --no-install-suggests -y \
@@ -67,8 +66,12 @@ RUN set -x \
 		${BUILD_DEPS} \
 	&& rm -rf /var/lib/apt/lists/*
 
-# Add custom config directive to httpd server
+
+###
+### Configure Apache
+###
 RUN set -x \
+	&& APACHE_VERSION="$( httpd -V | grep -Eo 'Apache/[.0-9]+' | awk -F'/' '{print $2}' )" \
 	&& ( \
 		echo "ServerName localhost"; \
 		\
@@ -96,10 +99,23 @@ RUN set -x \
 		echo "SSLSessionCache        \"shmcb:/usr/local/apache2/logs/ssl_scache(512000)\""; \
 		echo "SSLSessionCacheTimeout  300"; \
 		\
+		echo "<If \"%{THE_REQUEST} =~ m#^.*HTTP/1\.0\$#\">"; \
+		echo "    Header always set Via \"1.0 %{HOSTNAME}e (apache/${APACHE_VERSION})\""; \
+		echo "</If>"; \
+		echo "<If \"%{THE_REQUEST} =~ m#^.*HTTP/1\.1\$#\">"; \
+		echo "    Header always set Via \"1.1 %{HOSTNAME}e (apache/${APACHE_VERSION})\""; \
+		echo "</If>"; \
+		echo "<If \"%{THE_REQUEST} =~ m#^.*HTTP/2\.0\$#\">"; \
+		echo "    Header always set Via \"2.0 %{HOSTNAME}e (apache/${APACHE_VERSION})\""; \
+		echo "</If>"; \
+		\
 		echo "HTTPProtocolOptions unsafe"; \
 	) >> /usr/local/apache2/conf/httpd.conf
 
-# create directories
+
+###
+### Create directories
+###
 RUN set -x \
 	&& mkdir -p /etc/httpd-custom.d \
 	&& mkdir -p /etc/httpd/conf.d \

README.md

@@ -246,13 +246,13 @@ $ docker run -d \
 
 #### 4. Ultimate pre-configured docker-compose setup
 
-Have a look at the **[devilbox](https://github.com/cytopia/devilbox)** for a fully-customizable docker-compose variant.
+Have a look at the **[Devilbox](https://github.com/cytopia/devilbox)** for a fully-customizable docker-compose variant.
 
 It offers pre-configured mass virtual hosts and an intranet.
 
 It allows any of the following combinations:
 
-* PHP 5.2, 5.3, 5.4, PHP 5.5, PHP 5.6, PHP 7.0, PHP 7.1, 7.2, 7.3 and 7.4
+* PHP 5.2, PHP 5.3, PHP 5.4, PHP 5.5, PHP 5.6, PHP 7.0, PHP 7.1, PHP 7.2, PHP 7.3,  PHP 7.4 and PHP 8.0
 * MySQL 5.5, MySQL 5.6, MySQL 5.7, MariaDB 5 and MariaDB 10
 * Apache 2.2, Apache 2.4, Nginx stable and Nginx mainline
 * And more to come...
@@ -261,8 +261,8 @@ It allows any of the following combinations:
 ## Version
 
 ```
-Server version: Apache/2.4.37 (Unix)
-Server built:   Dec 29 2018 02:11:11
+Server version: Apache/2.4.38 (Unix)
+Server built:   Feb 12 2019 21:20:23
 Server's Module Magic Number: 20120211:83
 Server loaded:  APR 1.5.2, APR-UTIL 1.5.4
 Compiled using: APR 1.5.2, APR-UTIL 1.5.4