httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i...@apache.org
Subject cvs commit: httpd-2.0/server config.c core.c util_filter.c
Date Sat, 06 Jul 2002 20:04:39 GMT
ianh        2002/07/06 13:04:39

  Modified:    .        CHANGES
               modules/dav/main util.c
               modules/proxy mod_proxy.c proxy_ftp.c proxy_http.c
               server   config.c core.c util_filter.c
  Log:
  Renames Pending:
   This clears the list of renames pending in apr-util.
   Parts of this list was alreadu done, but the pending list hadn't been updated.
  
   apr_hook_debug_current     from apr_current_hooking_module
   apr_hook_debug_show        from apr_show_hook
  
   apr_hook_global_pool       from apr_global_hook_pool
   apr_hook_sort_all          from apr_sort_hooks
  
   apr_uri_port_of_scheme     from apr_uri_default_port_for_scheme
   apr_uri_unparse            from apr_uri_unparse_components
   apr_uri_parse              from apr_uri_parse_components
   apr_uri_parse_hostinfo     from apr_uri_parse_hostinfo_components
  
   apr_uri_t                  from apr_uri_components
  
   All APR_URI_*              from all APU_URI_* symbols
   All APR_UNP_*              from all UNP_* symbols
  
  Submitted by:	 Thom May
  
  Revision  Changes    Path
  1.859     +2 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.858
  retrieving revision 1.859
  diff -u -r1.858 -r1.859
  --- CHANGES	4 Jul 2002 17:05:25 -0000	1.858
  +++ CHANGES	6 Jul 2002 20:04:37 -0000	1.859
  @@ -1,5 +1,7 @@
   Changes with Apache 2.0.40
   
  +  *) APR-Util Renames pending have been completed [Thom May]
  +
     *) Performance improvements for the code that reads request
        headers (ap_rgetline_core() and related functions)  [Brian Pane]
   
  
  
  
  1.40      +1 -1      httpd-2.0/modules/dav/main/util.c
  
  Index: util.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/dav/main/util.c,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- util.c	23 Jun 2002 06:42:13 -0000	1.39
  +++ util.c	6 Jul 2002 20:04:38 -0000	1.40
  @@ -247,7 +247,7 @@
   
           /* insert a port if the URI did not contain one */
           if (comp.port == 0)
  -            comp.port = apr_uri_default_port_for_scheme(comp.scheme);
  +            comp.port = apr_uri_port_of_scheme(comp.scheme);
   
           /* now, verify that the URI uses the same scheme as the current.
              request. the port must match our port.
  
  
  
  1.87      +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.86
  retrieving revision 1.87
  diff -u -r1.86 -r1.87
  --- mod_proxy.c	23 Jun 2002 06:06:25 -0000	1.86
  +++ mod_proxy.c	6 Jul 2002 20:04:38 -0000	1.87
  @@ -604,7 +604,7 @@
       ap_str_tolower(p + 3);		/* lowercase hostname */
   
       if (port == -1) {
  -        port = apr_uri_default_port_for_scheme(scheme);
  +        port = apr_uri_port_of_scheme(scheme);
       }
   
       new = apr_array_push(conf->proxies);
  
  
  
  1.125     +2 -2      httpd-2.0/modules/proxy/proxy_ftp.c
  
  Index: proxy_ftp.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_ftp.c,v
  retrieving revision 1.124
  retrieving revision 1.125
  diff -u -r1.124 -r1.125
  --- proxy_ftp.c	28 Jun 2002 08:40:24 -0000	1.124
  +++ proxy_ftp.c	6 Jul 2002 20:04:38 -0000	1.125
  @@ -188,7 +188,7 @@
       else {
           return DECLINED;
       }
  -    def_port = apr_uri_default_port_for_scheme("ftp");
  +    def_port = apr_uri_port_of_scheme("ftp");
   
       ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
                    "proxy: FTP: canonicalising URL %s", url);
  @@ -851,7 +851,7 @@
       connectname = r->parsed_uri.hostname;
       connectport = (r->parsed_uri.port != 0)
           ? r->parsed_uri.port
  -        : apr_uri_default_port_for_scheme("ftp");
  +        : apr_uri_port_of_scheme("ftp");
       path = apr_pstrdup(p, r->parsed_uri.path);
       path = (path != NULL && path[0] != '\0') ? &path[1] : "";
   
  
  
  
  1.156     +3 -3      httpd-2.0/modules/proxy/proxy_http.c
  
  Index: proxy_http.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_http.c,v
  retrieving revision 1.155
  retrieving revision 1.156
  diff -u -r1.155 -r1.156
  --- proxy_http.c	26 Jun 2002 19:45:07 -0000	1.155
  +++ proxy_http.c	6 Jul 2002 20:04:38 -0000	1.156
  @@ -92,7 +92,7 @@
       const char *scheme;
       apr_port_t port, def_port;
   
  -    /* ap_default_port_for_scheme() */
  +    /* ap_port_of_scheme() */
       if (strncasecmp(url, "http:", 5) == 0) {
           url += 5;
           scheme = "http";
  @@ -104,7 +104,7 @@
       else {
           return DECLINED;
       }
  -    def_port = apr_uri_default_port_for_scheme(scheme);
  +    def_port = apr_uri_port_of_scheme(scheme);
   
       ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
                "proxy: HTTP: canonicalising URL %s", url);
  @@ -215,7 +215,7 @@
                                            NULL));
       }
       if (!uri->port) {
  -        uri->port = apr_uri_default_port_for_scheme(uri->scheme);
  +        uri->port = apr_uri_port_of_scheme(uri->scheme);
       }
   
       ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
  
  
  
  1.154     +8 -8      httpd-2.0/server/config.c
  
  Index: config.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/config.c,v
  retrieving revision 1.153
  retrieving revision 1.154
  diff -u -r1.153 -r1.154
  --- config.c	28 Jun 2002 08:40:25 -0000	1.153
  +++ config.c	6 Jul 2002 20:04:38 -0000	1.154
  @@ -144,7 +144,7 @@
       ap_LINK_post_config_t *pHook;
   
       if (!_hooks.link_post_config) {
  -        _hooks.link_post_config = apr_array_make(apr_global_hook_pool, 1,
  +        _hooks.link_post_config = apr_array_make(apr_hook_global_pool, 1,
                                                    sizeof(ap_LINK_post_config_t));
           apr_hook_sort_register("post_config", &_hooks.link_post_config);
       }
  @@ -154,10 +154,10 @@
       pHook->aszPredecessors = aszPre;
       pHook->aszSuccessors = aszSucc;
       pHook->nOrder = nOrder;
  -    pHook->szName = apr_current_hooking_module;
  +    pHook->szName = apr_hook_debug_current;
   
  -    if (apr_debug_module_hooks)
  -        apr_show_hook("post_config", aszPre, aszSucc);
  +    if (apr_hook_debug_enabled)
  +        apr_hook_debug_show("post_config", aszPre, aszSucc);
   }
   
   AP_DECLARE(apr_array_header_t *) ap_hook_get_post_config(void) {
  @@ -431,10 +431,10 @@
       if (m->register_hooks) {
           if (getenv("SHOW_HOOKS")) {
               printf("Registering hooks for %s\n", m->name);
  -            apr_debug_module_hooks = 1;
  +            apr_hook_debug_enabled = 1;
           }
   
  -        apr_current_hooking_module = m->name;
  +        apr_hook_debug_current = m->name;
           m->register_hooks(p);
       }
   }
  @@ -610,7 +610,7 @@
       module **m;
       module **m2;
   
  -    apr_global_hook_pool=process->pconf;
  +    apr_hook_global_pool=process->pconf;
   
       /*
        *  Initialise total_modules variable and module indices
  @@ -641,7 +641,7 @@
       for (m = ap_prelinked_modules; *m != NULL; m++)
           ap_add_module(*m, process->pconf);
   
  -    apr_sort_hooks();
  +    apr_hook_sort_all();
   }
   
   AP_DECLARE(const char *) ap_find_module_name(module *m)
  
  
  
  1.192     +1 -1      httpd-2.0/server/core.c
  
  Index: core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/core.c,v
  retrieving revision 1.191
  retrieving revision 1.192
  diff -u -r1.191 -r1.192
  --- core.c	4 Jul 2002 15:20:52 -0000	1.191
  +++ core.c	6 Jul 2002 20:04:38 -0000	1.192
  @@ -3942,7 +3942,7 @@
   
   AP_DECLARE(apr_size_t) ap_register_request_note(void)
   {
  -    apr_pool_cleanup_register(apr_global_hook_pool, NULL, reset_request_notes,
  +    apr_pool_cleanup_register(apr_hook_global_pool, NULL, reset_request_notes,
                                 apr_pool_cleanup_null);
       return num_request_notes++;
   }
  
  
  
  1.93      +2 -2      httpd-2.0/server/util_filter.c
  
  Index: util_filter.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/util_filter.c,v
  retrieving revision 1.92
  retrieving revision 1.93
  diff -u -r1.92 -r1.93
  --- util_filter.c	28 Jun 2002 08:40:25 -0000	1.92
  +++ util_filter.c	6 Jul 2002 20:04:38 -0000	1.93
  @@ -65,8 +65,8 @@
   /* NOTE: Apache's current design doesn't allow a pool to be passed thru,
      so we depend on a global to hold the correct pool
   */
  -#define FILTER_POOL     apr_global_hook_pool
  -#include "apr_hooks.h"   /* for apr_global_hook_pool */
  +#define FILTER_POOL     apr_hook_global_pool
  +#include "apr_hooks.h"   /* for apr_hook_global_pool */
   
   /*
   ** This macro returns true/false if a given filter should be inserted BEFORE
  
  
  

Mime
View raw message