From: Jim Jagielski <jim@apache.org>
Date: Sat, 19 Mar 2016 18:59:23 +0000 (+0000)
Subject: Merge r1735786 from trunk:
X-Git-Tag: 2.4.19~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1d75ebc08288bd05ddb482e36a4eec7fd134436;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1735786 from trunk:

fix order of lowercase/compare for r->handler

Submitted by: covener
Reviewed/backported by: jim


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

diff --git a/STATUS b/STATUS
index 1a5e0c6d6f6..20e0981ed7d 100644
--- a/STATUS
+++ b/STATUS
@@ -112,10 +112,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) core: fix r->handler = None case sensitivity
-     trunk patch: http://svn.apache.org/r1735786
-     2.4.x patch: trunk works
-     +1: covener, ylavic, jim
    
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
diff --git a/server/core.c b/server/core.c
index 4a420c835dc..b3d72f434d5 100644
--- a/server/core.c
+++ b/server/core.c
@@ -4453,16 +4453,16 @@ static int core_override_type(request_rec *r)
                           "Can't evaluate handler expression: %s", err);
             return HTTP_INTERNAL_SERVER_ERROR;
         }
+
+        if (val != ap_strstr_c(val, "proxy:unix")) { 
+            /* Retained for compatibility --  but not for UDS */
+            char *tmp = apr_pstrdup(r->pool, val);
+            ap_str_tolower(tmp);
+            val = tmp;
+        }
+
         if (strcmp(val, "none")) { 
-            if (val != ap_strstr_c(val, "proxy:unix")) { 
-                /* Retained for compatibility --  but not for UDS */
-                char *tmp = apr_pstrdup(r->pool, val);
-                ap_str_tolower(tmp);
-                r->handler = tmp;
-            }
-            else { 
-                r->handler = val;
-            }
+            r->handler = val;
         }
     }
     else if (conf->handler && strcmp(conf->handler, "none")) {