Merge pull request #321 from andrewnicols/fallbackResourceDisabled

Disable Apache FallbackResource for faildumps

Author: paulholden

assets/web/apache2_faildumps.conf

@@ -2,5 +2,20 @@
     Options +Indexes
 </Directory>
 
+<Location "/_/">
+    FallbackResource disabled
+</Location>
+
 Alias /_/faildumps /var/www/behatfaildumps
 
+# Set the handler to use for files whose extension ends in `.php`.
+# This is a workaround for https://github.com/docker-library/php/issues/1576
+# The FallbackResource is a default Handler action which is only used if a Handler has not already been applied.
+# The docker/php image sets the handler unconditionally for any file whose name matches `.php`.
+# This configuration block unsets the default handler, and instead only applies it if the file exists.
+<FilesMatch \.php$>
+  SetHandler none
+  <If "-f %{REQUEST_FILENAME}">
+    SetHandler application/x-httpd-php
+  </If>
+</FilesMatch>

base.yml

@@ -5,7 +5,7 @@ services:
       - db
     volumes:
       - "${MOODLE_DOCKER_WWWROOT}:/var/www/html"
-      - "${ASSETDIR}/web/apache2_faildumps.conf:/etc/apache2/conf-enabled/apache2_faildumps.conf"
+      - "${ASSETDIR}/web/apache2_faildumps.conf:/etc/apache2/conf-enabled/moodle-faildump.conf"
     environment:
       MOODLE_DOCKER_RUNNING: 1
       MOODLE_DOCKER_DBNAME: moodle