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

FreelancerNaushed · Jun 15, 2015 · eff2e4a · eff2e4a
1 parent 0c81ce8
commit eff2e4a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
 

diff --git 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 &&