walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

nghttpx: Fix bug CONNECT does not work

This commit is contained in:
Tatsuhiro Tsujikawa 2013-08-22 21:28:27 +09:00
parent b8a01f5212
commit 358d12a842
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/shrpx_http2_upstream.cc
View File

@ -252,7 +252,11 @@ void on_frame_recv_callback
break; break;
} }
} }
if((frame->hd.flags & NGHTTP2_FLAG_END_STREAM) == 0 && if(!bad_req &&
!util::strieq("CONNECT",
nva[req_hdidx[1]].value,
nva[req_hdidx[1]].valuelen) &&
(frame->hd.flags & NGHTTP2_FLAG_END_STREAM) == 0 &&
req_hdidx[4] == -1) { req_hdidx[4] == -1) {
// If content-length is missing, // If content-length is missing,
// Downstream::push_upload_data_chunk will fail and // Downstream::push_upload_data_chunk will fail and

3
src/shrpx_spdy_upstream.cc
View File

@ -184,7 +184,8 @@ void on_ctrl_recv_callback
return; return;
} }
// Require content-length if FIN flag is not set. // Require content-length if FIN flag is not set.
if((frame->syn_stream.hd.flags & SPDYLAY_CTRL_FLAG_FIN) == 0 && if(!util::strieq("CONNECT", method) &&
(frame->syn_stream.hd.flags & SPDYLAY_CTRL_FLAG_FIN) == 0 &&
!content_length) { !content_length) {
upstream->rst_stream(downstream, SPDYLAY_PROTOCOL_ERROR); upstream->rst_stream(downstream, SPDYLAY_PROTOCOL_ERROR);
return; return;