You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2013/07/04 00:58:05 UTC
git commit: Remove useless config API relabelling
Updated Branches:
refs/heads/master 7f24a8c49 -> d1994cc4c
Remove useless config API relabelling
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/d1994cc4
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/d1994cc4
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/d1994cc4
Branch: refs/heads/master
Commit: d1994cc4c48479461ce38473fe3dd7af85a27515
Parents: 7f24a8c
Author: James Peach <jp...@apache.org>
Authored: Wed Jul 3 15:57:57 2013 -0700
Committer: James Peach <jp...@apache.org>
Committed: Wed Jul 3 15:57:57 2013 -0700
----------------------------------------------------------------------
proxy/ReverseProxy.cc | 16 ++++++++--------
proxy/http/remap/UrlRewrite.cc | 18 +++++++++---------
proxy/http/remap/UrlRewrite.h | 3 ---
3 files changed, 17 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d1994cc4/proxy/ReverseProxy.cc
----------------------------------------------------------------------
diff --git a/proxy/ReverseProxy.cc b/proxy/ReverseProxy.cc
index 95c12c4..b1dcce6 100644
--- a/proxy/ReverseProxy.cc
+++ b/proxy/ReverseProxy.cc
@@ -83,14 +83,14 @@ init_reverse_proxy()
_exit(-1);
}
- REVERSE_RegisterConfigUpdateFunc("proxy.config.url_remap.filename", url_rewrite_CB, (void *) FILE_CHANGED);
- REVERSE_RegisterConfigUpdateFunc("proxy.config.proxy_name", url_rewrite_CB, (void *) TSNAME_CHANGED);
- REVERSE_RegisterConfigUpdateFunc("proxy.config.reverse_proxy.enabled", url_rewrite_CB, (void *) REVERSE_CHANGED);
- REVERSE_RegisterConfigUpdateFunc("proxy.config.admin.autoconf_port", url_rewrite_CB, (void *) AC_PORT_CHANGED);
- REVERSE_RegisterConfigUpdateFunc("proxy.config.url_remap.default_to_server_pac", url_rewrite_CB, (void *) DEFAULT_TO_PAC_CHANGED);
- REVERSE_RegisterConfigUpdateFunc("proxy.config.url_remap.default_to_server_pac_port", url_rewrite_CB, (void *) DEFAULT_TO_PAC_PORT_CHANGED);
- REVERSE_RegisterConfigUpdateFunc("proxy.config.url_remap.url_remap_mode", url_rewrite_CB, (void *) URL_REMAP_MODE_CHANGED);
- REVERSE_RegisterConfigUpdateFunc("proxy.config.http.referer_default_redirect", url_rewrite_CB, (void *) HTTP_DEFAULT_REDIRECT_CHANGED);
+ REC_RegisterConfigUpdateFunc("proxy.config.url_remap.filename", url_rewrite_CB, (void *) FILE_CHANGED);
+ REC_RegisterConfigUpdateFunc("proxy.config.proxy_name", url_rewrite_CB, (void *) TSNAME_CHANGED);
+ REC_RegisterConfigUpdateFunc("proxy.config.reverse_proxy.enabled", url_rewrite_CB, (void *) REVERSE_CHANGED);
+ REC_RegisterConfigUpdateFunc("proxy.config.admin.autoconf_port", url_rewrite_CB, (void *) AC_PORT_CHANGED);
+ REC_RegisterConfigUpdateFunc("proxy.config.url_remap.default_to_server_pac", url_rewrite_CB, (void *) DEFAULT_TO_PAC_CHANGED);
+ REC_RegisterConfigUpdateFunc("proxy.config.url_remap.default_to_server_pac_port", url_rewrite_CB, (void *) DEFAULT_TO_PAC_PORT_CHANGED);
+ REC_RegisterConfigUpdateFunc("proxy.config.url_remap.url_remap_mode", url_rewrite_CB, (void *) URL_REMAP_MODE_CHANGED);
+ REC_RegisterConfigUpdateFunc("proxy.config.http.referer_default_redirect", url_rewrite_CB, (void *) HTTP_DEFAULT_REDIRECT_CHANGED);
return 0;
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d1994cc4/proxy/http/remap/UrlRewrite.cc
----------------------------------------------------------------------
diff --git a/proxy/http/remap/UrlRewrite.cc b/proxy/http/remap/UrlRewrite.cc
index 37f7c98..dd0a262 100644
--- a/proxy/http/remap/UrlRewrite.cc
+++ b/proxy/http/remap/UrlRewrite.cc
@@ -488,7 +488,7 @@ UrlRewrite::UrlRewrite(const char *file_var_in)
this->file_var = ats_strdup(file_var_in);
config_file_path[0] = '\0';
- REVERSE_ReadConfigStringAlloc(config_file, file_var_in);
+ REC_ReadConfigStringAlloc(config_file, file_var_in);
if (config_file == NULL) {
pmgmt->signalManager(MGMT_SIGNAL_CONFIG_ERROR, "Unable to find proxy.config.url_remap.filename");
@@ -497,7 +497,7 @@ UrlRewrite::UrlRewrite(const char *file_var_in)
}
this->ts_name = NULL;
- REVERSE_ReadConfigStringAlloc(this->ts_name, "proxy.config.proxy_name");
+ REC_ReadConfigStringAlloc(this->ts_name, "proxy.config.proxy_name");
if (this->ts_name == NULL) {
pmgmt->signalManager(MGMT_SIGNAL_CONFIG_ERROR, "Unable to read proxy.config.proxy_name");
Warning("%s Unable to determine proxy name. Incorrect redirects could be generated", modulePrefix);
@@ -505,19 +505,19 @@ UrlRewrite::UrlRewrite(const char *file_var_in)
}
this->http_default_redirect_url = NULL;
- REVERSE_ReadConfigStringAlloc(this->http_default_redirect_url, "proxy.config.http.referer_default_redirect");
+ REC_ReadConfigStringAlloc(this->http_default_redirect_url, "proxy.config.http.referer_default_redirect");
if (this->http_default_redirect_url == NULL) {
pmgmt->signalManager(MGMT_SIGNAL_CONFIG_ERROR, "Unable to read proxy.config.http.referer_default_redirect");
Warning("%s Unable to determine default redirect url for \"referer\" filter.", modulePrefix);
this->http_default_redirect_url = ats_strdup("http://www.apache.org");
}
- REVERSE_ReadConfigInteger(reverse_proxy, "proxy.config.reverse_proxy.enabled");
- REVERSE_ReadConfigInteger(mgmt_autoconf_port, "proxy.config.admin.autoconf_port");
- REVERSE_ReadConfigInteger(default_to_pac, "proxy.config.url_remap.default_to_server_pac");
- REVERSE_ReadConfigInteger(default_to_pac_port, "proxy.config.url_remap.default_to_server_pac_port");
- REVERSE_ReadConfigInteger(url_remap_mode, "proxy.config.url_remap.url_remap_mode");
- REVERSE_ReadConfigInteger(backdoor_enabled, "proxy.config.url_remap.handle_backdoor_urls");
+ REC_ReadConfigInteger(reverse_proxy, "proxy.config.reverse_proxy.enabled");
+ REC_ReadConfigInteger(mgmt_autoconf_port, "proxy.config.admin.autoconf_port");
+ REC_ReadConfigInteger(default_to_pac, "proxy.config.url_remap.default_to_server_pac");
+ REC_ReadConfigInteger(default_to_pac_port, "proxy.config.url_remap.default_to_server_pac_port");
+ REC_ReadConfigInteger(url_remap_mode, "proxy.config.url_remap.url_remap_mode");
+ REC_ReadConfigInteger(backdoor_enabled, "proxy.config.url_remap.handle_backdoor_urls");
ink_strlcpy(config_file_path, system_config_directory, sizeof(config_file_path));
ink_strlcat(config_file_path, "/", sizeof(config_file_path));
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d1994cc4/proxy/http/remap/UrlRewrite.h
----------------------------------------------------------------------
diff --git a/proxy/http/remap/UrlRewrite.h b/proxy/http/remap/UrlRewrite.h
index e476dff..a74c4af 100644
--- a/proxy/http/remap/UrlRewrite.h
+++ b/proxy/http/remap/UrlRewrite.h
@@ -36,9 +36,6 @@
#define URL_REMAP_FILTER_NONE 0x00000000
#define URL_REMAP_FILTER_REFERER 0x00000001 /* enable "referer" header validation */
#define URL_REMAP_FILTER_REDIRECT_FMT 0x00010000 /* enable redirect URL formatting */
-#define REVERSE_RegisterConfigUpdateFunc REC_RegisterConfigUpdateFunc
-#define REVERSE_ReadConfigInteger REC_ReadConfigInteger
-#define REVERSE_ReadConfigStringAlloc REC_ReadConfigStringAlloc
#define modulePrefix "[ReverseProxy]"
#define BUILD_TABLE_MAX_ARGS 2048