diff options
| author | Eric Covener <covener@apache.org> | 2016-03-19 17:48:19 +0100 |
|---|---|---|
| committer | Eric Covener <covener@apache.org> | 2016-03-19 17:48:19 +0100 |
| commit | 2da4063a6fb98846059bb1e6659c1aa802510ccd (patch) | |
| tree | 18abf33ae42b3571e9b30b1136719aaeafa48c81 /server/core.c | |
| parent | mod_proxy_http2: removed duplicate log code after review (diff) | |
| download | apache2-2da4063a6fb98846059bb1e6659c1aa802510ccd.tar.xz apache2-2da4063a6fb98846059bb1e6659c1aa802510ccd.zip | |
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
Diffstat (limited to 'server/core.c')
| -rw-r--r-- | server/core.c | 18 |
1 files changed, 9 insertions, 9 deletions
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")) { |