Remove mapping of .php files to text/html

`AddType test/html php` creates some problems¹ that can only be resolved by adding more PHP specific² configs, and that is beyond the scope of this project. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ¹ #62 ² https://php.net/manual/ro/install.unix.apache2.php http://blog.famillecollet.com/post/2013/01/13/PHP-and-Apache-SetHandler-vs-AddHandler Thanks @bridgeport! Fix #62
h5bp · Mar 3, 2015 · daab35b · daab35b
1 parent 27348d0
commit daab35b
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+### HEAD
+
+* Remove mapping of `.php` files to `text/html`
+  [[aeb81e9](https://github.com/h5bp/server-configs-apache/commit/aeb81e9174a9c69fa3a6f6c107d53dd4c8d58760)].
+
 ### 2.12.0 (March 2, 2015)
 
 * Add `ServerSignature Off`

diff --git a/dist/.htaccess b/dist/.htaccess
@@ -264,7 +264,6 @@ Options -MultiViews
     AddType application/x-chrome-extension              crx
     AddType application/x-opera-extension               oex
     AddType application/x-xpinstall                     xpi
-    AddType text/html                                   php
     AddType text/vcard                                  vcard vcf
     AddType text/vnd.rim.location.xloc                  xloc
     AddType text/vtt                                    vtt

diff --git a/src/media_types/media_types.conf b/src/media_types/media_types.conf
@@ -108,7 +108,6 @@
     AddType application/x-chrome-extension              crx
     AddType application/x-opera-extension               oex
     AddType application/x-xpinstall                     xpi
-    AddType text/html                                   php
     AddType text/vcard                                  vcard vcf
     AddType text/vnd.rim.location.xloc                  xloc
     AddType text/vtt                                    vtt

diff --git a/test/fixtures/.htaccess b/test/fixtures/.htaccess
@@ -244,7 +244,6 @@ Options -MultiViews
     AddType application/x-chrome-extension              crx
     AddType application/x-opera-extension               oex
     AddType application/x-xpinstall                     xpi
-    AddType text/html                                   php
     AddType text/vcard                                  vcard vcf
     AddType text/vnd.rim.location.xloc                  xloc
     AddType text/vtt                                    vtt

diff --git a/test/fixtures/test.php b/test/fixtures/test.php
diff --git a/test/tests.js b/test/tests.js
@@ -308,17 +308,6 @@ exports = module.exports = {
                     }
                 },
 
-                'test.php': {
-                    responseHeaders: {
-                        'cache-control': 'max-age=0, no-transform',
-                        'content-security-policy': "script-src 'self'; object-src 'self'",
-                        'content-type': 'text/html; charset=utf-8',
-                        'x-frame-options': 'DENY',
-                        'x-ua-compatible': 'IE=edge',
-                        'x-xss-protection': '1; mode=block'
-                    }
-                },
-
                 'test.oex': {
                     responseHeaders: {
                         'content-encoding': null,