desc_entry->full_path = (ap_strchr_c(to, '/') == NULL) ? 0 : 1;
desc_entry->wildcards = (WILDCARDS_REQUIRED
|| desc_entry->full_path
- || apr_is_fnmatch(to));
+ || apr_fnmatch_test(to));
if (desc_entry->wildcards) {
prefix = desc_entry->full_path ? "*/" : "*";
desc_entry->pattern = apr_pstrcat(dcfg->desc_list->pool,
conf->r = r;
conf->p = cmd->path;
- conf->p_is_fnmatch = apr_is_fnmatch(conf->p);
+ conf->p_is_fnmatch = apr_fnmatch_test(conf->p);
ap_add_per_proxy_conf(cmd->server, new_dir_conf);
if (SSL_X509_getCN(ptemp, cert, &cn)) {
int fnm_flags = FNM_PERIOD|FNM_CASE_BLIND;
- if (apr_is_fnmatch(cn) &&
+ if (apr_fnmatch_test(cn) &&
(apr_fnmatch(cn, s->server_hostname,
fnm_flags) == FNM_NOMATCH))
{
conf->r = r;
conf->d = cmd->path;
- conf->d_is_fnmatch = (apr_is_fnmatch(conf->d) != 0);
+ conf->d_is_fnmatch = (apr_fnmatch_test(conf->d) != 0);
/* Make this explicit - the "/" root has 0 elements, that is, we
* will always merge it, and it will always sort and merge first.
return errmsg;
conf->d = apr_pstrdup(cmd->pool, cmd->path); /* No mangling, please */
- conf->d_is_fnmatch = apr_is_fnmatch(conf->d) != 0;
+ conf->d_is_fnmatch = apr_fnmatch_test(conf->d) != 0;
conf->r = r;
ap_add_per_url_conf(cmd->server, new_url_conf);
return errmsg;
conf->d = cmd->path;
- conf->d_is_fnmatch = apr_is_fnmatch(conf->d) != 0;
+ conf->d_is_fnmatch = apr_fnmatch_test(conf->d) != 0;
conf->r = r;
ap_add_file_conf(c, new_file_conf);