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/include http_core.h
Date Fri, 24 Aug 2001 18:12:02 GMT
wrowe       01/08/24 11:12:02

  Modified:    server   core.c request.c
               include  http_core.h
  Log:
    sec, sec, who's got a sec?  This gave me a headache, but I had to clear
    out the last patch before I rearranged this to be _readable_.
  
    Next step for everyone's sanity, provide <Proxy > directives ;)
  
  Revision  Changes    Path
  1.46      +12 -12    httpd-2.0/server/core.c
  
  Index: core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/core.c,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- core.c	2001/08/24 18:01:25	1.45
  +++ core.c	2001/08/24 18:12:02	1.46
  @@ -171,7 +171,7 @@
   
       conf->limit_req_body = 0;
       conf->limit_xml_body = AP_LIMIT_UNSET;
  -    conf->sec = apr_array_make(a, 2, sizeof(ap_conf_vector_t *));
  +    conf->sec_file = apr_array_make(a, 2, sizeof(ap_conf_vector_t *));
   #ifdef WIN32
       conf->script_interpreter_source = INTERPRETER_SOURCE_UNSET;
   #endif
  @@ -301,7 +301,7 @@
       else
           conf->limit_xml_body = base->limit_xml_body;
   
  -    conf->sec = apr_array_append(a, base->sec, new->sec);
  +    conf->sec_file = apr_array_append(a, base->sec_file, new->sec_file);
   
       if (new->satisfy != SATISFY_NOSPEC) {
           conf->satisfy = new->satisfy;
  @@ -342,7 +342,7 @@
   #endif
       conf->access_name = is_virtual ? NULL : DEFAULT_ACCESS_FNAME;
       conf->ap_document_root = is_virtual ? NULL : DOCUMENT_LOCATION;
  -    conf->sec = apr_array_make(a, 40, sizeof(ap_conf_vector_t *));
  +    conf->sec_dir = apr_array_make(a, 40, sizeof(ap_conf_vector_t *));
       conf->sec_url = apr_array_make(a, 40, sizeof(ap_conf_vector_t *));
       
       return (void *)conf;
  @@ -362,7 +362,7 @@
       if (!conf->ap_document_root) {
           conf->ap_document_root = base->ap_document_root;
       }
  -    conf->sec = apr_array_append(p, base->sec, virt->sec);
  +    conf->sec_dir = apr_array_append(p, base->sec_dir, virt->sec_dir);
       conf->sec_url = apr_array_append(p, base->sec_url, virt->sec_url);
   
       return conf;
  @@ -376,7 +376,7 @@
   {
       core_server_config *sconf = ap_get_module_config(s->module_config,
   						     &core_module);
  -    void **new_space = (void **)apr_array_push(sconf->sec);
  +    void **new_space = (void **)apr_array_push(sconf->sec_dir);
       
       *new_space = dir_config;
   }
  @@ -392,7 +392,7 @@
   
   AP_CORE_DECLARE(void) ap_add_file_conf(core_dir_config *conf, void *url_config)
   {
  -    void **new_space = (void **)apr_array_push(conf->sec);
  +    void **new_space = (void **)apr_array_push(conf->sec_file);
       
       *new_space = url_config;
   }
  @@ -469,7 +469,7 @@
   void ap_core_reorder_directories(apr_pool_t *p, server_rec *s)
   {
       core_server_config *sconf;
  -    apr_array_header_t *sec;
  +    apr_array_header_t *sec_dir;
       struct reorder_sort_rec *sortbin;
       int nelts;
       ap_conf_vector_t **elts;
  @@ -477,13 +477,13 @@
       apr_pool_t *tmp;
   
       sconf = ap_get_module_config(s->module_config, &core_module);
  -    sec = sconf->sec;
  -    nelts = sec->nelts;
  -    elts = (ap_conf_vector_t **)sec->elts;
  +    sec_dir = sconf->sec_dir;
  +    nelts = sec_dir->nelts;
  +    elts = (ap_conf_vector_t **)sec_dir->elts;
   
       /* we have to allocate tmp space to do a stable sort */
       apr_pool_create(&tmp, p);
  -    sortbin = apr_palloc(tmp, sec->nelts * sizeof(*sortbin));
  +    sortbin = apr_palloc(tmp, sec_dir->nelts * sizeof(*sortbin));
       for (i = 0; i < nelts; ++i) {
   	sortbin[i].orig_index = i;
   	sortbin[i].elt = elts[i];
  @@ -1576,7 +1576,7 @@
       }
       else if (!strcmp(cmd->path, "~")) {
   	cmd->path = ap_getword_conf(cmd->pool, &arg);
  -        if (!cmd->path) {
  +        if (!cmd->path)
               return "<Directory ~ > block must specify a path";
   	r = ap_pregcomp(cmd->pool, cmd->path, REG_EXTENDED|USE_ICASE);
       }
  
  
  
  1.30      +19 -19    httpd-2.0/server/request.c
  
  Index: request.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/request.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- request.c	2001/08/24 18:01:25	1.29
  +++ request.c	2001/08/24 18:12:02	1.30
  @@ -384,8 +384,8 @@
       core_server_config *sconf = ap_get_module_config(r->server->module_config,
                                                        &core_module);
       ap_conf_vector_t *per_dir_defaults = r->server->lookup_defaults;
  -    ap_conf_vector_t **sec = (ap_conf_vector_t **) sconf->sec->elts;
  -    int num_sec = sconf->sec->nelts;
  +    ap_conf_vector_t **sec_dir = (ap_conf_vector_t **) sconf->sec_dir->elts;
  +    int num_sec = sconf->sec_dir->nelts;
       char *test_filename;
       char *test_dirname;
       int res;
  @@ -428,7 +428,7 @@
   
           for (j = 0; j < num_sec; ++j) {
   
  -            entry_config = sec[j];
  +            entry_config = sec_dir[j];
               entry_core = ap_get_module_config(entry_config, &core_module);
               entry_dir = entry_core->d;
   
  @@ -588,7 +588,7 @@
           for (; j < num_sec; ++j) {
               char *entry_dir;
   
  -            entry_config = sec[j];
  +            entry_config = sec_dir[j];
               entry_core = ap_get_module_config(entry_config, &core_module);
               entry_dir = entry_core->d;
   
  @@ -650,7 +650,7 @@
        */
       for (; j < num_sec; ++j) {
   
  -        entry_config = sec[j];
  +        entry_config = sec_dir[j];
           entry_core = ap_get_module_config(entry_config, &core_module);
   
           if (entry_core->r) {
  @@ -704,9 +704,9 @@
       core_server_config *sconf = ap_get_module_config(r->server->module_config,
                                                        &core_module);
       ap_conf_vector_t *per_dir_defaults = r->server->lookup_defaults;
  -    ap_conf_vector_t **sec_ent = (ap_conf_vector_t **) sconf->sec->elts;
  -    int num_sec = sconf->sec->nelts;
  -    int sec;
  +    ap_conf_vector_t **sec_ent = (ap_conf_vector_t **) sconf->sec_dir->elts;
  +    int num_sec = sconf->sec_dir->nelts;
  +    int sec_idx;
       unsigned int seg;
       int res;
       ap_conf_vector_t *entry_config;
  @@ -767,9 +767,9 @@
               return HTTP_FORBIDDEN;
           }
   
  -        for (sec = 0; sec < num_sec; ++sec) {
  +        for (sec_idx = 0; sec_idx < num_sec; ++sec_idx) {
   
  -            entry_config = sec_ent[sec];
  +            entry_config = sec_ent[sec_idx];
               entry_core = ap_get_module_config(entry_config, &core_module);
               entry_dir = entry_core->d;
   
  @@ -802,11 +802,11 @@
   
       /*
        * seg keeps track of which segment we've copied.
  -     * sec keeps track of which section we're on, since sections are
  +     * sec_idx keeps track of which section we're on, since sections are
        *     ordered by number of segments. See core_reorder_directories 
        */
       seg = ap_count_dirs(r->filename);
  -    sec = 0;
  +    sec_idx = 0;
       do {
           int overrides_here;
           core_dir_config *core_dir = ap_get_module_config(per_dir_defaults,
  @@ -814,16 +814,16 @@
           
           /* We have no trailing slash, but we sure would appreciate one...
            */
  -        if (!sec && r->filename[strlen(r->filename)-1] != '/')
  +        if (!sec_idx && r->filename[strlen(r->filename)-1] != '/')
               strcat(r->filename, "/");
   
           /* Begin *this* level by looking for matching <Directory> sections
            * from the server config.
            */
  -        for (; sec < num_sec; ++sec) {
  +        for (; sec_idx < num_sec; ++sec_idx) {
               const char *entry_dir;
   
  -            entry_config = sec_ent[sec];
  +            entry_config = sec_ent[sec_idx];
               entry_core = ap_get_module_config(entry_config, &core_module);
               entry_dir = entry_core->d;
   
  @@ -994,9 +994,9 @@
        * already handled the proxy:-style stuff.  Now we'll deal with the
        * regexes.
        */
  -    for (; sec < num_sec; ++sec) {
  +    for (; sec_idx < num_sec; ++sec_idx) {
   
  -        entry_config = sec_ent[sec];
  +        entry_config = sec_ent[sec_idx];
           entry_core = ap_get_module_config(entry_config, &core_module);
   
           if (entry_core->r) {
  @@ -1111,8 +1111,8 @@
       core_dir_config *conf = ap_get_module_config(r->per_dir_config,
                                                    &core_module);
       ap_conf_vector_t *per_dir_defaults = r->per_dir_config;
  -    ap_conf_vector_t **file = (ap_conf_vector_t **) conf->sec->elts;
  -    int num_files = conf->sec->nelts;
  +    ap_conf_vector_t **file = (ap_conf_vector_t **) conf->sec_file->elts;
  +    int num_files = conf->sec_file->nelts;
       char *test_file;
   
       /* get the basename */
  
  
  
  1.48      +2 -2      httpd-2.0/include/http_core.h
  
  Index: http_core.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/http_core.h,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- http_core.h	2001/08/02 04:25:19	1.47
  +++ http_core.h	2001/08/24 18:12:02	1.48
  @@ -461,7 +461,7 @@
       int loglevel;
       
       /* Access control */
  -    apr_array_header_t *sec;
  +    apr_array_header_t *sec_file;
       regex_t *r;
   
   #ifdef WIN32
  @@ -490,7 +490,7 @@
       /* Access control */
   
       char *access_name;
  -    apr_array_header_t *sec;
  +    apr_array_header_t *sec_dir;
       apr_array_header_t *sec_url;
   } core_server_config;
   
  
  
  

Mime
View raw message