[trafficserver] branch 7.1.x updated: Reset inactive timeout everytime H2 DATA frames are sent

[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  f47c03d   Reset inactive timeout everytime H2 DATA frames are sent
f47c03d is described below

commit f47c03d23f6c7ed1493d2d1810ba2e747d875f00
Author: Masakazu Kitajo <ma...@apache.org>
AuthorDate: Wed Mar 15 16:50:42 2017 +0900

    Reset inactive timeout everytime H2 DATA frames are sent
    
    The timer wasn't reset if transmission was resumed by WINDOW_UPDATE frames.
    
    (cherry picked from commit 5f1dcc096487a0cdb4614ca971ad5d717774805b)
---
 proxy/http2/Http2Stream.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/proxy/http2/Http2Stream.cc b/proxy/http2/Http2Stream.cc
index 3225c80..a570266 100644
--- a/proxy/http2/Http2Stream.cc
+++ b/proxy/http2/Http2Stream.cc
@@ -575,7 +575,6 @@ Http2Stream::update_write_request(IOBufferReader *buf_reader, int64_t write_len,
             // As with update_read_request, should be safe to call handler directly here if
             // call_update is true.  Commented out for now while tracking a performance regression
             if (call_update) { // Coming from reenable.  Safe to call the handler directly
-              inactive_timeout_at = Thread::get_hrtime() + inactive_timeout;
               if (write_vio._cont && this->current_reader)
                 write_vio._cont->handleEvent(send_event, &write_vio);
             } else { // Called from do_io_write.  Might still be setting up state.  Send an event to let the dust settle
@@ -605,7 +604,6 @@ Http2Stream::update_write_request(IOBufferReader *buf_reader, int64_t write_len,
       } else {
         send_response_body();
         if (call_update) { // Coming from reenable.  Safe to call the handler directly
-          inactive_timeout_at = Thread::get_hrtime() + inactive_timeout;
           if (write_vio._cont && this->current_reader)
             write_vio._cont->handleEvent(send_event, &write_vio);
         } else { // Called from do_io_write.  Might still be setting up state.  Send an event to let the dust settle
@@ -638,6 +636,7 @@ Http2Stream::send_response_body()
     // Send DATA frames directly
     parent->connection_state.send_data_frames(this);
   }
+  inactive_timeout_at = Thread::get_hrtime() + inactive_timeout;
 }
 
 void

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