From 5ab19d5a5a31c33e714ba000e9bad0732da3f82c Mon Sep 17 00:00:00 2001 From: Ian Holsman Date: Sat, 6 Jul 2002 20:04:38 +0000 Subject: [PATCH] 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 --- CHANGES | 2 ++ modules/dav/main/util.c | 2 +- modules/proxy/mod_proxy.c | 2 +- modules/proxy/proxy_ftp.c | 4 ++-- modules/proxy/proxy_http.c | 6 +++--- server/config.c | 16 ++++++++-------- server/core.c | 2 +- server/util_filter.c | 4 ++-- 8 files changed, 20 insertions(+), 18 deletions(-) diff --git a/CHANGES b/CHANGES index f0a948e3cc..d0a09467fb 100644 --- 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 023fd7994b..1d558acf18 100644 --- 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 886e02ddc7..dfd7391bdf 100644 --- 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 dea106ad96..3c5ff18eba 100644 --- 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 6ee7060f83..f536ba47c8 100644 --- 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 1de9930119..4a0a6ea0d0 100644 --- 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 c223220246..d9acc24bea 100644 --- 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 30cfa090e4..edb2aee3d2 100644 --- 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 -- 2.40.0