moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

http2: Return error if stream was closed with other than NO_ERROR 

Previously, we just ignored error code passed to
on_stream_close_callback and just return 0 (success) after stream
closure even if stream was reset with error.  This patch records error
code in on_stream_close_callback, and return -1 and use CURLE_HTTP2
error code on abnormal stream closure.
This commit is contained in:
Tatsuhiro Tsujikawa 2015-02-26 23:28:30 +09:00 committed by Steve Holme
parent c715fa0b60
commit 48b5374e65
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/http.h
View File

@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
* Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@ -169,6 +169,7 @@ struct http_conn {
sending send_underlying; /* underlying send Curl_send callback */
recving recv_underlying; /* underlying recv Curl_recv callback */
bool closed; /* TRUE on HTTP2 stream close */
uint32_t error_code; /* HTTP/2 error code */
Curl_send_buffer *header_recvbuf; /* store response headers. We
store non-final and final
response headers into it. */

9
lib/http2.c
View File

@ -365,6 +365,7 @@ static int on_stream_close(nghttp2_session *session, int32_t stream_id,
return 0;
}
c->error_code = error_code;
c->closed = TRUE;
return 0;
@ -783,6 +784,13 @@ static ssize_t http2_recv(struct connectdata *conn, int sockindex,
/* Reset to FALSE to prevent infinite loop in readwrite_data
function. */
httpc->closed = FALSE;
if(httpc->error_code != NGHTTP2_NO_ERROR) {
failf(conn->data,
"HTTP/2 stream = %x was not closed cleanly: error_code = %d",
httpc->stream_id, httpc->error_code);
*err = CURLE_HTTP2;
return -1;
}
return 0;
}
*err = CURLE_AGAIN;
@ -980,6 +988,7 @@ CURLcode Curl_http2_setup(struct connectdata *conn)
infof(conn->data, "Using HTTP2\n");
httpc->bodystarted = FALSE;
httpc->error_code = NGHTTP2_NO_ERROR;
httpc->closed = FALSE;
httpc->header_recvbuf = Curl_add_buffer_init();
httpc->nread_header_recvbuf = 0;