generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

http2: Deal with HTTP/2 data inside response header buffer

Browse Source 
Previously if HTTP/2 traffic is appended to HTTP Upgrade response header
(thus they are in the same buffer), the trailing HTTP/2 traffic is not
processed and lost.  The appended data is most likely SETTINGS frame.
If it is lost, nghttp2 library complains server does not obey the HTTP/2
protocol and issues GOAWAY frame and curl eventually drops connection.
This commit fixes this problem and now trailing data is processed.
This commit is contained in:
Tatsuhiro Tsujikawa
2014-11-13 02:07:24 +09:00
committed by Daniel Stenberg
parent 676d62fa0e
commit 7b7f0da4a7
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/http.c
View File

@@ -1746,7 +1746,7 @@ CURLcode Curl_http(struct connectdata *conn, bool *done)
if(result)
return result;
result = Curl_http2_switched(conn);
result = Curl_http2_switched(conn, NULL, 0);
if(result)
return result;
break;
@@ -2993,10 +2993,12 @@ CURLcode Curl_http_readwrite_headers(struct SessionHandle *data,
infof(data, "Received 101\n");
k->upgr101 = UPGR101_RECEIVED;
/* switch to http2 now */
result = Curl_http2_switched(conn);
/* switch to http2 now. The bytes after response headers
are also processed here, otherwise they are lost. */
result = Curl_http2_switched(conn, k->str, *nread);
if(result)
return result;
*nread = 0;
}
break;
default: