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 2011/03/23 00:26:28 UTC

svn commit: r1084409 - in /trafficserver/traffic/trunk: lib/records/I_RecCore.h mgmt/RecordsConfig.cc proxy/http/HttpConfig.cc proxy/http/HttpTransactHeaders.cc

Author: zwoop
Date: Tue Mar 22 23:26:28 2011
New Revision: 1084409

URL: http://svn.apache.org/viewvc?rev=1084409&view=rev
Log:
TS-465 Allow for existing Server: string to not be overwritten.

This uses the normal configuration, proxy.config.http.response_server_enabled,
but with some added semantics:

    0 - Don't ever add a Server string
    1 - Always add a Server string
    2 - Only add the Server string if there isn't one from the Origin

This also fixes a problem with the new MgmtByte format (used for
HTTP configs).

Modified:
    trafficserver/traffic/trunk/lib/records/I_RecCore.h
    trafficserver/traffic/trunk/mgmt/RecordsConfig.cc
    trafficserver/traffic/trunk/proxy/http/HttpConfig.cc
    trafficserver/traffic/trunk/proxy/http/HttpTransactHeaders.cc

Modified: trafficserver/traffic/trunk/lib/records/I_RecCore.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/records/I_RecCore.h?rev=1084409&r1=1084408&r2=1084409&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/records/I_RecCore.h (original)
+++ trafficserver/traffic/trunk/lib/records/I_RecCore.h Tue Mar 22 23:26:28 2011
@@ -195,7 +195,7 @@ void RecSignalManager(int, const char *)
 // that the byte type is just a wrapper around RECD_INT.
 #define REC_EstablishStaticConfigByte(_var, _config_var_name) do { \
     RecLinkConfigByte(_config_var_name, &_var); \
-    _var = REC_ConfigReadInteger(_config_var_name) ? true : false; \
+    _var = (RecByte)REC_ConfigReadInteger(_config_var_name);    \
   } while (0)
 
 RecInt REC_ConfigReadInteger(const char *name);

