Commit f0f7b1b5 authored by Christophe Jaillet's avatar Christophe Jaillet
Browse files

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
parent d3829b55

modules/generators/mod_autoindex.c

+4 −7
Original line number Original line Diff line number Diff line
@@ -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)

static APR_INLINE int response_is_html(request_rec *r)

{

{

    char *ctype = ap_field_noparam(r->pool, r->content_type);

    char *ctype = ap_field_noparam(r->pool, r->content_type);

    ap_str_tolower(ctype);



    return !strcmp(ctype, "text/html")

    return !ap_cstr_casecmp(ctype, "text/html")

        || !strcmp(ctype, "application/xhtml+xml");

        || !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))) {

    if ((type == BY_PATH) && (!ap_is_matchexp(to))) {

        p->apply_to = apr_pstrcat(arr->pool, "*", to, NULL);

        p->apply_to = apr_pstrcat(arr->pool, "*", to, NULL);

    }

    }

    else if (to) {

        p->apply_to = apr_pstrdup(arr->pool, to);

    }

    else {

    else {

        p->apply_to = NULL;

        p->apply_to = apr_pstrdup(arr->pool, to);

    }

    }

}

}