httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r1490589 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS modules/filters/mod_proxy_html.c
Date Fri, 07 Jun 2013 11:20:06 GMT
Author: minfrin
Date: Fri Jun  7 11:20:06 2013
New Revision: 1490589

URL: http://svn.apache.org/r1490589
Log:
mod_proxy_html: make the "ProxyHTMLFixups" options case insensitive.
PR 54420

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

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/modules/filters/mod_proxy_html.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1464762

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1490589&r1=1490588&r2=1490589&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Fri Jun  7 11:20:06 2013
@@ -2,8 +2,11 @@
 
 Changes with Apache 2.4.5
 
-  *) mod_cache: Make option "CacheDisable" in mod_cache case insensitive PR
-     54462 [Tianyin Xu <tixu cs ucsd edu>]
+  *) mod_proxy_html: make the "ProxyHTMLFixups" options case insensitive.
+     PR 54420 [Tianyin Xu <tixu cs ucsd edu>]
+
+  *) mod_cache: Make option "CacheDisable" in mod_cache case insensitive.
+     PR 54462 [Tianyin Xu <tixu cs ucsd edu>]
 
   *) mod_cache: If a 304 response indicates an entity not currently cached, then
      the cache MUST disregard the response and repeat the request without the

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1490589&r1=1490588&r2=1490589&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Fri Jun  7 11:20:06 2013
@@ -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.
 
-    * mod_proxy_html: make the "ProxyHTMLFixups" options case insensitive
-      PR 54420 reported by Tianyin Xu [tixu cs ucsd edu]
-      trunk patch: http://svn.apache.org/r1464762
-      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 ]

Modified: httpd/httpd/branches/2.4.x/modules/filters/mod_proxy_html.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/filters/mod_proxy_html.c?rev=1490589&r1=1490588&r2=1490589&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/filters/mod_proxy_html.c (original)
+++ httpd/httpd/branches/2.4.x/modules/filters/mod_proxy_html.c Fri Jun  7 11:20:06 2013
@@ -1142,11 +1142,11 @@ static const char *set_flags(cmd_parms *
 {
     proxy_html_conf *cfg = CFG;
     if (arg && *arg) {
-        if (!strcmp(arg, "lowercase"))
+        if (!strcasecmp(arg, "lowercase"))
             cfg->flags |= NORM_LC;
-        else if (!strcmp(arg, "dospath"))
+        else if (!strcasecmp(arg, "dospath"))
             cfg->flags |= NORM_MSSLASH;
-        else if (!strcmp(arg, "reset"))
+        else if (!strcasecmp(arg, "reset"))
             cfg->flags |= NORM_RESET;
     }
     return NULL;



Mime
View raw message