[02/50] git commit: TS-2603: Do not update hostdb if intercept exists

[zw...@apache.org]

TS-2603: Do not update hostdb if intercept exists

We should not update hostdb if a HttpSM was intercepted, as the
HttpSM did not really connect to the origin server.  Otherwise we
may set the hostdb address to zero if timeout occurs.

Signed-off-by: Quehan <qu...@taobao.com>


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

Branch: refs/heads/5.0.x
Commit: 2ab1bb6ac56469e212148f665c9db7b725183a7b
Parents: 8aa3af9
Author: Quehan <qu...@taobao.com>
Authored: Sat Mar 1 20:07:48 2014 +0800
Committer: James Peach <jp...@apache.org>
Committed: Wed Apr 9 16:32:46 2014 -0700

----------------------------------------------------------------------
 CHANGES              | 3 +++
 proxy/http/HttpSM.cc | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2ab1bb6a/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 010a6e4..dd31b00 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 5.0.0
 
+  *) [TS-2603] Do not update HostDB for server intercept requests.
+   Author: Quehan <qu...@taobao.com>
+
   *) [TS-2622] Optimize the ink_cluster_time() function.
    Author: Yu Qing <zh...@taobao.com>
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2ab1bb6a/proxy/http/HttpSM.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 80c5d78..36135be 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -3926,7 +3926,7 @@ HttpSM::do_hostdb_update_if_necessary()
 {
   int issue_update = 0;
 
-  if (t_state.current.server == NULL) {
+  if (t_state.current.server == NULL || plugin_tunnel_type != HTTP_NO_PLUGIN_TUNNEL) {
     // No server, so update is not necessary
     return;
   }