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

PR:
Obtained from:
Submitted by:	 Thom May
Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95966 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index f0a948e3cca304b9a9d6a31a28f673e41470150a..d0a09467fba15c11828310555b2f064631a2ffb7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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]
 

diff --git a/modules/dav/main/util.c b/modules/dav/main/util.c
index 023fd7994b455962c2b97973a1c9c25f5c83fb26..1d558acf1892e4107a9786823eda9f33ff33a4d2 100644 (file)
--- a/modules/dav/main/util.c
+++ b/modules/dav/main/util.c
@@ -247,7 +247,7 @@ dav_lookup_result dav_lookup_uri(const char *uri, request_rec * r,
 
         /* 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.

diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index 886e02ddc783feea0d1b33faa398c08e2f0abf3a..dfd7391bdfb3736ea281564459e0a76f5c5bab9e 100644 (file)
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -604,7 +604,7 @@ static const char *
     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);

diff --git a/modules/proxy/proxy_ftp.c b/modules/proxy/proxy_ftp.c
index dea106ad96568836b932f37c5b96004b0e9a37fe..3c5ff18eba681192f593ed7ebda9910817228b2d 100644 (file)
--- a/modules/proxy/proxy_ftp.c
+++ b/modules/proxy/proxy_ftp.c
@@ -188,7 +188,7 @@ int ap_proxy_ftp_canon(request_rec *r, char *url)
     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 @@ int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
     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] : "";
 

diff --git a/modules/proxy/proxy_http.c b/modules/proxy/proxy_http.c
index 6ee7060f8393e49df5f9f9200ae64a3d58413404..f536ba47c826de865e59b3e849e285ecdf64f41f 100644 (file)
--- a/modules/proxy/proxy_http.c
+++ b/modules/proxy/proxy_http.c
@@ -92,7 +92,7 @@ int ap_proxy_http_canon(request_rec *r, char *url)
     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 @@ int ap_proxy_http_canon(request_rec *r, char *url)
     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 @@ apr_status_t ap_proxy_http_determine_connection(apr_pool_t *p, request_rec *r,
                                          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,

diff --git a/server/config.c b/server/config.c
index 1de993011919f7e0c8bfedbf2925a8b5a474db32..4a0a6ea0d0776cd6feff4f8b52adc1db579abd3f 100644 (file)
--- a/server/config.c
+++ b/server/config.c
@@ -144,7 +144,7 @@ AP_DECLARE(int) ap_hook_post_config(ap_HOOK_post_config_t *pf,
     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 @@ AP_DECLARE(int) ap_hook_post_config(ap_HOOK_post_config_t *pf,
     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 @@ AP_DECLARE(void) ap_register_hooks(module *m, apr_pool_t *p)
     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 @@ AP_DECLARE(void) ap_setup_prelinked_modules(process_rec *process)
     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 @@ AP_DECLARE(void) ap_setup_prelinked_modules(process_rec *process)
     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)

diff --git a/server/core.c b/server/core.c
index c223220246bf2ef3a83148b84db9da60263b47da..d9acc24bea5cabda96cc5000c1a9a0bacffd9bad 100644 (file)
--- a/server/core.c
+++ b/server/core.c
@@ -3942,7 +3942,7 @@ static apr_status_t reset_request_notes(void *dummy)
 
 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++;
 }

diff --git a/server/util_filter.c b/server/util_filter.c
index 30cfa090e4a46cd86393cb6598d476383fc53461..edb2aee3d2d8941be475af16654d143db7064c69 100644 (file)
--- a/server/util_filter.c
+++ b/server/util_filter.c
@@ -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