[trafficserver] branch master updated: Call mark_body_done() when response body is empty

[zw...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 82a9b4f  Call mark_body_done() when response body is empty
82a9b4f is described below

commit 82a9b4fc73a574ccf81d5b7099cb63ab245181af
Author: Masaori Koshiba <ma...@apache.org>
AuthorDate: Wed Feb 21 11:30:08 2018 +0900

    Call mark_body_done() when response body is empty
    
    a98021cb21ea2e180ba2664a80d9c154893b97af broke logic of calling mark_body_done()
    when response body is empty like 304 Not Modified.
---
 proxy/http2/Http2Stream.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/proxy/http2/Http2Stream.cc b/proxy/http2/Http2Stream.cc
index c847322..120b2b1 100644
--- a/proxy/http2/Http2Stream.cc
+++ b/proxy/http2/Http2Stream.cc
@@ -608,8 +608,9 @@ Http2Stream::update_write_request(IOBufferReader *buf_reader, int64_t write_len,
 
       // If there is additional data, send it along in a data frame.  Or if this was header only
       // make sure to send the end of stream
+      is_done |= (write_vio.ntodo() + this->response_header.length_get()) == bytes_avail;
       if (this->response_is_data_available() || is_done) {
-        if ((write_vio.ntodo() + this->response_header.length_get()) == bytes_avail || is_done) {
+        if (is_done) {
           this->mark_body_done();
         }
 

-- 
To stop receiving notification emails like this one, please contact
zwoop@apache.org.