httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/server core.c
Date Mon, 08 Jul 2002 17:43:34 GMT
wrowe       2002/07/08 10:43:34

  Modified:    modules/generators mod_autoindex.c
               modules/proxy mod_proxy.c
               modules/ssl ssl_engine_init.c
               server   core.c
  Log:
    Changes for deprecated apr_is_fnmatch
  
  Revision  Changes    Path
  1.110     +1 -1      httpd-2.0/modules/generators/mod_autoindex.c
  
  Index: mod_autoindex.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_autoindex.c,v
  retrieving revision 1.109
  retrieving revision 1.110
  diff -u -r1.109 -r1.110
  --- mod_autoindex.c	31 May 2002 20:50:14 -0000	1.109
  +++ mod_autoindex.c	8 Jul 2002 17:43:33 -0000	1.110
  @@ -307,7 +307,7 @@
       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,
  
  
  
  1.88      +1 -1      httpd-2.0/modules/proxy/mod_proxy.c
  
  Index: mod_proxy.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/mod_proxy.c,v
  retrieving revision 1.87
  retrieving revision 1.88
  diff -u -r1.87 -r1.88
  --- mod_proxy.c	6 Jul 2002 20:04:38 -0000	1.87
  +++ mod_proxy.c	8 Jul 2002 17:43:33 -0000	1.88
  @@ -986,7 +986,7 @@
   
       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);
   
  
  
  
  1.102     +1 -1      httpd-2.0/modules/ssl/ssl_engine_init.c
  
  Index: ssl_engine_init.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_init.c,v
  retrieving revision 1.101
  retrieving revision 1.102
  diff -u -r1.101 -r1.102
  --- ssl_engine_init.c	7 Jun 2002 12:51:49 -0000	1.101
  +++ ssl_engine_init.c	8 Jul 2002 17:43:33 -0000	1.102
  @@ -857,7 +857,7 @@
       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))
           {
  
  
  
  1.193     +3 -3      httpd-2.0/server/core.c
  
  Index: core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/core.c,v
  retrieving revision 1.192
  retrieving revision 1.193
  diff -u -r1.192 -r1.193
  --- core.c	6 Jul 2002 20:04:38 -0000	1.192
  +++ core.c	8 Jul 2002 17:43:34 -0000	1.193
  @@ -1628,7 +1628,7 @@
   
       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.
  @@ -1694,7 +1694,7 @@
           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);
  @@ -1766,7 +1766,7 @@
           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);
  
  
  

Mime
View raw message