Modified: trafficserver/traffic/trunk/mgmt/RecordsConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/RecordsConfig.cc?rev=1084409&r1=1084408&r2=1084409&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/RecordsConfig.cc (original)
+++ trafficserver/traffic/trunk/mgmt/RecordsConfig.cc Tue Mar 22 23:26:28 2011
@@ -456,7 +456,7 @@ RecordElement RecordsConfig[] = {
   ,
   {RECT_CONFIG, "proxy.config.http.response_via_str", RECD_STRING, "ApacheTrafficServer/" PACKAGE_VERSION, RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
   ,
-  {RECT_CONFIG, "proxy.config.http.response_server_enabled", RECD_INT, "1", RECU_DYNAMIC, RR_NULL, RECC_NULL, "[0-3]", RECA_NULL}
+  {RECT_CONFIG, "proxy.config.http.response_server_enabled", RECD_INT, "1", RECU_DYNAMIC, RR_NULL, RECC_NULL, "[0-2]", RECA_NULL}
   ,
   {RECT_CONFIG, "proxy.config.http.response_server_str", RECD_STRING, "ATS/" PACKAGE_VERSION, RECU_DYNAMIC, RR_NULL, RECC_NULL, ".*", RECA_NULL}
   ,

Modified: trafficserver/traffic/trunk/proxy/http/HttpConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/HttpConfig.cc?rev=1084409&r1=1084408&r2=1084409&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/HttpConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/http/HttpConfig.cc Tue Mar 22 23:26:28 2011
@@ -1503,7 +1503,7 @@ HttpConfig::reconfigure()
   params->oride.proxy_response_server_string = xstrdup(m_master.oride.proxy_response_server_string);
   params->oride.proxy_response_server_string_len = params->oride.proxy_response_server_string ?
     strlen(params->oride.proxy_response_server_string) : 0;
-  params->oride.proxy_response_server_enabled = INT_TO_BOOL(m_master.oride.proxy_response_server_enabled);
+  params->oride.proxy_response_server_enabled = m_master.oride.proxy_response_server_enabled;
 
   params->oride.insert_squid_x_forwarded_for = INT_TO_BOOL(m_master.oride.insert_squid_x_forwarded_for);
   params->insert_age_in_response = INT_TO_BOOL(m_master.insert_age_in_response);

Modified: trafficserver/traffic/trunk/proxy/http/HttpTransactHeaders.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/HttpTransactHeaders.cc?rev=1084409&r1=1084408&r2=1084409&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/HttpTransactHeaders.cc (original)
+++ trafficserver/traffic/trunk/proxy/http/HttpTransactHeaders.cc Tue Mar 22 23:26:28 2011
@@ -77,7 +77,7 @@ HttpTransactHeaders::is_this_method_supp
 
 
 void
-HttpTransactHeaders::insert_supported_methods_in_response(HTTPHdr * response, int scheme)
+HttpTransactHeaders::insert_supported_methods_in_response(HTTPHdr *response, int scheme)
 {
   int method_output_lengths[32];
   const char *methods[] = {
@@ -164,7 +164,7 @@ HttpTransactHeaders::insert_supported_me
 
 
 void
-HttpTransactHeaders::build_base_response(HTTPHdr * outgoing_response,
+HttpTransactHeaders::build_base_response(HTTPHdr *outgoing_response,
                                          HTTPStatus status,
                                          const char *reason_phrase, int reason_phrase_len, ink_time_t date)
 {
@@ -186,8 +186,8 @@ HttpTransactHeaders::build_base_response
 // If header Date: is not present or invalid in src_hdr,
 // then the given date will be used.
 void
-HttpTransactHeaders::copy_header_fields(HTTPHdr * src_hdr,
-                                        HTTPHdr * new_hdr, bool retain_proxy_auth_hdrs, ink_time_t date)
+HttpTransactHeaders::copy_header_fields(HTTPHdr *src_hdr,
+                                        HTTPHdr *new_hdr, bool retain_proxy_auth_hdrs, ink_time_t date)
 {
   ink_assert(src_hdr->valid());
   ink_assert(!new_hdr->valid());
@@ -239,7 +239,7 @@ HttpTransactHeaders::copy_header_fields(
 ////////////////////////////////////////////////////////////////////////
 // Just convert the outgoing request to the appropriate version
 void
-HttpTransactHeaders::convert_request(HTTPVersion outgoing_ver, HTTPHdr * outgoing_request)
+HttpTransactHeaders::convert_request(HTTPVersion outgoing_ver, HTTPHdr *outgoing_request)
 {
   if (outgoing_ver == HTTPVersion(1, 0)) {
     convert_to_1_0_request_header(outgoing_request);
@@ -257,7 +257,7 @@ HttpTransactHeaders::convert_request(HTT
 ////////////////////////////////////////////////////////////////////////
 // Just convert the outgoing response to the appropriate version
 void
-HttpTransactHeaders::convert_response(HTTPVersion outgoing_ver, HTTPHdr * outgoing_response)
+HttpTransactHeaders::convert_response(HTTPVersion outgoing_ver, HTTPHdr *outgoing_response)
 {
   if (outgoing_ver == HTTPVersion(1, 0)) {
     convert_to_1_0_response_header(outgoing_response);
@@ -276,7 +276,7 @@ HttpTransactHeaders::convert_response(HT
 ////////////////////////////////////////////////////////////////////////
 // Take an existing outgoing request header and make it HTTP/0.9
 void
-HttpTransactHeaders::convert_to_0_9_request_header(HTTPHdr * outgoing_request)
+HttpTransactHeaders::convert_to_0_9_request_header(HTTPHdr *outgoing_request)
 {
   // These are required
   ink_debug_assert(outgoing_request->method_get_wksidx() == HTTP_WKSIDX_GET);
@@ -292,7 +292,7 @@ HttpTransactHeaders::convert_to_0_9_requ
 ////////////////////////////////////////////////////////////////////////
 // Take an existing outgoing request header and make it HTTP/1.0
 void
-HttpTransactHeaders::convert_to_1_0_request_header(HTTPHdr * outgoing_request)
+HttpTransactHeaders::convert_to_1_0_request_header(HTTPHdr *outgoing_request)
 {
   // These are required
   ink_debug_assert(outgoing_request->url_get()->valid());
@@ -316,7 +316,7 @@ HttpTransactHeaders::convert_to_1_0_requ
 ////////////////////////////////////////////////////////////////////////
 // Take an existing outgoing request header and make it HTTP/1.1
 void
-HttpTransactHeaders::convert_to_1_1_request_header(HTTPHdr * outgoing_request)
+HttpTransactHeaders::convert_to_1_1_request_header(HTTPHdr *outgoing_request)
 {
 
   // These are required
@@ -337,7 +337,7 @@ HttpTransactHeaders::convert_to_1_1_requ
 ////////////////////////////////////////////////////////////////////////
 // Take an existing outgoing response header and make it HTTP/0.9
 void
-HttpTransactHeaders::convert_to_0_9_response_header(HTTPHdr * outgoing_response)
+HttpTransactHeaders::convert_to_0_9_response_header(HTTPHdr *outgoing_response)
 {
   NOWARN_UNUSED(outgoing_response);
   // Http 0.9 does not require a response header.
@@ -353,7 +353,7 @@ HttpTransactHeaders::convert_to_0_9_resp
 ////////////////////////////////////////////////////////////////////////
 // Take an existing outgoing response header and make it HTTP/1.0
 void
-HttpTransactHeaders::convert_to_1_0_response_header(HTTPHdr * outgoing_response)
+HttpTransactHeaders::convert_to_1_0_response_header(HTTPHdr *outgoing_response)
 {
 //     // These are required
 //     ink_debug_assert(outgoing_response->status_get());
@@ -371,7 +371,7 @@ HttpTransactHeaders::convert_to_1_0_resp
 ////////////////////////////////////////////////////////////////////////
 // Take an existing outgoing response header and make it HTTP/1.1
 void
-HttpTransactHeaders::convert_to_1_1_response_header(HTTPHdr * outgoing_response)
+HttpTransactHeaders::convert_to_1_1_response_header(HTTPHdr *outgoing_response)
 {
   // These are required
   ink_debug_assert(outgoing_response->status_get());
@@ -396,7 +396,7 @@ HttpTransactHeaders::convert_to_1_1_resp
 ink_time_t
 HttpTransactHeaders::calculate_document_age(ink_time_t request_time,
                                             ink_time_t response_time,
-                                            HTTPHdr * base_response, ink_time_t base_response_date, ink_time_t now)
+                                            HTTPHdr *base_response, ink_time_t base_response_date, ink_time_t now)
 {
   ink_time_t age_value = base_response->get_age();
   ink_time_t date_value = 0;
@@ -455,7 +455,7 @@ HttpTransactHeaders::calculate_document_
 
 
 bool
-HttpTransactHeaders::does_server_allow_response_to_be_stored(HTTPHdr * resp)
+HttpTransactHeaders::does_server_allow_response_to_be_stored(HTTPHdr *resp)
 {
   uint32_t cc_mask = (MIME_COOKED_MASK_CC_NO_CACHE | MIME_COOKED_MASK_CC_NO_STORE | MIME_COOKED_MASK_CC_PRIVATE);
 
@@ -467,7 +467,7 @@ HttpTransactHeaders::does_server_allow_r
 
 
 bool
-HttpTransactHeaders::downgrade_request(bool * origin_server_keep_alive, HTTPHdr * outgoing_request)
+HttpTransactHeaders::downgrade_request(bool *origin_server_keep_alive, HTTPHdr *outgoing_request)
 {
   //HTTPVersion ver;
   /* First try turning keep_alive off */
@@ -495,7 +495,7 @@ HttpTransactHeaders::downgrade_request(b
   return true;
 }
 bool
-HttpTransactHeaders::get_wuts_code(HTTPHdr * hdr, WUTSCode * w)
+HttpTransactHeaders::get_wuts_code(HTTPHdr *hdr, WUTSCode *w)
 {
 #define is_alnum(c)  (ParseRules::is_alnum (c))
 #define is_digit(c)  (ParseRules::is_digit (c))
@@ -549,7 +549,7 @@ HttpTransactHeaders::get_wuts_code(HTTPH
 
 
 void
-HttpTransactHeaders::set_wuts_codes(HTTPHdr * hdr, WUTSCode * code)
+HttpTransactHeaders::set_wuts_codes(HTTPHdr *hdr, WUTSCode *code)
 {
 #define is_digit(c)  (ParseRules::is_digit (c))
 #define is_hex(c)    (ParseRules::is_hex (c))
@@ -620,7 +620,7 @@ HttpTransactHeaders::set_wuts_codes(HTTP
 
 
 void
-HttpTransactHeaders::set_wuts_codes(HTTPHdr * hdr,
+HttpTransactHeaders::set_wuts_codes(HTTPHdr *hdr,
                                     SquidHitMissCode hit_miss_code,
                                     SquidLogCode log_code,
                                     SquidHierarchyCode hier_code,
@@ -655,9 +655,9 @@ HttpTransactHeaders::set_wuts_codes(HTTP
 
 
 void
-HttpTransactHeaders::generate_and_set_wuts_codes(HTTPHdr * header,
+HttpTransactHeaders::generate_and_set_wuts_codes(HTTPHdr *header,
                                                  char *via_string,
-                                                 HttpTransact::SquidLogInfo * squid_codes,
+                                                 HttpTransact::SquidLogInfo *squid_codes,
                                                  int wuts_id, bool set_codes_in_hdr, bool log_spider_codes)
 {
   SquidLogCode log_code;
@@ -868,7 +868,7 @@ HttpTransactHeaders::generate_and_set_wu
 
 
 void
-HttpTransactHeaders::convert_wuts_code_to_normal_reason(HTTPHdr * hdr)
+HttpTransactHeaders::convert_wuts_code_to_normal_reason(HTTPHdr *hdr)
 {
   const char *phrase;
   int length;
@@ -886,7 +886,7 @@ HttpTransactHeaders::convert_wuts_code_t
 
 
 void
-HttpTransactHeaders::handle_conditional_headers(HttpTransact::CacheLookupInfo * cache_info, HTTPHdr * header)
+HttpTransactHeaders::handle_conditional_headers(HttpTransact::CacheLookupInfo *cache_info, HTTPHdr *header)
 {
   if (cache_info->action == HttpTransact::CACHE_DO_UPDATE) {
     HTTPHdr *c_response = cache_info->object_read->response_get();
@@ -967,7 +967,7 @@ HttpTransactHeaders::insert_warning_head
 void
 HttpTransactHeaders::insert_time_and_age_headers_in_response(ink_time_t request_sent_time,
                                                              ink_time_t response_received_time,
-                                                             ink_time_t now, HTTPHdr * base, HTTPHdr * outgoing)
+                                                             ink_time_t now, HTTPHdr *base, HTTPHdr *outgoing)
 {
   ink_time_t date = base->get_date();
   ink_time_t current_age = calculate_document_age(request_sent_time, response_received_time, base, date, now);
@@ -982,7 +982,7 @@ HttpTransactHeaders::insert_time_and_age
 
 
 void
-HttpTransactHeaders::insert_server_header_in_response(const char *server_tag, int server_tag_size, HTTPHdr * h)
+HttpTransactHeaders::insert_server_header_in_response(const char *server_tag, int server_tag_size, HTTPHdr *h)
 {
   if (likely(server_tag && server_tag_size > 0 && h)) {
     h->set_server(server_tag, server_tag_size);
@@ -1094,7 +1094,7 @@ HttpTransactHeaders::insert_via_header_i
 
 
 void
-HttpTransactHeaders::insert_via_header_in_response(HttpConfigParams * http_config_param, int scheme, HTTPHdr * header,
+HttpTransactHeaders::insert_via_header_in_response(HttpConfigParams *http_config_param, int scheme, HTTPHdr *header,
                                                    char *incoming_via)
 {
   char new_via_string[8192];
@@ -1155,7 +1155,7 @@ HttpTransactHeaders::insert_via_header_i
 //  fix for INKqa09089
 ///////////////////////////////////////////////////////////////////////////////
 void
-HttpTransactHeaders::insert_basic_realm_in_proxy_authenticate(const char *realm, HTTPHdr * header, bool bRevPrxy)
+HttpTransactHeaders::insert_basic_realm_in_proxy_authenticate(const char *realm, HTTPHdr *header, bool bRevPrxy)
 {
   char new_basic_realm[128];
   char *basic_realm;
@@ -1179,20 +1179,20 @@ HttpTransactHeaders::insert_basic_realm_
 
 
 inline void
-HttpTransactHeaders::process_connection_field_in_outgoing_header(HTTPHdr * base, HTTPHdr * header)
+HttpTransactHeaders::process_connection_field_in_outgoing_header(HTTPHdr *base, HTTPHdr *header)
 {
   _process_xxx_connection_field_in_outgoing_header(MIME_FIELD_CONNECTION, MIME_LEN_CONNECTION, base, header);
 }
 
 inline void
-HttpTransactHeaders::process_proxy_connection_field_in_outgoing_header(HTTPHdr * base, HTTPHdr * header)
+HttpTransactHeaders::process_proxy_connection_field_in_outgoing_header(HTTPHdr *base, HTTPHdr *header)
 {
   _process_xxx_connection_field_in_outgoing_header(MIME_FIELD_PROXY_CONNECTION, MIME_LEN_PROXY_CONNECTION, base, header);
 }
 
 
 void
-HttpTransactHeaders::process_connection_headers(HTTPHdr * base, HTTPHdr * outgoing)
+HttpTransactHeaders::process_connection_headers(HTTPHdr *base, HTTPHdr *outgoing)
 {
   process_connection_field_in_outgoing_header(base, outgoing);
   process_proxy_connection_field_in_outgoing_header(base, outgoing);
@@ -1202,7 +1202,7 @@ HttpTransactHeaders::process_connection_
 void
 HttpTransactHeaders::_process_xxx_connection_field_in_outgoing_header(const char *wks_field_name,
                                                                       int wks_field_name_len,
-                                                                      HTTPHdr * base, HTTPHdr * header)
+                                                                      HTTPHdr *base, HTTPHdr *header)
 {
   MIMEField *con_hdr;
   con_hdr = base->field_find(wks_field_name, wks_field_name_len);
@@ -1249,7 +1249,7 @@ HttpTransactHeaders::_process_xxx_connec
 
 
 void
-HttpTransactHeaders::remove_conditional_headers(HTTPHdr * base, HTTPHdr * outgoing)
+HttpTransactHeaders::remove_conditional_headers(HTTPHdr *base, HTTPHdr *outgoing)
 {
   NOWARN_UNUSED(base);
   if (outgoing->presence(MIME_PRESENCE_IF_MODIFIED_SINCE |
@@ -1267,7 +1267,7 @@ HttpTransactHeaders::remove_conditional_
 ////////////////////////////////////////////////////////////////////////
 // Deal with lame-o servers by removing the host name from the url.
 void
-HttpTransactHeaders::remove_host_name_from_url(HTTPHdr * outgoing_request)
+HttpTransactHeaders::remove_host_name_from_url(HTTPHdr *outgoing_request)
 {
   URL *outgoing_url = outgoing_request->url_get();
   outgoing_url->nuke_proxy_stuff();
@@ -1275,7 +1275,7 @@ HttpTransactHeaders::remove_host_name_fr
 
 
 void
-HttpTransactHeaders::add_global_user_agent_header_to_request(HttpConfigParams * http_config_param, HTTPHdr * header)
+HttpTransactHeaders::add_global_user_agent_header_to_request(HttpConfigParams *http_config_param, HTTPHdr *header)
 {
   if (http_config_param->global_user_agent_header) {
     MIMEField *ua_field;
@@ -1294,20 +1294,25 @@ HttpTransactHeaders::add_global_user_age
 
 
 void
-HttpTransactHeaders::add_server_header_to_response(OverridableHttpConfigParams *http_txn_conf, HTTPHdr * header)
+HttpTransactHeaders::add_server_header_to_response(OverridableHttpConfigParams *http_txn_conf, HTTPHdr *header)
 {
   if (http_txn_conf->proxy_response_server_enabled && http_txn_conf->proxy_response_server_string) {
     MIMEField *ua_field;
+    bool do_add = true;
 
-    Debug("http_trans", "Adding Server: %s", http_txn_conf->proxy_response_server_string);
     if ((ua_field = header->field_find(MIME_FIELD_SERVER, MIME_LEN_SERVER)) == NULL) {
       if (likely((ua_field = header->field_create(MIME_FIELD_SERVER, MIME_LEN_SERVER)) != NULL))
         header->field_attach(ua_field);
+    } else {
+      // There was an existing header from Origin, so only add if setting allows to overwrite.
+      do_add = (1 == http_txn_conf->proxy_response_server_enabled);
     }
+
     // This will remove any old string (free it), and set our Server header.
-    if (likely(ua_field))
-      header->field_value_set(ua_field, http_txn_conf->proxy_response_server_string,
-                              http_txn_conf->proxy_response_server_string_len);
+    if (do_add && likely(ua_field)) {
+      Debug("http_trans", "Adding Server: %s", http_txn_conf->proxy_response_server_string);
+      header->field_value_set(ua_field, http_txn_conf->proxy_response_server_string, http_txn_conf->proxy_response_server_string_len);
+    }
   }
 }