svn commit: r1101666 - in /trafficserver/traffic/trunk/proxy/http: HttpConfig.cc HttpConfig.h HttpSM.cc

[zw...@apache.org]

Author: zwoop
Date: Tue May 10 22:04:53 2011
New Revision: 1101666

URL: http://svn.apache.org/viewvc?rev=1101666&view=rev
Log:
TS-772 Make proxy.config.http.doc_in_cache_skip_dns overridable

Modified:
    trafficserver/traffic/trunk/proxy/http/HttpConfig.cc
    trafficserver/traffic/trunk/proxy/http/HttpConfig.h
    trafficserver/traffic/trunk/proxy/http/HttpSM.cc

Modified: trafficserver/traffic/trunk/proxy/http/HttpConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/HttpConfig.cc?rev=1101666&r1=1101665&r2=1101666&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/HttpConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/http/HttpConfig.cc Tue May 10 22:04:53 2011
@@ -1155,7 +1155,7 @@ HttpConfig::startup()
   HttpEstablishStaticConfigByte(c.disable_ssl_parenting, "proxy.local.http.parent_proxy.disable_connect_tunneling");
   HttpEstablishStaticConfigByte(c.no_dns_forward_to_parent, "proxy.config.http.no_dns_just_forward_to_parent");
   HttpEstablishStaticConfigByte(c.uncacheable_requests_bypass_parent, "proxy.config.http.uncacheable_requests_bypass_parent");
-  HttpEstablishStaticConfigByte(c.doc_in_cache_skip_dns, "proxy.config.http.doc_in_cache_skip_dns");
+  HttpEstablishStaticConfigByte(c.oride.doc_in_cache_skip_dns, "proxy.config.http.doc_in_cache_skip_dns");
 
   HttpEstablishStaticConfigByte(c.no_origin_server_dns, "proxy.config.http.no_origin_server_dns");
   HttpEstablishStaticConfigByte(c.use_client_target_addr, "proxy.config.http.use_client_target_addr");
@@ -1576,7 +1576,7 @@ HttpConfig::reconfigure()
   params->record_cop_page = INT_TO_BOOL(m_master.record_cop_page);
   params->record_tcp_mem_hit = INT_TO_BOOL(m_master.record_tcp_mem_hit);
   params->oride.send_http11_requests = INT_TO_BYTE(m_master.oride.send_http11_requests);
-  params->doc_in_cache_skip_dns = INT_TO_BOOL(m_master.doc_in_cache_skip_dns);
+  params->oride.doc_in_cache_skip_dns = INT_TO_BOOL(m_master.oride.doc_in_cache_skip_dns);
   params->default_buffer_size_index = m_master.default_buffer_size_index;
   params->default_buffer_water_mark = m_master.default_buffer_water_mark;
   params->enable_http_info = INT_TO_BOOL(m_master.enable_http_info);

Modified: trafficserver/traffic/trunk/proxy/http/HttpConfig.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/HttpConfig.h?rev=1101666&r1=1101665&r2=1101666&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/HttpConfig.h (original)
+++ trafficserver/traffic/trunk/proxy/http/HttpConfig.h Tue May 10 22:04:53 2011
@@ -429,6 +429,7 @@ struct OverridableHttpConfigParams {
        down_server_timeout(0), client_abort_threshold(0),
        freshness_fuzz_time(0), freshness_fuzz_min_time(0),
        max_cache_open_read_retries(0), cache_open_read_retry_time(0),
+       doc_in_cache_skip_dns(1),
 
        // Strings / floats must come last
        proxy_response_server_string(NULL), proxy_response_server_string_len(0),
@@ -541,6 +542,11 @@ struct OverridableHttpConfigParams {
   MgmtInt max_cache_open_read_retries;
   MgmtInt cache_open_read_retry_time;   // time is in mseconds
 
+  //////////////////////
+  //  DOC IN CACHE NO DNS//
+  //////////////////////
+  MgmtByte doc_in_cache_skip_dns;
+
   // IMPORTANT: Here comes all strings / floats configs.
 
   ///////////////////////////////////////////////////////////////////
@@ -761,11 +767,6 @@ public:
   MgmtByte errors_log_error_pages;
   MgmtInt slow_log_threshold;
 
-  //////////////////////
-  //  DOC IN CACHE NO DNS//
-  //////////////////////
-  MgmtByte doc_in_cache_skip_dns;
-
   MgmtInt default_buffer_size_index;
   MgmtInt default_buffer_water_mark;
   MgmtByte enable_http_info;
@@ -970,7 +971,6 @@ HttpConfigParams::HttpConfigParams()
     record_cop_page(0),
     record_tcp_mem_hit(0),
     errors_log_error_pages(0),
-    doc_in_cache_skip_dns(1),       // Added for SKIPPING DNS If DOC IN CACHE
     default_buffer_size_index(0),
     default_buffer_water_mark(0),
     enable_http_info(0),

Modified: trafficserver/traffic/trunk/proxy/http/HttpSM.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/HttpSM.cc?rev=1101666&r1=1101665&r2=1101666&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/HttpSM.cc (original)
+++ trafficserver/traffic/trunk/proxy/http/HttpSM.cc Tue May 10 22:04:53 2011
@@ -425,7 +425,7 @@ HttpSM::init()
   t_state.init();
   // Added to skip dns if the document is in cache. DNS will be forced if there is a ip based based ACL in cache control or parent.config or if the doc_in_cache_skip_dns is disabled or if http caching is disabled
   t_state.force_dns = (ip_rule_in_CacheControlTable() || t_state.parent_params->ParentTable->ipMatch ||
-                       !(t_state.http_config_param->doc_in_cache_skip_dns) || !(t_state.txn_conf->cache_http));
+                       !(t_state.txn_conf->doc_in_cache_skip_dns) || !(t_state.txn_conf->cache_http));
 
   http_parser_init(&http_parser);