[trafficserver] branch 7.1.x updated: Revert "Fix double do_io_close in HttpTunnel::chain_abort_all()"

[zw...@apache.org]

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

zwoop pushed a commit to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

The following commit(s) were added to refs/heads/7.1.x by this push:
       new  1b44d7e   Revert "Fix double do_io_close in HttpTunnel::chain_abort_all()"
1b44d7e is described below

commit 1b44d7e75d9175b6d1c9637339eed10da8bcf013
Author: Leif Hedstrom <zw...@apache.org>
AuthorDate: Mon May 8 14:36:13 2017 -0400

    Revert "Fix double do_io_close in HttpTunnel::chain_abort_all()"
    
    This reverts commit 96cfbede76068714cdc1f765f19ef188b1bdd136.
    
    This causes assertions.
---
 proxy/http/HttpTunnel.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/proxy/http/HttpTunnel.cc b/proxy/http/HttpTunnel.cc
index cc1fa8c..0f38783 100644
--- a/proxy/http/HttpTunnel.cc
+++ b/proxy/http/HttpTunnel.cc
@@ -1480,12 +1480,12 @@ HttpTunnel::chain_abort_all(HttpTunnelProducer *p)
     if (p->read_vio) {
       p->bytes_read = p->read_vio->ndone;
     }
-    p->read_vio = nullptr;
-    if (p->self_consumer && p->self_consumer->alive) {
+    if (p->self_consumer) {
       p->self_consumer->alive = false;
-      p->vc->do_io_close(EHTTP_ERROR);
-      update_stats_after_abort(p->vc_type);
     }
+    p->read_vio = nullptr;
+    p->vc->do_io_close(EHTTP_ERROR);
+    update_stats_after_abort(p->vc_type);
   }
 }
 

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