Take upstream changes
authorAlex Dehnert <adehnert@mit.edu>
Tue, 12 Oct 2010 11:33:37 +0000 (07:33 -0400)
committerAlex Dehnert <adehnert@mit.edu>
Tue, 12 Oct 2010 11:33:37 +0000 (07:33 -0400)
conf.d/localized-error-pages
mods-available/mime.conf
mods-available/php5.conf
mods-available/setenvif.conf

index 7d96f89c6b12f632145778de54e39d689cc0b810..2a2e83fd2c10d8a1da42c7959a75c60ab87abfa7 100644 (file)
 # The default include files will display your Apache version number and your
 # ServerAdmin email address regardless of the setting of ServerSignature.
 #
+# WARNING: The configuration below will NOT work out of the box if you have a
+#          SetHandler directive in a <Location /> context somewhere. Adding
+#          the following three lines AFTER the <Location /> context should
+#          make it work in most cases:
+#          <Location /error/>
+#             SetHandler none
+#          </Location>
+#
 # The internationalized error documents require mod_alias, mod_include
-# and mod_negotiation.  To activate them, uncomment the following 30 lines.
-
-<IfModule mod_negotiation.c>
- <IfModule mod_include.c>
-  <IfModule mod_alias.c>
-
-    Alias /error/ "/usr/share/apache2/error/"
-
-    <Directory "/usr/share/apache2/error">
-        AllowOverride None
-        Options IncludesNoExec
-        AddOutputFilter Includes html
-        AddHandler type-map var
-        Order allow,deny
-        Allow from all
-        LanguagePriority en cs de es fr it nl sv pt-br ro
-        ForceLanguagePriority Prefer Fallback
-    </Directory>
-
-    ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var
-    ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var
-    ErrorDocument 403 /error/HTTP_FORBIDDEN.html.var
-    ErrorDocument 404 /error/HTTP_NOT_FOUND.html.var
-    ErrorDocument 405 /error/HTTP_METHOD_NOT_ALLOWED.html.var
-    ErrorDocument 408 /error/HTTP_REQUEST_TIME_OUT.html.var
-    ErrorDocument 410 /error/HTTP_GONE.html.var
-    ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var
-    ErrorDocument 412 /error/HTTP_PRECONDITION_FAILED.html.var
-    ErrorDocument 413 /error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
-    ErrorDocument 414 /error/HTTP_REQUEST_URI_TOO_LARGE.html.var
-    ErrorDocument 415 /error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
-    ErrorDocument 500 /error/HTTP_INTERNAL_SERVER_ERROR.html.var
-    ErrorDocument 501 /error/HTTP_NOT_IMPLEMENTED.html.var
-    ErrorDocument 502 /error/HTTP_BAD_GATEWAY.html.var
-    ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var
-    ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var
-  </IfModule>
- </IfModule>
-</IfModule>
+# and mod_negotiation.  To activate them, uncomment the following 37 lines.
 
+#<IfModule mod_negotiation.c>
+# <IfModule mod_include.c>
+#  <IfModule mod_alias.c>
+#
+#    Alias /error/ "/usr/share/apache2/error/"
+#
+#    <Directory "/usr/share/apache2/error">
+#        AllowOverride None
+#        Options IncludesNoExec
+#        AddOutputFilter Includes html
+#        AddHandler type-map var
+#        Order allow,deny
+#        Allow from all
+#        LanguagePriority en cs de es fr it nl sv pt-br ro
+#        ForceLanguagePriority Prefer Fallback
+#    </Directory>
+#
+#    ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var
+#    ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var
+#    ErrorDocument 403 /error/HTTP_FORBIDDEN.html.var
+#    ErrorDocument 404 /error/HTTP_NOT_FOUND.html.var
+#    ErrorDocument 405 /error/HTTP_METHOD_NOT_ALLOWED.html.var
+#    ErrorDocument 408 /error/HTTP_REQUEST_TIME_OUT.html.var
+#    ErrorDocument 410 /error/HTTP_GONE.html.var
+#    ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var
+#    ErrorDocument 412 /error/HTTP_PRECONDITION_FAILED.html.var
+#    ErrorDocument 413 /error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
+#    ErrorDocument 414 /error/HTTP_REQUEST_URI_TOO_LARGE.html.var
+#    ErrorDocument 415 /error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
+#    ErrorDocument 500 /error/HTTP_INTERNAL_SERVER_ERROR.html.var
+#    ErrorDocument 501 /error/HTTP_NOT_IMPLEMENTED.html.var
+#    ErrorDocument 502 /error/HTTP_BAD_GATEWAY.html.var
+#    ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var
+#    ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var
+#  </IfModule>
+# </IfModule>
+#</IfModule>
index b6954a311fc1d65d3bab01bae3f6af8c85865612..92a2c4555cc535bf53be69eec3efd15a56703285 100644 (file)
@@ -73,7 +73,8 @@ AddLanguage de .de
 AddLanguage el .el
 AddLanguage en .en
 AddLanguage eo .eo
-# See README.Debian for Spanish
+# es is ecmascript in /etc/mime.types
+RemoveType  es
 AddLanguage es .es
 AddLanguage et .et
 AddLanguage fr .fr
@@ -91,7 +92,8 @@ AddLanguage pt .pt
 AddLanguage pt-BR .pt-br
 AddLanguage ru .ru
 AddLanguage sv .sv
-# See README.Debian for Turkish
+# tr is troff in /etc/mime.types
+RemoveType  tr
 AddLanguage tr .tr
 AddLanguage zh-CN .zh-cn
 AddLanguage zh-TW .zh-tw
index 04fc35744225f25550003c6dc47275c6fbb1ce13..5d2f9112f49a47bf0b01824263132c5508acf49a 100644 (file)
@@ -1,4 +1,16 @@
 <IfModule mod_php5.c>
-  AddType application/x-httpd-php .php .phtml .php3
-  AddType application/x-httpd-php-source .phps
+    <FilesMatch "\.ph(p3?|tml)$">
+       SetHandler application/x-httpd-php
+    </FilesMatch>
+    <FilesMatch "\.phps$">
+       SetHandler application/x-httpd-php-source
+    </FilesMatch>
+    # To re-enable php in user directories comment the following lines
+    # (from <IfModule ...> to </IfModule>.) Do NOT set it to On as it
+    # prevents .htaccess files from disabling it.
+    <IfModule mod_userdir.c>
+        <Directory /home/*/public_html>
+            php_admin_value engine Off
+        </Directory>
+    </IfModule>
 </IfModule>
index 0d38da03a2b9e65c9bfcfeb497bf7f951304fb04..57724120b96d4c87a384a30379495c1ee8e0012f 100644 (file)
@@ -25,5 +25,6 @@ BrowserMatch "^gnome-vfs/1.0" redirect-carefully
 BrowserMatch "^gvfs/1" redirect-carefully
 BrowserMatch "^XML Spy" redirect-carefully
 BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully
+BrowserMatch " Konqueror/4" redirect-carefully
 
 </IfModule>