diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2014-02-28 22:59:10 +0000 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2014-02-28 23:21:36 +0000 |
| commit | 1f077181234525832e0fcae38f7ff4f344f4b010 (patch) | |
| tree | d31cd66c299422d47e1e4c95549a71c61e4ba46c /lib/transfer.c | |
| parent | cde0cf7c5ede69c68cb00cba3d1a6ccc27c24bc9 (diff) | |
transfer.c: Fixed non-HTTP2 builds from commit cde0cf7c5e
Diffstat (limited to 'lib/transfer.c')
| -rw-r--r-- | lib/transfer.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/transfer.c b/lib/transfer.c index 8748c6a01..ccaee8373 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -310,6 +310,7 @@ static int data_pending(const struct connectdata *conn) /* 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) || +#if defined(USE_NGHTTP2) Curl_ssl_data_pending(conn, FIRSTSOCKET) || /* For HTTP/2, we may read up everything including responde body with header fields in Curl_http_readwrite_headers. If no @@ -320,6 +321,9 @@ static int data_pending(const struct connectdata *conn) a workaround, we return nonzero here to call http2_recv. */ ((conn->handler->protocol&CURLPROTO_HTTP) && conn->httpversion == 20 && conn->proto.httpc.closed); +#else + Curl_ssl_data_pending(conn, FIRSTSOCKET); +#endif } static void read_rewind(struct connectdata *conn, |