Two clarifications of ErrorDocument:

1. /-rooted paths are relative to DocumentRoot.

2. Bad requests will sometimes ignore ErrorDocument.

PR: 27352

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@167959 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index b38a20949ea755d567d0c48f994cc7e50505cfe1..4a9eb1c63caa6cc3d76fa698203065f2576ea652 100644 (file)
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -903,9 +903,10 @@ in case of an error</description>
     or a message. Apache will sometimes offer additional information
     regarding the problem/error.</p>
 
-    <p>URLs can begin with a slash (/) for local URLs, or be a full
-    URL which the client can resolve. Alternatively, a message can
-    be provided to be displayed by the browser. Examples:</p>
+    <p>URLs can begin with a slash (/) for local web-paths (relative
+    to the <directive module="core">DocumentRoot</directive>), or be a
+    full URL which the client can resolve. Alternatively, a message
+    can be provided to be displayed by the browser. Examples:</p>
 
     <example>
       ErrorDocument 500 http://foo.example.com/cgi-bin/tester<br />
@@ -955,6 +956,14 @@ in case of an error</description>
     href="http://support.microsoft.com/default.aspx?scid=kb;en-us;Q294807"
     >Q294807</a>.</p>
 
+    <p>Although most error messages can be overriden, there are certain
+    circumstances where the internal messages are used regardless of the
+    setting of <directive module="core">ErrorDocument</directive>.  In
+    particular, if a malformed request is detected, normal request processing
+    will be immediately halted and the internal error message returned.
+    This is necessary to guard against security problems caused by
+    bad requests.</p>
+
     <p>Prior to version 2.0, messages were indicated by prefixing
     them with a single unmatched double quote character.</p>
 </usage>

diff --git a/docs/manual/mod/mod_log_config.html.en b/docs/manual/mod/mod_log_config.html.en
index 454040bd890567b0379c42ef940ffc63d14eae6a..47167a740f7f4427df5b4777a37b9d16ade302a5 100644 (file)
--- a/docs/manual/mod/mod_log_config.html.en
+++ b/docs/manual/mod/mod_log_config.html.en
@@ -136,7 +136,7 @@
         the status of the *original* request --- <code>%...&gt;s</code>
         for the last.</td></tr>
 <tr><td><code>%...t</code></td>
-        <td>Time, in common log format time format (standard english
+        <td>Time the request was received (standard english
         format)</td></tr>
 <tr class="odd"><td><code>%...{<var>format</var>}t</code></td>
         <td>The time, in the form given by format, which should be in

diff --git a/docs/manual/mod/mod_log_config.xml.ja b/docs/manual/mod/mod_log_config.xml.ja
index b9a31504d49df7c5e264b5ce6d4f7b0b6f7d1840..2df340b9530f31a3220bad42d196050a5bda4e7a 100644 (file)
--- a/docs/manual/mod/mod_log_config.xml.ja
+++ b/docs/manual/mod/mod_log_config.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 151408:164424 (outdated) -->
+<!-- English Revision: 151408:165671 (outdated) -->
 
 <!--
  Copyright 2002-2005 The Apache Software Foundation or its licensors, as

diff --git a/docs/manual/mod/mod_log_config.xml.ko b/docs/manual/mod/mod_log_config.xml.ko
index 3c5e83a9d8e49bb23e251e1cd90e35beebaa4712..9c3008b2ff3ab388425bfd3c401518466c11b470 100644 (file)
--- a/docs/manual/mod/mod_log_config.xml.ko
+++ b/docs/manual/mod/mod_log_config.xml.ko
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 105989:164424 (outdated) -->
+<!-- English Revision: 105989:165671 (outdated) -->
 
 <!--
  Copyright 2004-2005 The Apache Software Foundation or its licensors,