httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cove...@apache.org
Subject svn commit: r1735786 - /httpd/httpd/trunk/server/core.c
Date Sat, 19 Mar 2016 16:48:19 GMT
Author: covener
Date: Sat Mar 19 16:48:19 2016
New Revision: 1735786

URL: http://svn.apache.org/viewvc?rev=1735786&view=rev
Log:
fix order of lowercase/compare for r->handler

Modified:
    httpd/httpd/trunk/server/core.c

Modified: httpd/httpd/trunk/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core.c?rev=1735786&r1=1735785&r2=1735786&view=diff
==============================================================================
--- httpd/httpd/trunk/server/core.c (original)
+++ httpd/httpd/trunk/server/core.c Sat Mar 19 16:48:19 2016
@@ -4773,16 +4773,16 @@ static int core_override_type(request_re
                           "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")) { 



Mime
View raw message