From 4c3dc1b74836f40c3a1b8b5d320b6cb14e39506c Mon Sep 17 00:00:00 2001 From: Christophe Jaillet Date: Tue, 21 Mar 2017 23:08:27 +0000 Subject: [PATCH] Use 'ap_cstr_casecmp' to simplify code. Remove useless case. We know that to can not be NULL at this point. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1788033 13f79535-47bb-0310-9956-ffa450edef68 --- modules/generators/mod_autoindex.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c index 9473a87e4d..6a32de803d 100644 --- a/modules/generators/mod_autoindex.c +++ b/modules/generators/mod_autoindex.c @@ -156,9 +156,9 @@ static char c_by_encoding, c_by_type, c_by_path; static APR_INLINE int response_is_html(request_rec *r) { char *ctype = ap_field_noparam(r->pool, r->content_type); - ap_str_tolower(ctype); - return !strcmp(ctype, "text/html") - || !strcmp(ctype, "application/xhtml+xml"); + + return !ap_cstr_casecmp(ctype, "text/html") + || !ap_cstr_casecmp(ctype, "application/xhtml+xml"); } /* @@ -214,11 +214,8 @@ static void push_item(apr_array_header_t *arr, char *type, const char *to, if ((type == BY_PATH) && (!ap_is_matchexp(to))) { p->apply_to = apr_pstrcat(arr->pool, "*", to, NULL); } - else if (to) { - p->apply_to = apr_pstrdup(arr->pool, to); - } else { - p->apply_to = NULL; + p->apply_to = apr_pstrdup(arr->pool, to); } } -- 2.50.1