From: Eric Covener <covener@apache.org>
Date: Sat, 19 Mar 2016 16:48:19 +0000 (+0000)
Subject: fix order of lowercase/compare for r->handler
X-Git-Tag: 2.5.0-alpha~1866
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2da4063a6fb98846059bb1e6659c1aa802510ccd;p=apache

fix order of lowercase/compare for r->handler


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

diff --git a/server/core.c b/server/core.c
index db003169ba..ddc7a2707d 100644
--- a/server/core.c
+++ b/server/core.c
@@ -4773,16 +4773,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")) {