moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-25 01:28:51 -05:00
Code Issues Releases Wiki Activity

quiche: set 'drain' when returning without having drained the queues

Browse Source
This commit is contained in:
Daniel Stenberg 2019-09-26 15:45:58 +02:00
parent ea7744a07e
commit 2377465901
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/vquic/quiche.c
View File

@ -404,13 +404,14 @@ static ssize_t h3_stream_recv(struct connectdata *conn,
quiche_h3_event *ev; quiche_h3_event *ev;
int rc; int rc;
struct h3h1header headers; struct h3h1header headers;
struct HTTP *stream = conn->data->req.protop; struct Curl_easy *data = conn->data;
struct HTTP *stream = data->req.protop;
headers.dest = buf; headers.dest = buf;
headers.destlen = buffersize; headers.destlen = buffersize;
headers.nlen = 0; headers.nlen = 0;
if(process_ingress(conn, sockfd, qs)) { if(process_ingress(conn, sockfd, qs)) {
infof(conn->data, "h3_stream_recv returns on ingress\n"); infof(data, "h3_stream_recv returns on ingress\n");
*curlcode = CURLE_RECV_ERROR; *curlcode = CURLE_RECV_ERROR;
return -1; return -1;
} }
@ -423,7 +424,7 @@ static ssize_t h3_stream_recv(struct connectdata *conn,
if(s != stream->stream3_id) { if(s != stream->stream3_id) {
/* another transfer, ignore for now */ /* another transfer, ignore for now */
infof(conn->data, "Got h3 for stream %u, expects %u\n", infof(data, "Got h3 for stream %u, expects %u\n",
s, stream->stream3_id); s, stream->stream3_id);
continue; continue;
} }
@ -477,7 +478,9 @@ static ssize_t h3_stream_recv(struct connectdata *conn,
*curlcode = (-1 == recvd)? CURLE_AGAIN : CURLE_OK; *curlcode = (-1 == recvd)? CURLE_AGAIN : CURLE_OK;
if(recvd >= 0) if(recvd >= 0)
/* Get this called again to drain the event queue */ /* Get this called again to drain the event queue */
Curl_expire(conn->data, 0, EXPIRE_QUIC); Curl_expire(data, 0, EXPIRE_QUIC);
data->state.drain = (recvd >= 0) ? 1 : 0;
return recvd; return recvd;
} }