From 7d296c35c7337ca183bd31326e10e15d54ca187b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Colombaro?= <git@colombaro.fr>
Date: Wed, 4 Apr 2018 13:55:48 +0200
Subject: [PATCH] Apache httpd 2.2 End-of-Life

---
 .travis.yml                          |  5 -----
 README.md                            |  2 +-
 bin/setup/2.2.conf                   | 20 --------------------
 src/security/file_access.conf        | 18 ++++--------------
 src/web_performance/compression.conf |  6 ------
 5 files changed, 5 insertions(+), 46 deletions(-)
 delete mode 100644 bin/setup/2.2.conf

diff --git a/.travis.yml b/.travis.yml
index 39835e00..51021bef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,11 +12,6 @@ env:
 
 jobs:
   include:
-    - env: # Tests for Apache 2.2.x
-        - APACHE_VERSION="2.2"
-        - CONF_TARGET="default"
-      before_script: ./bin/setup/setup.sh
-      dist: precise
     - env: # Tests for Apache 2.4.x
        - APACHE_VERSION="2.4"
        - CONF_TARGET="000-default.conf"
diff --git a/README.md b/README.md
index 7089bf2d..476ad67c 100644
--- a/README.md
+++ b/README.md
@@ -193,7 +193,7 @@ $ path/to/server-configs-apache/bin/build.sh ./.htaccess ~/htaccess.conf
 
 ## Support
 
-* ### __Apache v2.2.0+__
+* ### __Apache v2.4.0+__
 * ### __Browsers:__
   * Chrome
   * Firefox 4+
diff --git a/bin/setup/2.2.conf b/bin/setup/2.2.conf
deleted file mode 100644
index 72aec0ff..00000000
--- a/bin/setup/2.2.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-<VirtualHost *:80>
-
-    DocumentRoot %TRAVIS_BUILD_DIR%
-
-    <Directory "%TRAVIS_BUILD_DIR%">
-        Options Indexes FollowSymLinks MultiViews
-        AllowOverride All
-        Order allow,deny
-        Allow from all
-    </Directory>
-
-    <Location "/.well-known/manifest.json">
-        AddType application/manifest+json json
-    </Location>
-
-    <Location "/test-schema.json">
-        AddType application/schema+json json
-    </Location>
-
-</VirtualHost>
diff --git a/src/security/file_access.conf b/src/security/file_access.conf
index 6b3d86b5..b260f432 100644
--- a/src/security/file_access.conf
+++ b/src/security/file_access.conf
@@ -53,18 +53,8 @@
 # include: configuration files, files that contain metadata about the
 # project (e.g.: project dependencies), build scripts, etc..
 
-<FilesMatch "(^#.*#|\.(bak|conf|dist|fla|in[ci]|log|orig|psd|sh|sql|sw[op])|~)$">
-
-    # Apache < 2.3
-    <IfModule !mod_authz_core.c>
-        Order allow,deny
-        Deny from all
-        Satisfy All
-    </IfModule>
-
-    # Apache ≥ 2.3
-    <IfModule mod_authz_core.c>
+<IfModule mod_authz_core.c>
+    <FilesMatch "(^#.*#|\.(bak|conf|dist|fla|in[ci]|log|orig|psd|sh|sql|sw[op])|~)$">
         Require all denied
-    </IfModule>
-
-</FilesMatch>
+    </FilesMatch>
+</IfModule>
diff --git a/src/web_performance/compression.conf b/src/web_performance/compression.conf
index ea28b320..a16a40fa 100644
--- a/src/web_performance/compression.conf
+++ b/src/web_performance/compression.conf
@@ -17,12 +17,6 @@
     # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
     # Compress all output labeled with one of the following media types.
-    #
-    # (!) For Apache versions below version 2.3.7 you don't need to
-    # enable `mod_filter` and can remove the `<IfModule mod_filter.c>`
-    # and `</IfModule>` lines as `AddOutputFilterByType` is still in
-    # the core directives.
-    #
     # https://httpd.apache.org/docs/current/mod/mod_filter.html#addoutputfilterbytype
 
     <IfModule mod_filter.c>