mirror/ULib
1
0
Fork 0
mirror of https://github.com/stefanocasazza/ULib.git synced 2025-09-28 19:05:55 +08:00
Code Issues Releases Wiki Activity

http2 fix

Browse Source
This commit is contained in:
stefanocasazza 2017-04-21 16:47:48 +02:00
parent a4180117a6
commit 43bab3c84a
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/ulib/utility/http2.h
View File

@ -106,9 +106,9 @@ public:
UHashMap<UString> itable; // headers request
HpackDynamicTable idyntbl, odyntbl; // hpack dynamic table (request, response)
// streams
uint32_t max_processed_stream_id;
Stream streams[HTTP2_MAX_CONCURRENT_STREAMS];
const char* bug_client;
uint32_t max_processed_stream_id;
#ifdef DEBUG
UHashMap<UString> dtable;
HpackDynamicTable ddyntbl;

18
src/ulib/utility/http2.cpp
View File

@ -2044,15 +2044,17 @@ manage_headers:
if (frame.stream_id > pConnection->max_processed_stream_id)
{
if (++pStream >= (pConnection->streams+HTTP2_MAX_CONCURRENT_STREAMS))
// Ex: frame.stream_id = 5 pConnection->max_processed_stream_id = 3 pStream->id = 1 pStream->state = (2, STREAM_STATE_HALF_CLOSED)
if ((pStream = ++pStreamEnd) >= (pConnection->streams+HTTP2_MAX_CONCURRENT_STREAMS))
{
pStream = --pStreamEnd;
nerror = REFUSED_STREAM;
return;
}
++pStreamEnd;
goto manage_headers;
}
@ -2290,9 +2292,12 @@ window_update:
descr = getFrameErrorCodeDescription(error);
U_DEBUG("Received GOAWAY frame with error (%u, %s)", error, descr)
if (error)
{
U_DEBUG("Received GOAWAY frame with error (%u, %s)", error, descr)
U_SRV_LOG("received GOAWAY frame with error (%u, %s)", error, descr);
U_SRV_LOG("received GOAWAY frame with error (%u, %s)", error, descr);
}
U_INTERNAL_DUMP("GOAWAY: Last-Stream-ID = %u", u_http2_parse_sid(frame.payload))
@ -3383,9 +3388,6 @@ read_request:
if (sz == 0)
{
U_INTERNAL_ASSERT_EQUALS(pStream, pConnection->streams)
U_INTERNAL_ASSERT_EQUALS(pStreamEnd, pConnection->streams)
if (U_http2_settings_len)
{
// NB: not OPTION upgrade...