httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sl...@apache.org
Subject cvs commit: httpd-2.0/docs/conf httpd-win.conf httpd-nw.conf httpd-std.conf.in
Date Thu, 20 Jun 2002 03:50:04 GMT
slive       2002/06/19 20:50:04

  Modified:    docs/conf httpd-win.conf httpd-nw.conf httpd-std.conf.in
  Log:
  I've been threatening to do this for a few days, but I wanted to wait for other dust
  to clear.
  
  Comment-out the internationalized error responses in the default configs.
  I think these error docs are great, and anyone who understands the server
  should be using them, but because of their complexity, they are a danger
  to people who blindly install apache and forget it.
  
  Developers especially should continue to use them, because they are great at
  finding obscure bugs in mod_include, mod_negotiation, and sub-request
  processing.
  
  Revision  Changes    Path
  1.62      +43 -41    httpd-2.0/docs/conf/httpd-win.conf
  
  Index: httpd-win.conf
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/conf/httpd-win.conf,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -d -b -u -r1.61 -r1.62
  --- httpd-win.conf	13 Jun 2002 18:39:04 -0000	1.61
  +++ httpd-win.conf	20 Jun 2002 03:50:04 -0000	1.62
  @@ -419,8 +419,9 @@
   
   #
   # Optionally add a line containing the server version and virtual host
  -# name to server-generated pages (error documents, FTP directory listings,
  -# mod_status and mod_info output etc., but not CGI generated documents).
  +# name to server-generated pages (internal error documents, FTP directory 
  +# listings, mod_status and mod_info output etc., but not CGI generated 
  +# documents or custom error documents).
   # Set to "EMail" to also include a mailto: link to the ServerAdmin.
   # Set to one of:  On | Off | EMail
   #
  @@ -775,57 +776,58 @@
   #
   
   #
  -# Putting this all together, we can Internationalize error responses.
  +# 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;
  +# 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.
  +# @exp_errordir@/include/ files and copying them to /your/include/path/, 
  +# even on a per-VirtualHost basis.  The default include files will display
  +# your Apache version number and your ServerAdmin email address regardless
  +# of the setting of ServerSignature.
   #
  +# 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>
  -    Alias /error/ "@@ServerRoot@@/error/"
  -
  -    <Directory "@@ServerRoot@@/error">
  -        AllowOverride None
  -        Options IncludesNoExec
  -        AddOutputFilter Includes html
  -        AddHandler type-map var
  -        Order allow,deny
  -        Allow from all
  -        LanguagePriority en es de fr
  -        ForceLanguagePriority Prefer Fallback
  -    </Directory>
  +#    Alias /error/ "@exp_errordir@/"
  +#
  +#    <Directory "@exp_errordir@">
  +#        AllowOverride None
  +#        Options IncludesNoExec
  +#        AddOutputFilter Includes html
  +#        AddHandler type-map var
  +#        Order allow,deny
  +#        Allow from all
  +#        LanguagePriority en es de fr
  +#        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_SERVICE_UNAVAILABLE.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
   
  -    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_SERVICE_UNAVAILABLE.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>
   
   #
   # The following directives modify normal HTTP response behavior to
  
  
  
  1.18      +43 -43    httpd-2.0/docs/conf/httpd-nw.conf
  
  Index: httpd-nw.conf
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/conf/httpd-nw.conf,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -d -b -u -r1.17 -r1.18
  --- httpd-nw.conf	13 Jun 2002 18:39:04 -0000	1.17
  +++ httpd-nw.conf	20 Jun 2002 03:50:04 -0000	1.18
  @@ -404,8 +404,9 @@
   
   #
   # Optionally add a line containing the server version and virtual host
  -# name to server-generated pages (error documents, FTP directory listings,
  -# mod_status and mod_info output etc., but not CGI generated documents).
  +# name to server-generated pages (internal error documents, FTP directory 
  +# listings, mod_status and mod_info output etc., but not CGI generated 
  +# documents or custom error documents).
   # Set to "EMail" to also include a mailto: link to the ServerAdmin.
   # Set to one of:  On | Off | EMail
   #
  @@ -775,57 +776,56 @@
   #    treated as case '1' as it has spaces and thus is not a valid URL
   
   #
  -# Putting this all together, we can Internationalize error responses.
  +# 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;
  +# 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.
  +# @exp_errordir@/include/ files and copying them to /your/include/path/, 
  +# even on a per-VirtualHost basis.  The default include files will display
  +# your Apache version number and your ServerAdmin email address regardless
  +# of the setting of ServerSignature.
   #
  +# 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>
  -    Alias /error/ "@@ServerRoot@@/error/"
  -
  -    <Directory "@@ServerRoot@@/error">
  -        AllowOverride None
  -        Options IncludesNoExec
  -        AddOutputFilter Includes html
  -        AddHandler type-map var
  -        Order allow,deny
  -        Allow from all
  -        LanguagePriority en es de fr
  -        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_SERVICE_UNAVAILABLE.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>
  +#    Alias /error/ "@exp_errordir@/"
  +#
  +#    <Directory "@exp_errordir@">
  +#        AllowOverride None
  +#        Options IncludesNoExec
  +#        AddOutputFilter Includes html
  +#        AddHandler type-map var
  +#        Order allow,deny
  +#        Allow from all
  +#        LanguagePriority en es de fr
  +#        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_SERVICE_UNAVAILABLE.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
   
   #
   # The following directives modify normal HTTP response behavior to
  
  
  
  1.12      +43 -42    httpd-2.0/docs/conf/httpd-std.conf.in
  
  Index: httpd-std.conf.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/conf/httpd-std.conf.in,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -d -b -u -r1.11 -r1.12
  --- httpd-std.conf.in	15 Jun 2002 07:20:59 -0000	1.11
  +++ httpd-std.conf.in	20 Jun 2002 03:50:04 -0000	1.12
  @@ -503,8 +503,9 @@
   
   #
   # Optionally add a line containing the server version and virtual host
  -# name to server-generated pages (error documents, FTP directory listings,
  -# mod_status and mod_info output etc., but not CGI generated documents).
  +# name to server-generated pages (internal error documents, FTP directory 
  +# listings, mod_status and mod_info output etc., but not CGI generated 
  +# documents or custom error documents).
   # Set to "EMail" to also include a mailto: link to the ServerAdmin.
   # Set to one of:  On | Off | EMail
   #
  @@ -866,57 +867,57 @@
   #
   
   #
  -# Putting this all together, we can Internationalize error responses.
  +# 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;
  +# 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
  -# @exp_errordir@/include/ files and
  -# copying them to /your/include/path/, even on a per-VirtualHost basis.
  +# @exp_errordir@/include/ files and copying them to /your/include/path/, 
  +# even on a per-VirtualHost basis.  The default include files will display
  +# your Apache version number and your ServerAdmin email address regardless
  +# of the setting of ServerSignature.
   #
  +# 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>
  -    Alias /error/ "@exp_errordir@/"
  -
  -    <Directory "@exp_errordir@">
  -        AllowOverride None
  -        Options IncludesNoExec
  -        AddOutputFilter Includes html
  -        AddHandler type-map var
  -        Order allow,deny
  -        Allow from all
  -        LanguagePriority en es de fr
  -        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_SERVICE_UNAVAILABLE.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
  +#    Alias /error/ "@exp_errordir@/"
  +#
  +#    <Directory "@exp_errordir@">
  +#        AllowOverride None
  +#        Options IncludesNoExec
  +#        AddOutputFilter Includes html
  +#        AddHandler type-map var
  +#        Order allow,deny
  +#        Allow from all
  +#        LanguagePriority en es de fr
  +#        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_SERVICE_UNAVAILABLE.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>
   
   #
   # The following directives modify normal HTTP response behavior to
  
  
  

Mime
View raw message