moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-24 17:18:48 -05:00
Code Issues Releases Wiki Activity

ngtcp2: compile with latest ngtcp2 + nghttp3 draft-23

Browse Source 
Closes #4392
This commit is contained in:
Tatsuhiro Tsujikawa 2019-09-21 11:24:38 +09:00 committed by Daniel Stenberg
parent 698149e42c
commit 63a8d2b172
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/vquic/ngtcp2.c
View File

@ -1010,10 +1010,10 @@ static int cb_h3_acked_stream_data(nghttp3_conn *conn, int64_t stream_id,
return 0; return 0;
} }
static int cb_h3_readfunction(nghttp3_conn *conn, int64_t stream_id, static ssize_t cb_h3_readfunction(nghttp3_conn *conn, int64_t stream_id,
const uint8_t **pdata, nghttp3_vec *vec, size_t veccnt,
size_t *pdatalen, uint32_t *pflags, uint32_t *pflags, void *user_data,
void *user_data, void *stream_user_data) void *stream_user_data)
{ {
struct Curl_easy *data = stream_user_data; struct Curl_easy *data = stream_user_data;
size_t nread; size_t nread;
@ -1021,12 +1021,13 @@ static int cb_h3_readfunction(nghttp3_conn *conn, int64_t stream_id,
(void)conn; (void)conn;
(void)stream_id; (void)stream_id;
(void)user_data; (void)user_data;
(void)veccnt;
if(data->set.postfields) { if(data->set.postfields) {
*pdata = data->set.postfields; vec[0].base = data->set.postfields;
*pdatalen = data->state.infilesize; vec[0].len = data->state.infilesize;
*pflags = NGHTTP3_DATA_FLAG_EOF; *pflags = NGHTTP3_DATA_FLAG_EOF;
return 0; return 1;
} }
nread = CURLMIN(stream->upload_len, H3_SEND_SIZE - stream->h3out->used); nread = CURLMIN(stream->upload_len, H3_SEND_SIZE - stream->h3out->used);
@ -1044,8 +1045,8 @@ static int cb_h3_readfunction(nghttp3_conn *conn, int64_t stream_id,
out->used += nread; out->used += nread;
/* that's the chunk we return to nghttp3 */ /* that's the chunk we return to nghttp3 */
*pdata = &out->buf[out->windex]; vec[0].base = &out->buf[out->windex];
*pdatalen = nread; vec[0].len = nread;
if(out->windex == H3_SEND_SIZE) if(out->windex == H3_SEND_SIZE)
out->windex = 0; /* wrap */ out->windex = 0; /* wrap */
@ -1063,15 +1064,13 @@ static int cb_h3_readfunction(nghttp3_conn *conn, int64_t stream_id,
if(stream->upload_done && !stream->upload_len && if(stream->upload_done && !stream->upload_len &&
(stream->upload_left <= 0)) { (stream->upload_left <= 0)) {
H3BUGF(infof(data, "!!!!!!!!! cb_h3_readfunction sets EOF\n")); H3BUGF(infof(data, "!!!!!!!!! cb_h3_readfunction sets EOF\n"));
*pdata = NULL;
*pdatalen = 0;
*pflags = NGHTTP3_DATA_FLAG_EOF; *pflags = NGHTTP3_DATA_FLAG_EOF;
return 0;
} }
else if(!nread) { else if(!nread) {
*pdatalen = 0;
return NGHTTP3_ERR_WOULDBLOCK; return NGHTTP3_ERR_WOULDBLOCK;
} }
return 0; return 1;
} }
/* Index where :authority header field will appear in request header /* Index where :authority header field will appear in request header
@ -1524,7 +1523,7 @@ static CURLcode ng_flush_egress(struct connectdata *conn, int sockfd,
return CURLE_SEND_ERROR; return CURLE_SEND_ERROR;
} }
} }
else if(ndatalen > 0) { else if(ndatalen >= 0) {
rv = nghttp3_conn_add_write_offset(qs->h3conn, stream_id, ndatalen); rv = nghttp3_conn_add_write_offset(qs->h3conn, stream_id, ndatalen);
if(rv != 0) { if(rv != 0) {
failf(conn->data, failf(conn->data,