This is an automated email from the ASF dual-hosted git repository.
rrm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 527ccd9 Removes references to non-existent function
handle_conditional_headers (#7162)
527ccd9 is described below
commit 527ccd9868228ea6c6d8d2728c91db2410996e73
Author: Randall Meyer <[email protected]>
AuthorDate: Mon Sep 7 16:14:49 2020 -0700
Removes references to non-existent function handle_conditional_headers
(#7162)
---
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 ef7781d..da34f05 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 e22adcc..fa0dac9 100644
--- a/proxy/http/HttpTransactHeaders.h
+++ b/proxy/http/HttpTransactHeaders.h
@@ -64,10 +64,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,
