core: make the "default" parameter of the "ErrorDocument" option case insensitive.

PR 54419

trunk patch: http://svn.apache.org/r1465190
Submitted by: Tianyin Xu <tixu cs ucsd edu>
Reviewed by: jailletc36, fuankg, minfrin

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1490594 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 7d3e82ba62edb4ed9df584814ae38e36dfc9eb79..e9fa779f8136178c349d6205029b54fc566c366e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.5
 
+  *) core: make the "default" parameter of the "ErrorDocument" option case
+     insensitive. PR 54419 [Tianyin Xu <tixu cs ucsd edu>]
+
   *) mod_proxy_html: make the "ProxyHTMLFixups" options case insensitive.
      PR 54420 [Tianyin Xu <tixu cs ucsd edu>]
 

diff --git a/STATUS b/STATUS
index 34e17ee58d7345be731dccc28ccc73e87cbc4cc4..1414d8973b6d0f1f17bc661386b08e041b88350f 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -131,12 +131,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
                  half of all new stuff, and therefore the +0.5 - I would like
                  to have someone else add a vote too.
 
-    * core: make the "default" parameter of the "ErrorDocument" option case insensitive
-      PR 54419 reported by Tianyin Xu [tixu cs ucsd edu]
-      trunk patch: http://svn.apache.org/r1465190
-      2.4.x patch: trunk works
-      +1 jailletc36, fuankg, minfrin
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

diff --git a/server/core.c b/server/core.c
index 611b08fcbd631de70253e496acc4cc08f98a6b0d..0d1235ae39b7499e0a56b4a14c1d97ea978093ec 100644 (file)
--- a/server/core.c
+++ b/server/core.c
@@ -1500,7 +1500,7 @@ static const char *set_error_document(cmd_parms *cmd, void *conf_,
                             RESPONSE_CODES);
         }
 
-        if (strcmp(msg, "default") == 0) {
+        if (strcasecmp(msg, "default") == 0) {
             /* special case: ErrorDocument 404 default restores the
              * canned server error response
              */