mod_proxy: Move ap_proxy_strmatch_path and ap_proxy_strmatch_domain out of

the public API.

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

diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h
index 74ee5ca8182d69cf2a165fb11af36b5d280ea88b..b5588d2dbe281a7f823e514d508f710db291421a 100644 (file)
--- a/modules/proxy/mod_proxy.h
+++ b/modules/proxy/mod_proxy.h
@@ -886,12 +886,7 @@ PROXY_DECLARE(int) ap_proxy_trans_match(request_rec *r,
  */
 int ap_proxy_lb_workers(void);
 
-/* For proxy_util */
 extern module PROXY_DECLARE_DATA proxy_module;
 
-extern int PROXY_DECLARE_DATA proxy_lb_workers;
-extern const apr_strmatch_pattern PROXY_DECLARE_DATA *ap_proxy_strmatch_path;
-extern const apr_strmatch_pattern PROXY_DECLARE_DATA *ap_proxy_strmatch_domain;
-
 #endif /*MOD_PROXY_H*/
 /** @} */

diff --git a/modules/proxy/proxy_util.h b/modules/proxy/proxy_util.h
index 2664a27bce18b0c86cef75f47d17818c2813f9a6..3b32cc052a5f06e2d539e45cdffc771cbccb75e1 100644 (file)
--- a/modules/proxy/proxy_util.h
+++ b/modules/proxy/proxy_util.h
@@ -31,6 +31,10 @@ PROXY_DECLARE(int) ap_proxy_is_domainname(struct dirconn_entry *This, apr_pool_t
 PROXY_DECLARE(int) ap_proxy_is_hostname(struct dirconn_entry *This, apr_pool_t *p);
 PROXY_DECLARE(int) ap_proxy_is_word(struct dirconn_entry *This, apr_pool_t *p);
 
+extern int PROXY_DECLARE_DATA proxy_lb_workers;
+extern const apr_strmatch_pattern PROXY_DECLARE_DATA *ap_proxy_strmatch_path;
+extern const apr_strmatch_pattern PROXY_DECLARE_DATA *ap_proxy_strmatch_domain;
+
 /**
  * Register optional functions declared within proxy_util.c.
  */