httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Thom May <t...@planetarytramp.net>
Subject [PATCH] apr-util renames
Date Sat, 06 Jul 2002 19:44:46 GMT
This patch kinda goes with the cvs commit I just did on apr-util.
According to my testing httpd still compiles without it, but... :)
-Thom


Index: modules/dav/main/util.c
===================================================================
RCS file: /home/cvspublic/httpd-2.0/modules/dav/main/util.c,v
retrieving revision 1.39
diff -u -r1.39 util.c
--- modules/dav/main/util.c	23 Jun 2002 06:42:13 -0000	1.39
+++ modules/dav/main/util.c	6 Jul 2002 19:06:18 -0000
@@ -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.
Index: modules/proxy/mod_proxy.c
===================================================================
RCS file: /home/cvspublic/httpd-2.0/modules/proxy/mod_proxy.c,v
retrieving revision 1.86
diff -u -r1.86 mod_proxy.c
--- modules/proxy/mod_proxy.c	23 Jun 2002 06:06:25 -0000	1.86
+++ modules/proxy/mod_proxy.c	6 Jul 2002 19:06:21 -0000
@@ -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);
Index: modules/proxy/proxy_ftp.c
===================================================================
RCS file: /home/cvspublic/httpd-2.0/modules/proxy/proxy_ftp.c,v
retrieving revision 1.124
diff -u -r1.124 proxy_ftp.c
--- modules/proxy/proxy_ftp.c	28 Jun 2002 08:40:24 -0000	1.124
+++ modules/proxy/proxy_ftp.c	6 Jul 2002 19:06:24 -0000
@@ -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] : "";
 
Index: modules/proxy/proxy_http.c
===================================================================
RCS file: /home/cvspublic/httpd-2.0/modules/proxy/proxy_http.c,v
retrieving revision 1.155
diff -u -r1.155 proxy_http.c
--- modules/proxy/proxy_http.c	26 Jun 2002 19:45:07 -0000	1.155
+++ modules/proxy/proxy_http.c	6 Jul 2002 19:06:26 -0000
@@ -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,
Index: server/config.c
===================================================================
RCS file: /home/cvspublic/httpd-2.0/server/config.c,v
retrieving revision 1.153
diff -u -r1.153 config.c
--- server/config.c	28 Jun 2002 08:40:25 -0000	1.153
+++ server/config.c	6 Jul 2002 19:06:29 -0000
@@ -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)
Index: server/core.c
===================================================================
RCS file: /home/cvspublic/httpd-2.0/server/core.c,v
retrieving revision 1.191
diff -u -r1.191 core.c
--- server/core.c	4 Jul 2002 15:20:52 -0000	1.191
+++ server/core.c	6 Jul 2002 19:06:39 -0000
@@ -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++;
 }
Index: server/util_filter.c
===================================================================
RCS file: /home/cvspublic/httpd-2.0/server/util_filter.c,v
retrieving revision 1.92
diff -u -r1.92 util_filter.c
--- server/util_filter.c	28 Jun 2002 08:40:25 -0000	1.92
+++ server/util_filter.c	6 Jul 2002 19:06:40 -0000
@@ -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