[trafficserver] branch 9.0.x updated: Removes references to non-existent function handle_conditional_headers (#7162)

[zw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/9.0.x by this push:
     new ef99fad  Removes references to non-existent function handle_conditional_headers (#7162)
ef99fad is described below

commit ef99fad31d6cada21b9c8df56ad0302764c206e2
Author: Randall Meyer <rr...@apache.org>
AuthorDate: Mon Sep 7 16:14:49 2020 -0700

    Removes references to non-existent function handle_conditional_headers (#7162)
    
    (cherry picked from commit 527ccd9868228ea6c6d8d2728c91db2410996e73)
---
 proxy/http/HttpTransact.cc       | 6 ------
 proxy/http/HttpTransactHeaders.h | 4 ----
 2 files changed, 10 deletions(-)

diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index 64046b0..7482f7a 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -7734,12 +7734,6 @@ HttpTransact::build_request(State *s, HTTPHdr *base_request, HTTPHdr *outgoing_r
   HttpTransactHeaders::add_global_user_agent_header_to_request(s->txn_conf, outgoing_request);
   handle_request_keep_alive_headers(s, outgoing_version, outgoing_request);
 
-  // handle_conditional_headers appears to be obsolete.  Nothing happens
-  // unless s->cache_info.action == HttpTransact::CACHE_DO_UPDATE.  In that
-  // case an assert will go off.  The functionality of this method
-  // (e.g., setting the if-modfied-since header occurs in issue_revalidate
-  // HttpTransactHeaders::handle_conditional_headers(&s->cache_info, outgoing_request);
-
   if (s->next_hop_scheme < 0) {
     s->next_hop_scheme = URL_WKSIDX_HTTP;
   }
diff --git a/proxy/http/HttpTransactHeaders.h b/proxy/http/HttpTransactHeaders.h
index 144585d..cb92187 100644
--- a/proxy/http/HttpTransactHeaders.h
+++ b/proxy/http/HttpTransactHeaders.h
@@ -66,10 +66,6 @@ public:
   static int write_hdr_protocol_stack(char *hdr_string, size_t len, ProtocolStackDetail pSDetail, std::string_view *proto_buf,
                                       int n_proto, char separator = ' ');
 
-  // Removing handle_conditional_headers.  Functionality appears to be elsewhere (issue_revalidate)
-  // and the only condition when it does anything causes an assert to go
-  // off
-  // static void handle_conditional_headers(HttpTransact::CacheLookupInfo * cache_info, HTTPHdr * header);
   static void insert_warning_header(HttpConfigParams *http_config_param, HTTPHdr *header, HTTPWarningCode code,
                                     const char *warn_text = nullptr, int warn_text_len = 0);
   static void insert_time_and_age_headers_in_response(ink_time_t request_sent_time, ink_time_t response_received_time,