From 11b54e21bfb432e248c8e65763455ef27efb209c Mon Sep 17 00:00:00 2001 From: Graham Leggett Date: Fri, 7 Jun 2013 11:36:15 +0000 Subject: [PATCH] core: make the "default" parameter of the "ErrorDocument" option case insensitive. PR 54419 trunk patch: http://svn.apache.org/r1465190 Submitted by: Tianyin Xu 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 --- CHANGES | 3 +++ STATUS | 6 ------ server/core.c | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/CHANGES b/CHANGES index 7d3e82ba62..e9fa779f81 100644 --- 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 ] + *) mod_proxy_html: make the "ProxyHTMLFixups" options case insensitive. PR 54420 [Tianyin Xu ] diff --git a/STATUS b/STATUS index 34e17ee58d..1414d8973b 100644 --- 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 611b08fcbd..0d1235ae39 100644 --- 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 */ -- 2.40.0