[trafficserver] 03/04: TS-4355: Change assert condition for TS-3612

[so...@apache.org]

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

sorber pushed a commit to branch 6.2.x
in repository https://git-dual.apache.org/repos/asf/trafficserver.git

commit 7bf73303bf325b83492c43b58d9241e20a71c475
Author: Masaori Koshiba <ma...@apache.org>
AuthorDate: Mon Apr 25 11:12:17 2016 +0900

    TS-4355: Change assert condition for TS-3612
    
    Originally, the condition of assert in HttpTunnel::main_handler(int event, void *data)
    was same to the condition in HttpTunnel::get_consumer(VIO *vio) before TS-3612.
    This commit makes the condition in HttpTunnel::main_handler(int event, void *data)
    same as condition in HttpTunnel::get_consumer(VIO *vio).
    
    (cherry picked from commit 37f7c05de574458d2eff781d9f047673cda97a4e)
---
 proxy/http/HttpTunnel.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proxy/http/HttpTunnel.cc b/proxy/http/HttpTunnel.cc
index 0bd3f4c..3b9267a 100644
--- a/proxy/http/HttpTunnel.cc
+++ b/proxy/http/HttpTunnel.cc
@@ -1568,7 +1568,7 @@ HttpTunnel::main_handler(int event, void *data)
     sm_callback = producer_handler(event, p);
   } else {
     if ((c = get_consumer((VIO *)data)) != 0) {
-      ink_assert(c->write_vio == (VIO *)data);
+      ink_assert(c->write_vio == (VIO *)data || c->vc == ((VIO *)data)->vc_server);
       sm_callback = consumer_handler(event, c);
     } else {
       internal_error(); // do nothing

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