From de62c7c02cfad5aea9b70d05c522c2a180804a32 Mon Sep 17 00:00:00 2001 From: Randall Meyer Date: Thu, 3 Sep 2020 08:21:58 -0700 Subject: [PATCH] Removes references to non-existent function handle_conditional_headers --- 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 ef7781dfd90..da34f053028 100644 --- a/proxy/http/HttpTransact.cc +++ b/proxy/http/HttpTransact.cc @@ -7681,12 +7681,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 e22adcc9bea..fa0dac96f21 100644 --- a/proxy/http/HttpTransactHeaders.h +++ b/proxy/http/HttpTransactHeaders.h @@ -64,10 +64,6 @@ class HttpTransactHeaders 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,