Commit 4e9da758 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

  We might want to disable this, by default, when we get ready for GA.

  ITMT, this provides a fantastic stress-test for interoperability of
  the ap_die handling, the includes filter, the negotiated typemap
  behavior and the new typemap-body functions.

  Keep adding to the list of errors as they are converted from the
  httpd-2.0/docs/docroot/error individual files into docs/error.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90423 13f79535-47bb-0310-9956-ffa450edef68
parent 2fa4bab6
Loading
Loading
Loading
Loading
+32 −5
Original line number Diff line number Diff line
@@ -499,11 +499,6 @@ Alias /manual "@@ServerRoot@@/htdocs/manual"
    AllowOverride None
    Order allow,deny
    Allow from all
#
# Because we do not distribute type map files for htdocs/manual/,
# we can save one stat call by not looking for one.
#
    DirectoryIndex index.html
</Directory>

#
@@ -836,6 +831,38 @@ AddType application/x-tar .tgz
#ErrorDocument 402 "http://www.example.com/info.html is the place to look"
#    treated as case '1' as it has spaces and thus is not a valid URL

#
# Putting this all together, we can Internationalize error responses.
#
# We use Alias to redirect any /error/HTTP_<error>.html.var response to
# our collection of by-error message multi-language collections.  We use 
# includes to substitute the appropriate text.
#
# You can modify the messages' appearance without changing any of the
# default HTTP_<error>.html.var files by adding the line;
#
#   Alias /error/include/ "/your/include/path/"
#
# which allows you to create your own set of files by starting with the
# @@ServerRoot@@/error/include/ files and
# copying them to /your/include/path/, even on a per-VirtualHost basis.
#

<IfModule mod_includes.c>
    Alias /error/ "@@ServerRoot@@/error/"

    <Directory "@@ServerRoot@@/error">
        AllowOverride None
        Options IncludesNoExec
        AddHandler type-map var
        SetOutputFilter Includes
        Order allow,deny
        Allow from all
    </Directory>

    ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var
</IfModule>

#
# The following directives modify normal HTTP response behavior.
# The first directive disables keepalive for Netscape 2.x and browsers that
+32 −5
Original line number Diff line number Diff line
@@ -426,11 +426,6 @@ Alias /manual "@@ServerRoot@@/htdocs/manual"
    AllowOverride None
    Order allow,deny
    Allow from all
#
# Because we do not distribute type map files for htdocs/manual/,
# we can save one stat call by not looking for one.
#
    DirectoryIndex index.html
</Directory>

#
@@ -755,6 +750,38 @@ AddType application/x-tar .tgz
#ErrorDocument 402 "http://www.example.com/info.html is the place to look"
#    treated as case '1' as it has spaces and thus is not a valid URL

#
# Putting this all together, we can Internationalize error responses.
#
# We use Alias to redirect any /error/HTTP_<error>.html.var response to
# our collection of by-error message multi-language collections.  We use 
# includes to substitute the appropriate text.
#
# You can modify the messages' appearance without changing any of the
# default HTTP_<error>.html.var files by adding the line;
#
#   Alias /error/include/ "/your/include/path/"
#
# which allows you to create your own set of files by starting with the
# @@ServerRoot@@/error/include/ files and
# copying them to /your/include/path/, even on a per-VirtualHost basis.
#

<IfModule mod_includes.c>
    Alias /error/ "@@ServerRoot@@/error/"

    <Directory "@@ServerRoot@@/error">
        AllowOverride None
        Options IncludesNoExec
        AddHandler type-map var
        SetOutputFilter Includes
        Order allow,deny
        Allow from all
    </Directory>

    ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var
</IfModule>

#
# The following directives modify normal HTTP response behavior.
# The first directive disables keepalive for Netscape 2.x and browsers that