moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

transfer.c: Fixed non-HTTP2 builds from commit cde0cf7c5e

Browse Source
This commit is contained in:
Steve Holme 2014-02-28 22:59:10 +00:00
parent cde0cf7c5e
commit 1f07718123
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/transfer.c
View File

@ -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 /* 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 */ its internal buffers so we MUST always try until we get EAGAIN back */
return conn->handler->protocol&(CURLPROTO_SCP|CURLPROTO_SFTP) || return conn->handler->protocol&(CURLPROTO_SCP|CURLPROTO_SFTP) ||
#if defined(USE_NGHTTP2)
Curl_ssl_data_pending(conn, FIRSTSOCKET) || Curl_ssl_data_pending(conn, FIRSTSOCKET) ||
/* For HTTP/2, we may read up everything including responde body /* For HTTP/2, we may read up everything including responde body
with header fields in Curl_http_readwrite_headers. If no 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. */ a workaround, we return nonzero here to call http2_recv. */
((conn->handler->protocol&CURLPROTO_HTTP) && conn->httpversion == 20 && ((conn->handler->protocol&CURLPROTO_HTTP) && conn->httpversion == 20 &&
conn->proto.httpc.closed); conn->proto.httpc.closed);
#else
Curl_ssl_data_pending(conn, FIRSTSOCKET);
#endif
} }
static void read_rewind(struct connectdata *conn, static void read_rewind(struct connectdata *conn,