From f8b872096eb8403d8e9ccb11f232377d9ae2218a Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Thu, 3 Jul 2014 22:59:49 +0900 Subject: [PATCH] nghttpx: Use NGHTTP2_NO_ERROR to close upgraded (tunneled) stream --- src/shrpx_http2_upstream.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/shrpx_http2_upstream.cc b/src/shrpx_http2_upstream.cc index 399e2037..7b7789d8 100644 --- a/src/shrpx_http2_upstream.cc +++ b/src/shrpx_http2_upstream.cc @@ -906,7 +906,7 @@ void downstream_eventcb(bufferevent *bev, short events, void *ptr) // stream, we don't have to do anything since response was // complete. if(downstream->get_upgraded()) { - upstream->rst_stream(downstream, NGHTTP2_INTERNAL_ERROR); + upstream->rst_stream(downstream, NGHTTP2_NO_ERROR); } } else { if(downstream->get_response_state() == Downstream::HEADER_COMPLETE) { @@ -1022,8 +1022,7 @@ ssize_t downstream_data_read_callback(nghttp2_session *session, ULOG(INFO, upstream) << "RST_STREAM to tunneled stream stream_id=" << stream_id; } - upstream->rst_stream(downstream, infer_upstream_rst_stream_error_code - (downstream->get_response_rst_stream_error_code())); + upstream->rst_stream(downstream, NGHTTP2_NO_ERROR); } }