[trafficserver] branch master updated: TS-4974: Bad debug assert in HttpSM::handle_server_setup_error

[sh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

shinrich pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git

The following commit(s) were added to refs/heads/master by this push:
       new  57403de   TS-4974: Bad debug assert in HttpSM::handle_server_setup_error
57403de is described below

commit 57403de20699c32868aa27bb64b7ceb2c50c2999
Author: Susan Hinrichs <sh...@ieee.org>
AuthorDate: Fri Oct 14 19:35:28 2016 +0000

    TS-4974: Bad debug assert in HttpSM::handle_server_setup_error
---
 proxy/http/HttpSM.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 11cfa33..3e3e9ad 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -5394,7 +5394,7 @@ HttpSM::handle_server_setup_error(int event, void *data)
   //  to figure out that things have gone to hell
 
   if (tunnel.is_tunnel_active()) {
-    ink_assert(server_entry->read_vio == data);
+    ink_assert(server_entry->read_vio == data || server_entry->write_vio == data);
     DebugSM("http", "[%" PRId64 "] [handle_server_setup_error] "
                     "forwarding event %s to post tunnel",
             sm_id, HttpDebugNames::get_event_name(event));

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].