trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject trafficserver git commit: TS-2848: Check for NULL server in HttpSM::release_server_session
Date Mon, 15 Jun 2015 18:58:17 GMT
Repository: trafficserver
Updated Branches:
  refs/heads/master 0c81ce80c -> eff2e4a11


TS-2848: Check for NULL server in HttpSM::release_server_session


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

Branch: refs/heads/master
Commit: eff2e4a11086ca3bf968c7c33a1fdc6ef6eb26ec
Parents: 0c81ce8
Author: Feifei Cai <ffcai@yahoo-inc.com>
Authored: Mon Jun 15 13:57:17 2015 -0500
Committer: Alan M. Carroll <solidwallofcode@yahoo-inc.com>
Committed: Mon Jun 15 13:57:17 2015 -0500

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


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/eff2e4a1/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index e8bd616..f577204 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 6.0.0
 
+  *) [TS-2848] Check for null server in HttpSM::release_server_session
+
   *) [TS-3163] Apply socket configurations to outbound connections.
      Author: Wei Sun
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/eff2e4a1/proxy/http/HttpSM.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 96030a3..4239dcb 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -5002,7 +5002,7 @@ HttpSM::release_server_session(bool serve_from_cache)
     return;
   }
 
-  if (TS_SERVER_SESSION_SHARING_MATCH_NONE != t_state.txn_conf->server_session_sharing_match
&&
+  if (TS_SERVER_SESSION_SHARING_MATCH_NONE != t_state.txn_conf->server_session_sharing_match
&& t_state.current.server != NULL &&
       t_state.current.server->keep_alive == HTTP_KEEPALIVE && t_state.hdr_info.server_response.valid()
&&
       t_state.hdr_info.server_request.valid() && (t_state.hdr_info.server_response.status_get()
== HTTP_STATUS_NOT_MODIFIED ||
                                                   (t_state.hdr_info.server_request.method_get_wksidx()
== HTTP_WKSIDX_HEAD &&


Mime
View raw message