This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/7.1.x by this push:
new 2b0da1f clang-analyzer - Called C++ object pointer is null in
get_ka_info_from_config
2b0da1f is described below
commit 2b0da1f1a28de23122a0b17f23c954d9a15d4e9d
Author: Bryan Call <[email protected]>
AuthorDate: Mon May 1 10:57:32 2017 -0700
clang-analyzer - Called C++ object pointer is null in
get_ka_info_from_config
(cherry picked from commit 3fb018a8db6a70fa3266411de91abd23c5f04535)
---
proxy/http/HttpTransact.cc | 58 +++++++++++++++++++++++++---------------------
1 file changed, 31 insertions(+), 27 deletions(-)
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index e104808..30fdd2d 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -2689,36 +2689,40 @@ HttpTransact::HandleCacheOpenReadHit(State *s)
}
if (server_up || s->stale_icp_lookup) {
- bool check_hostdb = get_ka_info_from_config(s, s->current.server);
- DebugTxn("http_trans", "CacheOpenReadHit - check_hostdb %d",
check_hostdb);
- if (!s->stale_icp_lookup && (check_hostdb ||
!s->current.server->dst_addr.isValid())) {
- // ink_release_assert(s->current.request_to == PARENT_PROXY ||
- // s->http_config_param->no_dns_forward_to_parent
!= 0);
-
- // We must be going a PARENT PROXY since so did
- // origin server DNS lookup right after state Start
- //
- // If we end up here in the release case just fall
- // through. The request will fail because of the
- // missing ip but we won't take down the system
- //
- if (s->current.request_to == PARENT_PROXY) {
- // Set ourselves up to handle pending revalidate issues
- // after the PP DNS lookup
- ink_assert(s->pending_work == nullptr);
- s->pending_work = issue_revalidate;
-
- TRANSACT_RETURN(SM_ACTION_DNS_LOOKUP, PPDNSLookup);
- } else if (s->current.request_to == ORIGIN_SERVER) {
- TRANSACT_RETURN(SM_ACTION_DNS_LOOKUP, OSDNSLookup);
- } else {
- handle_parent_died(s);
- return;
+ // set a default version for the outgoing request
+ HTTPVersion http_version;
+
+ if (s->current.server != nullptr) {
+ bool check_hostdb = get_ka_info_from_config(s, s->current.server);
+ DebugTxn("http_trans", "CacheOpenReadHit - check_hostdb %d",
check_hostdb);
+ if (!s->stale_icp_lookup && (check_hostdb ||
!s->current.server->dst_addr.isValid())) {
+ // We must be going a PARENT PROXY since so did
+ // origin server DNS lookup right after state Start
+ //
+ // If we end up here in the release case just fall
+ // through. The request will fail because of the
+ // missing ip but we won't take down the system
+ //
+ if (s->current.request_to == PARENT_PROXY) {
+ // Set ourselves up to handle pending revalidate issues
+ // after the PP DNS lookup
+ ink_assert(s->pending_work == nullptr);
+ s->pending_work = issue_revalidate;
+
+ TRANSACT_RETURN(SM_ACTION_DNS_LOOKUP, PPDNSLookup);
+ } else if (s->current.request_to == ORIGIN_SERVER) {
+ TRANSACT_RETURN(SM_ACTION_DNS_LOOKUP, OSDNSLookup);
+ } else {
+ handle_parent_died(s);
+ return;
+ }
}
+ // override the default version with what the server has
+ http_version = s->current.server->http_version;
}
- DebugTxn("http_trans", "CacheOpenReadHit - version %d",
s->current.server->http_version.m_version);
- build_request(s, &s->hdr_info.client_request,
&s->hdr_info.server_request, s->current.server->http_version);
+ DebugTxn("http_trans", "CacheOpenReadHit - version %d",
http_version.m_version);
+ build_request(s, &s->hdr_info.client_request,
&s->hdr_info.server_request, http_version);
issue_revalidate(s);
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
