[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnurl] 61/222: ngtcp2: compile with latest ngtcp2 + nghttp3 draft-23
From: |
gnunet |
Subject: |
[gnurl] 61/222: ngtcp2: compile with latest ngtcp2 + nghttp3 draft-23 |
Date: |
Thu, 07 Nov 2019 00:09:17 +0100 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit 63a8d2b172072e69c6dc94a3859a759ba0b2d397
Author: Tatsuhiro Tsujikawa <address@hidden>
AuthorDate: Sat Sep 21 11:24:38 2019 +0900
ngtcp2: compile with latest ngtcp2 + nghttp3 draft-23
Closes #4392
---
lib/vquic/ngtcp2.c | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/lib/vquic/ngtcp2.c b/lib/vquic/ngtcp2.c
index 6b3d53ee0..5fd07f7e8 100644
--- a/lib/vquic/ngtcp2.c
+++ b/lib/vquic/ngtcp2.c
@@ -1010,10 +1010,10 @@ static int cb_h3_acked_stream_data(nghttp3_conn *conn,
int64_t stream_id,
return 0;
}
-static int cb_h3_readfunction(nghttp3_conn *conn, int64_t stream_id,
- const uint8_t **pdata,
- size_t *pdatalen, uint32_t *pflags,
- void *user_data, void *stream_user_data)
+static ssize_t cb_h3_readfunction(nghttp3_conn *conn, int64_t stream_id,
+ nghttp3_vec *vec, size_t veccnt,
+ uint32_t *pflags, void *user_data,
+ void *stream_user_data)
{
struct Curl_easy *data = stream_user_data;
size_t nread;
@@ -1021,12 +1021,13 @@ static int cb_h3_readfunction(nghttp3_conn *conn,
int64_t stream_id,
(void)conn;
(void)stream_id;
(void)user_data;
+ (void)veccnt;
if(data->set.postfields) {
- *pdata = data->set.postfields;
- *pdatalen = data->state.infilesize;
+ vec[0].base = data->set.postfields;
+ vec[0].len = data->state.infilesize;
*pflags = NGHTTP3_DATA_FLAG_EOF;
- return 0;
+ return 1;
}
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;
/* that's the chunk we return to nghttp3 */
- *pdata = &out->buf[out->windex];
- *pdatalen = nread;
+ vec[0].base = &out->buf[out->windex];
+ vec[0].len = nread;
if(out->windex == H3_SEND_SIZE)
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 &&
(stream->upload_left <= 0)) {
H3BUGF(infof(data, "!!!!!!!!! cb_h3_readfunction sets EOF\n"));
- *pdata = NULL;
- *pdatalen = 0;
*pflags = NGHTTP3_DATA_FLAG_EOF;
+ return 0;
}
else if(!nread) {
- *pdatalen = 0;
return NGHTTP3_ERR_WOULDBLOCK;
}
- return 0;
+ return 1;
}
/* 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;
}
}
- else if(ndatalen > 0) {
+ else if(ndatalen >= 0) {
rv = nghttp3_conn_add_write_offset(qs->h3conn, stream_id, ndatalen);
if(rv != 0) {
failf(conn->data,
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [gnurl] 35/222: urlapi: CURLU_NO_AUTHORITY allows empty authority/host part, (continued)
- [gnurl] 35/222: urlapi: CURLU_NO_AUTHORITY allows empty authority/host part, gnunet, 2019/11/06
- [gnurl] 38/222: ftp: part of conditional expression is always true: !result, gnunet, 2019/11/06
- [gnurl] 37/222: http: fix Expression 'http->postdata' is always false, gnunet, 2019/11/06
- [gnurl] 41/222: ftp: the conditional expression is always true, gnunet, 2019/11/06
- [gnurl] 54/222: urlapi: Expression 'storep' is always true, gnunet, 2019/11/06
- [gnurl] 47/222: multi: value '2L' is assigned to a boolean, gnunet, 2019/11/06
- [gnurl] 55/222: libssh2: part of conditional expression is always true: !result, gnunet, 2019/11/06
- [gnurl] 53/222: urlapi: 'scheme' is always true, gnunet, 2019/11/06
- [gnurl] 58/222: tool_operate: removed unused variable 'done', gnunet, 2019/11/06
- [gnurl] 59/222: travis: use go master, gnunet, 2019/11/06
- [gnurl] 61/222: ngtcp2: compile with latest ngtcp2 + nghttp3 draft-23,
gnunet <=
- [gnurl] 49/222: http_proxy: part of conditional expression is always true: !error, gnunet, 2019/11/06
- [gnurl] 60/222: THANKS-filter: deal with my typos 'Jat' => 'Jay', gnunet, 2019/11/06
- [gnurl] 64/222: FTP: FTPFILE_NOCWD: avoid redundant CWDs, gnunet, 2019/11/06
- [gnurl] 68/222: altsvc: both backends run h3-23 now, gnunet, 2019/11/06
- [gnurl] 48/222: imap: merged two case-branches performing the same action, gnunet, 2019/11/06
- [gnurl] 50/222: mime: make Curl_mime_duppart() assert if called without valid dst, gnunet, 2019/11/06
- [gnurl] 57/222: tool_operate: Expression 'config->resume_from' is always true, gnunet, 2019/11/06
- [gnurl] 67/222: http: fix warning on conversion from int to bit, gnunet, 2019/11/06
- [gnurl] 81/222: libssh: The expression is excessive or contains a misprint, gnunet, 2019/11/06
- [gnurl] 51/222: setopt: store CURLOPT_RTSP_SERVER_CSEQ correctly, gnunet, 2019/11/06