You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2014/01/21 00:08:15 UTC
[36/50] git commit: TS-2484 Add API support for the two missing
overridable APIs
TS-2484 Add API support for the two missing overridable APIs
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/e074f7f0
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/e074f7f0
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/e074f7f0
Branch: refs/heads/5.0.x
Commit: e074f7f012cd91a565fd7ba98095da2dfe15a3ac
Parents: 5eab1b8
Author: Leif Hedstrom <zw...@apache.org>
Authored: Wed Jan 15 16:21:29 2014 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Wed Jan 15 16:22:33 2014 -0700
----------------------------------------------------------------------
proxy/InkAPI.cc | 26 ++++++++++++++++++++++----
proxy/InkAPITest.cc | 4 +++-
proxy/api/ts/ts.h.in | 2 ++
3 files changed, 27 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e074f7f0/proxy/InkAPI.cc
----------------------------------------------------------------------
diff --git a/proxy/InkAPI.cc b/proxy/InkAPI.cc
index 2be442d..53a8b65 100644
--- a/proxy/InkAPI.cc
+++ b/proxy/InkAPI.cc
@@ -7603,6 +7603,14 @@ _conf_to_memberp(TSOverridableConfigKey conf, HttpSM* sm, OverridableDataType *t
typ = OVERRIDABLE_TYPE_BYTE;
ret = &sm->t_state.txn_conf->proxy_response_hsts_include_subdomains;
break;
+ case TS_CONFIG_HTTP_CACHE_OPEN_READ_RETRY_TIME:
+ typ = OVERRIDABLE_TYPE_INT;
+ ret = &sm->t_state.txn_conf->cache_open_read_retry_time;
+ break;
+ case TS_CONFIG_HTTP_CACHE_MAX_OPEN_READ_RETRIES:
+ typ = OVERRIDABLE_TYPE_INT;
+ ret = &sm->t_state.txn_conf->max_cache_open_read_retries;
+ break;
// This helps avoiding compiler warnings, yet detect unhandled enum members.
case TS_CONFIG_NULL:
@@ -7996,10 +8004,18 @@ TSHttpTxnConfigFind(const char* name, int length, TSOverridableConfigKey *conf,
break;
case 44:
- if (!strncmp(name, "proxy.config.http.anonymize_remove_client_ip", length))
- cnf = TS_CONFIG_HTTP_ANONYMIZE_REMOVE_CLIENT_IP;
- else if (!strncmp(name, "proxy.config.http.anonymize_insert_client_ip", length))
- cnf = TS_CONFIG_HTTP_ANONYMIZE_INSERT_CLIENT_IP;
+ switch (name[length-1]) {
+ case 'p':
+ if (!strncmp(name, "proxy.config.http.anonymize_remove_client_ip", length))
+ cnf = TS_CONFIG_HTTP_ANONYMIZE_REMOVE_CLIENT_IP;
+ else if (!strncmp(name, "proxy.config.http.anonymize_insert_client_ip", length))
+ cnf = TS_CONFIG_HTTP_ANONYMIZE_INSERT_CLIENT_IP;
+ break;
+ case 'e':
+ if (!strncmp(name, "proxy.config.http.cache.open_read_retry_time", length))
+ cnf = TS_CONFIG_HTTP_CACHE_OPEN_READ_RETRY_TIME;
+ break;
+ }
break;
case 45:
@@ -8019,6 +8035,8 @@ TSHttpTxnConfigFind(const char* name, int length, TSOverridableConfigKey *conf,
case 's':
if (!strncmp(name, "proxy.config.http.connect_attempts_rr_retries", length))
cnf = TS_CONFIG_HTTP_CONNECT_ATTEMPTS_RR_RETRIES;
+ else if (!strncmp(name, "proxy.config.http.cache.max_open_read_retries", length))
+ cnf = TS_CONFIG_HTTP_CACHE_MAX_OPEN_READ_RETRIES;
break;
}
break;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e074f7f0/proxy/InkAPITest.cc
----------------------------------------------------------------------
diff --git a/proxy/InkAPITest.cc b/proxy/InkAPITest.cc
index b9945a1..727cc26 100644
--- a/proxy/InkAPITest.cc
+++ b/proxy/InkAPITest.cc
@@ -7414,7 +7414,9 @@ const char *SDK_Overridable_Configs[TS_CONFIG_LAST_ENTRY] = {
"proxy.config.http.negative_revalidating_lifetime",
"proxy.config.http.accept_encoding_filter_enabled",
"proxy.config.ssl.hsts_max_age",
- "proxy.config.ssl.hsts_include_subdomains"
+ "proxy.config.ssl.hsts_include_subdomains",
+ "proxy.config.http.cache.open_read_retry_time",
+ "proxy.config.http.cache.max_open_read_retries"
};
REGRESSION_TEST(SDK_API_OVERRIDABLE_CONFIGS) (RegressionTest * test, int /* atype ATS_UNUSED */, int *pstatus)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e074f7f0/proxy/api/ts/ts.h.in
----------------------------------------------------------------------
diff --git a/proxy/api/ts/ts.h.in b/proxy/api/ts/ts.h.in
index e568b1f..f5ab4d7 100644
--- a/proxy/api/ts/ts.h.in
+++ b/proxy/api/ts/ts.h.in
@@ -682,6 +682,8 @@ extern "C"
TS_CONFIG_HTTP_ACCEPT_ENCODING_FILTER_ENABLED,
TS_CONFIG_SSL_HSTS_MAX_AGE,
TS_CONFIG_SSL_HSTS_INCLUDE_SUBDOMAINS,
+ TS_CONFIG_HTTP_CACHE_OPEN_READ_RETRY_TIME,
+ TS_CONFIG_HTTP_CACHE_MAX_OPEN_READ_RETRIES,
TS_CONFIG_LAST_ENTRY
} TSOverridableConfigKey;