From e067f513d2c3305131987e99ffaeabbc682f1a8f Mon Sep 17 00:00:00 2001 From: Alex Dehnert Date: Tue, 12 Oct 2010 07:33:37 -0400 Subject: [PATCH] Take upstream changes --- conf.d/localized-error-pages | 85 +++++++++++++++++++----------------- mods-available/mime.conf | 6 ++- mods-available/php5.conf | 16 ++++++- mods-available/setenvif.conf | 1 + 4 files changed, 65 insertions(+), 43 deletions(-) diff --git a/conf.d/localized-error-pages b/conf.d/localized-error-pages index 7d96f89..2a2e83f 100644 --- a/conf.d/localized-error-pages +++ b/conf.d/localized-error-pages @@ -29,44 +29,51 @@ # 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 context somewhere. Adding +# the following three lines AFTER the context should +# make it work in most cases: +# +# SetHandler none +# +# # The internationalized error documents require mod_alias, mod_include -# and mod_negotiation. To activate them, uncomment the following 30 lines. - - - - - - Alias /error/ "/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 - - - 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 - - - +# and mod_negotiation. To activate them, uncomment the following 37 lines. +# +# +# +# +# Alias /error/ "/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 +# +# +# 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 +# +# +# diff --git a/mods-available/mime.conf b/mods-available/mime.conf index b6954a3..92a2c45 100644 --- a/mods-available/mime.conf +++ b/mods-available/mime.conf @@ -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 diff --git a/mods-available/php5.conf b/mods-available/php5.conf index 04fc357..5d2f911 100644 --- a/mods-available/php5.conf +++ b/mods-available/php5.conf @@ -1,4 +1,16 @@ - AddType application/x-httpd-php .php .phtml .php3 - AddType application/x-httpd-php-source .phps + + SetHandler application/x-httpd-php + + + SetHandler application/x-httpd-php-source + + # To re-enable php in user directories comment the following lines + # (from to .) Do NOT set it to On as it + # prevents .htaccess files from disabling it. + + + php_admin_value engine Off + + diff --git a/mods-available/setenvif.conf b/mods-available/setenvif.conf index 0d38da0..5772412 100644 --- a/mods-available/setenvif.conf +++ b/mods-available/setenvif.conf @@ -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 -- 2.34.1