Disable localized error pages again by default

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@1105 01b336ce-410b-0410-9a02-a0e7f243c266

2 files changed, 50 insertions, 39 deletions

diff --git a/debian/changelog b/debian/changelog
index f3d1bd3c..476875be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 apache2 (2.2.14-4) UNRELEASED; urgency=low
 
+  * Disable localized error pages again by default because they break
+    configurations with "<Location /> SetHandler ...". A workaround is
+    described in the comments in /etc/apache2/conf.d/localized-error-pages
+    (closes: #543333).
   * mod_rewrite: Fix URLs in redirects with literal IPv6 hosts
     (closes: #557015).
   * Automatically listen on port 443 if mod_gnutls is loaded (closes: #558234).
diff --git a/debian/config-dir/conf.d/localized-error-pages b/debian/config-dir/conf.d/localized-error-pages
index 7d96f89c..2a2e83fd 100644
--- a/debian/config-dir/conf.d/localized-error-pages
+++ b/debian/config-dir/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 <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>