diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2020-07-27 15:43:45 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2020-07-28 23:48:49 +0200 |
| commit | 5ae339971a9590bfc227d104122faf119ef18f2a (patch) | |
| tree | 156b021630e12db3a84b07fff3a665f45495a3ac | |
| parent | abe59221fc6c683563a83bb8fbc1d7a52c315c0f (diff) | |
| download | curl-5ae339971a9590bfc227d104122faf119ef18f2a.tar.gz | |
transfer: fix data_pending for builds with both h2 and h3 enabled
Closes #5734
| -rw-r--r-- | lib/transfer.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/transfer.c b/lib/transfer.c index 4b923744e..161dcfa01 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -487,6 +487,12 @@ CURLcode Curl_readrewind(struct connectdata *conn) static int data_pending(const struct Curl_easy *data) { struct connectdata *conn = data->conn; + +#ifdef ENABLE_QUIC + if(conn->transport == TRNSPRT_QUIC) + return Curl_quic_data_pending(data); +#endif + /* in the case of libssh2, we can never be really sure that we have emptied its internal buffers so we MUST always try until we get EAGAIN back */ return conn->handler->protocol&(CURLPROTO_SCP|CURLPROTO_SFTP) || @@ -500,8 +506,6 @@ static int data_pending(const struct Curl_easy *data) be called and we cannot signal the HTTP/2 stream has closed. As a workaround, we return nonzero here to call http2_recv. */ ((conn->handler->protocol&PROTO_FAMILY_HTTP) && conn->httpversion >= 20); -#elif defined(ENABLE_QUIC) - Curl_ssl_data_pending(conn, FIRSTSOCKET) || Curl_quic_data_pending(data); #else Curl_ssl_data_pending(conn, FIRSTSOCKET); #endif |