Explain the changed ErrorDocument syntax.

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

diff --git a/docs/manual/mod/core.html b/docs/manual/mod/core.html
index 8e27e8683d37ed7d46ce4589a39ed9c52877c4e5..0d6e886bd500c1ae12a32a6a74f3968f5dfeb9d3 100644 (file)
--- a/docs/manual/mod/core.html
+++ b/docs/manual/mod/core.html
@@ -794,7 +794,8 @@ please avoid that.
  HREF="directive-dict.html#Compatibility"
  REL="Help"
 ><STRONG>Compatibility:</STRONG></A> The directory and .htaccess contexts
-are only available in Apache 1.1 and later.<P>
+are only available in Apache 1.1 and later. The quoting syntax prior to
+Apache 2.0 was different.<P>
 
 In the event of a problem or error, Apache can be configured to do
 one of four things,
@@ -808,30 +809,30 @@ one of four things,
 
 <P>The first option is the default, while options 2-4 are configured
 using the <CODE>ErrorDocument</CODE> directive, which is followed by
-the HTTP response code and a message or URL.
-
-<P><EM>Messages</EM> in this context begin with a single quote
-(<CODE>"</CODE>), which does not form part of the message itself.
-Apache will sometimes offer additional information regarding the
-problem/error.
+the HTTP response code and a URL or a message. Apache will sometimes
+offer additional information regarding the problem/error.
 
 <P>URLs can begin with a slash (/) for local URLs, or be a full
-URL which the client can resolve. Examples:
+URL which the client can resolve. Alternatively, a message can be
+provided to be displayed by the browser. Examples:
 <BLOCKQUOTE><CODE>
 ErrorDocument 500 http://foo.example.com/cgi-bin/tester<BR>
 ErrorDocument 404 /cgi-bin/bad_urls.pl<BR>
 ErrorDocument 401 /subscription_info.html<BR>
-ErrorDocument 403 "Sorry can't allow you access today
+ErrorDocument 403 &quot;Sorry can't allow you access today&quot;
 </CODE></BLOCKQUOTE>
 
 <P>Note that when you specify an <CODE>ErrorDocument</CODE> that
 points to a remote URL (ie. anything with a method such as "http" in
 front of it) Apache will send a redirect to the client to tell it
-where to find the document, even if the document ends up being
-on the same server..  This has several implications, the
-most important being that <STRONG>if you use an "ErrorDocument 401"
-directive then it must refer to a local document.</STRONG>  This results
-from the nature of the HTTP basic authentication scheme.
+where to find the document, even if the document ends up being on the
+same server. This has several implications, the most important being
+that <STRONG>if you use an "ErrorDocument 401" directive then it must
+refer to a local document.</STRONG> This results from the nature of
+the HTTP basic authentication scheme.
+
+<P>Prior to version 2.0, messages were indicated by prefixing them
+with a single unmatched double quote character.
 
 <P>See Also: <A HREF="../custom-error.html">documentation of customizable
 responses.</A><P><HR>

diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index 765856e416f4ec1487ef20811acc70df2bd27879..d8573df97aa34d9517a86b4fcf9ebbcc5d692786 100644 (file)
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -2340,7 +2340,6 @@ static const command_rec core_cmds[] = {
   "Name(s) of per-directory config files (default: .htaccess)" },
 { "DocumentRoot", set_document_root, NULL, RSRC_CONF, TAKE1,
   "Root directory of the document tree"  },
-/* TODOC: ErrorDocument no longer has silly quoting semantics */
 { "ErrorDocument", set_error_document, NULL, OR_FILEINFO, TAKE2,
   "Change responses for HTTP errors" },
 { "AllowOverride", set_override, NULL, ACCESS_CONF, RAW_ARGS,