diff options
author | Yann Ylavic <ylavic@apache.org> | 2015-12-30 00:16:50 +0000 |
---|---|---|
committer | Yann Ylavic <ylavic@apache.org> | 2015-12-30 00:16:50 +0000 |
commit | 3b122da4868b97617ce8364fb28b7fa68f32c09a (patch) | |
tree | cf597fe87d4c85370c46cf04265cdcdca79e0bde /server/config.c | |
parent | 7bb1b911a17e1b6451555b4c4330fb8982c93f88 (diff) | |
download | httpd-3b122da4868b97617ce8364fb28b7fa68f32c09a.tar.gz |
Follow up to r1715876: core directives are ASCII.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1722251 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/config.c')
-rw-r--r-- | server/config.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/server/config.c b/server/config.c index 045a4986ab..50dfb11725 100644 --- a/server/config.c +++ b/server/config.c @@ -1042,7 +1042,7 @@ AP_CORE_DECLARE(const command_rec *) ap_find_command(const char *name, const command_rec *cmds) { while (cmds->name) { - if (!strcasecmp(name, cmds->name)) + if (!ap_casecmpstr(name, cmds->name)) return cmds; ++cmds; @@ -1197,8 +1197,8 @@ static const char *ap_build_config_sub(apr_pool_t *p, apr_pool_t *temp_pool, *bracket = '\0'; - if (strcasecmp(cmd_name + 2, - (*curr_parent)->directive + 1) != 0) { + if (ap_casecmpstr(cmd_name + 2, + (*curr_parent)->directive + 1) != 0) { parms->err_directive = newdir; return apr_pstrcat(p, "Expected </", (*curr_parent)->directive + 1, "> but saw ", @@ -1244,7 +1244,7 @@ AP_DECLARE(const char *) ap_build_cont_config(apr_pool_t *p, while ((rc = ap_varbuf_cfg_getline(&vb, parms->config_file, max_len)) == APR_SUCCESS) { if (!memcmp(vb.buf, "</", 2) - && (strcasecmp(vb.buf + 2, bracket) == 0) + && (ap_casecmpstr(vb.buf + 2, bracket) == 0) && (*curr_parent == NULL)) { break; } @@ -1621,7 +1621,7 @@ AP_DECLARE(const char *) ap_soak_end_container(cmd_parms *cmd, char *directive) if (cmd_name[1] == '/') { cmd_name[strlen(cmd_name) - 1] = '\0'; - if (strcasecmp(cmd_name + 2, directive + 1) != 0) { + if (ap_casecmpstr(cmd_name + 2, directive + 1) != 0) { return apr_pstrcat(cmd->pool, "Expected </", directive + 1, "> but saw ", cmd_name, ">", NULL); @@ -2614,7 +2614,7 @@ static int count_directives_sub(const char *directive, ap_directive_t *current) while (current != NULL) { if (current->first_child != NULL) count += count_directives_sub(directive, current->first_child); - if (strcasecmp(current->directive, directive) == 0) + if (ap_casecmpstr(current->directive, directive) == 0) count++; current = current->next; } |