trafficserver git commit: TS-3777: Rearranging internal request check to use existing variable.

[sh...@apache.org]

Repository: trafficserver
Updated Branches:
  refs/heads/master 1dd52052a -> 4a7e12567


TS-3777: Rearranging internal request check to use existing variable.


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/4a7e1256
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/4a7e1256
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/4a7e1256

Branch: refs/heads/master
Commit: 4a7e1256701e7d9ff55ef6e0734eab6d57ae4183
Parents: 1dd5205
Author: shinrich <sh...@yahoo-inc.com>
Authored: Mon Aug 24 16:14:47 2015 -0500
Committer: shinrich <sh...@yahoo-inc.com>
Committed: Mon Aug 24 16:14:47 2015 -0500

----------------------------------------------------------------------
 proxy/http/HttpTransact.cc | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4a7e1256/proxy/http/HttpTransact.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index c51dd31..5e62a9d 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -5583,12 +5583,12 @@ HttpTransact::initialize_state_variables_from_request(State *s, HTTPHdr *obsolet
     s->client_info.proxy_connect_hdr = true;
   }
 
-  // If this is an internal request, never keep alive
-  NetVConnection *vc = NULL;
   if (s->state_machine->ua_session) {
-    vc = s->state_machine->ua_session->get_netvc();
+    s->request_data.incoming_port = s->state_machine->ua_session->get_netvc()->get_local_port();
+    s->request_data.internal_txn = s->state_machine->ua_session->get_netvc()->get_is_internal_request();
   }
-  if (!s->txn_conf->keep_alive_enabled_in || (vc && vc->get_is_internal_request())) {
+  // If this is an internal request, never keep alive
+  if (!s->txn_conf->keep_alive_enabled_in || s->request_data.internal_txn) {
     s->client_info.keep_alive = HTTP_NO_KEEPALIVE;
   } else {
     s->client_info.keep_alive = incoming_request->keep_alive_get();
@@ -5668,10 +5668,6 @@ HttpTransact::initialize_state_variables_from_request(State *s, HTTPHdr *obsolet
   s->request_data.hostname_str = s->arena.str_store(host_name, host_len);
   ats_ip_copy(&s->request_data.src_ip, &s->client_info.src_addr);
   memset(&s->request_data.dest_ip, 0, sizeof(s->request_data.dest_ip));
-  if (s->state_machine->ua_session) {
-    s->request_data.incoming_port = s->state_machine->ua_session->get_netvc()->get_local_port();
-    s->request_data.internal_txn = s->state_machine->ua_session->get_netvc()->get_is_internal_request();
-  }
   s->request_data.xact_start = s->client_request_time;
   s->request_data.api_info = &s->api_info;