luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

http2: handle closed streams when uploading

Browse Source 
Fixes #986
This commit is contained in:
Tatsuhiro Tsujikawa 2016-08-28 16:44:03 +02:00 committed by Daniel Stenberg
parent 3533def3d5
commit c3e906e9cd
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/http.h
View File

@ -168,6 +168,7 @@ struct HTTP {
const uint8_t *pausedata; /* pointer to data received in on_data_chunk */ const uint8_t *pausedata; /* pointer to data received in on_data_chunk */
size_t pauselen; /* the number of bytes left in data */ size_t pauselen; /* the number of bytes left in data */
bool closed; /* TRUE on HTTP2 stream close */ bool closed; /* TRUE on HTTP2 stream close */
bool close_handled; /* TRUE if stream closure is handled by libcurl */
uint32_t error_code; /* HTTP/2 error code */ uint32_t error_code; /* HTTP/2 error code */
char *mem; /* points to a buffer in memory to store received data */ char *mem; /* points to a buffer in memory to store received data */

11
lib/http2.c
View File

@ -151,6 +151,7 @@ void Curl_http2_setup_req(struct Curl_easy *data)
http->pauselen = 0; http->pauselen = 0;
http->error_code = NGHTTP2_NO_ERROR; http->error_code = NGHTTP2_NO_ERROR;
http->closed = FALSE; http->closed = FALSE;
http->close_handled = FALSE;
http->mem = data->state.buffer; http->mem = data->state.buffer;
http->len = BUFSIZE; http->len = BUFSIZE;
http->memlen = 0; http->memlen = 0;
@ -1256,6 +1257,8 @@ static ssize_t http2_handle_stream_close(struct connectdata *conn,
} }
} }
stream->close_handled = TRUE;
DEBUGF(infof(data, "http2_recv returns 0, http2_handle_stream_close\n")); DEBUGF(infof(data, "http2_recv returns 0, http2_handle_stream_close\n"));
return 0; return 0;
} }
@ -1562,6 +1565,14 @@ static ssize_t http2_send(struct connectdata *conn, int sockindex,
DEBUGF(infof(conn->data, "http2_send len=%zu\n", len)); DEBUGF(infof(conn->data, "http2_send len=%zu\n", len));
if(stream->stream_id != -1) { if(stream->stream_id != -1) {
if(stream->close_handled) {
infof(conn->data, "stream %d closed\n", stream->stream_id);
*err = CURLE_HTTP2;
return -1;
}
else if(stream->closed) {
return http2_handle_stream_close(conn, conn->data, stream, err);
}
/* If stream_id != -1, we have dispatched request HEADERS, and now /* If stream_id != -1, we have dispatched request HEADERS, and now
are going to send or sending request body in DATA frame */ are going to send or sending request body in DATA frame */
stream->upload_mem = mem; stream->upload_mem = mem;