It's clear from recent security reports that including configuration

  examples for non-core add-ins with our default .conf files causes some
  admins to bypass actually researching -how-to-configure- the given
  add-in module.  While this example was nice, we need to find another
  useful example, in addition to x-tar perhaps, to make this clearer.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@92784 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/conf/httpd.conf-dist b/conf/httpd.conf-dist
index 94acd6207d4aee5f6d9b49a0793e2ff88f2a546f..2711eebe1419b07bdc5a117a584dd187e0e9e3b3 100644 (file)
--- a/conf/httpd.conf-dist
+++ b/conf/httpd.conf-dist
@@ -765,17 +765,6 @@ ServerSignature On
     # AddType allows you to tweak mime.types without actually editing it, or to
     # make certain files to be certain types.
     #
-    # For example, the PHP 3.x module (not part of the Apache distribution - see
-    # http://www.php.net) will typically use:
-    #
-    #AddType application/x-httpd-php3 .php3
-    #AddType application/x-httpd-php3-source .phps
-    #
-    # And for PHP 4.x, use:
-    #
-    #AddType application/x-httpd-php .php
-    #AddType application/x-httpd-php-source .phps
-
     AddType application/x-tar .tgz
 
     #

diff --git a/conf/httpd.conf-dist-nw b/conf/httpd.conf-dist-nw
index 27cb1f9c7cfc4a8365324da2d832b0ffcb2e739b..998b21d53a7fdab4628ac134c3e479710baa3923 100644 (file)
--- a/conf/httpd.conf-dist-nw
+++ b/conf/httpd.conf-dist-nw
@@ -700,17 +700,6 @@ ServerSignature On
     # AddType allows you to tweak mime.types without actually editing it, or to
     # make certain files to be certain types.
     #
-    # For example, the PHP 3.x module (not part of the Apache distribution - see
-    # http://www.php.net) will typically use:
-    #
-    #AddType application/x-httpd-php3 .php3
-    #AddType application/x-httpd-php3-source .phps
-    #
-    # And for PHP 4.x, use:
-    #
-    #AddType application/x-httpd-php .php
-    #AddType application/x-httpd-php-source .phps
-
     AddType application/x-tar .tgz
 
     #

diff --git a/conf/httpd.conf-dist-win b/conf/httpd.conf-dist-win
index d505b81ef9686137ea917ef0a45e1d9dc57a75a1..791e04df4b45719c073504a18bfda4d71e546f57 100644 (file)
--- a/conf/httpd.conf-dist-win
+++ b/conf/httpd.conf-dist-win
@@ -810,17 +810,6 @@ ServerSignature On
     # AddType allows you to tweak mime.types without actually editing it, or to
     # make certain files to be certain types.
     #
-    # For example, the PHP 3.x module (not part of the Apache distribution - see
-    # http://www.php.net) will typically use:
-    #
-    #AddType application/x-httpd-php3 .php3
-    #AddType application/x-httpd-php3-source .phps
-    #
-    # And for PHP 4.x, use:
-    #
-    #AddType application/x-httpd-php .php
-    #AddType application/x-httpd-php-source .phps
-
     AddType application/x-tar .tgz
 
     #