aboutsummaryrefslogtreecommitdiff
path: root/lib/transfer.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2007-01-24 17:19:08 +0000
committerDaniel Stenberg <daniel@haxx.se>2007-01-24 17:19:08 +0000
commit3239f059b82d2b20a76f7470d8c4a334755f25c4 (patch)
tree34b450b212571aafbae42050c6a3fab87066492f /lib/transfer.c
parent45bac25d90e89110f211dc41461bcdce81e74427 (diff)
moved the SSL pending function to the proper place and name
Diffstat (limited to 'lib/transfer.c')
-rw-r--r--lib/transfer.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/lib/transfer.c b/lib/transfer.c
index 45117c709..d89dec673 100644
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -273,20 +273,10 @@ CURLcode Curl_readrewind(struct connectdata *conn)
return CURLE_OK;
}
-#ifdef USE_SSLEAY
-/* FIX: this is nasty OpenSSL-specific code that really shouldn't be here */
static int data_pending(struct connectdata *conn)
{
- if(conn->ssl[FIRSTSOCKET].handle)
- /* SSL is in use */
- return SSL_pending(conn->ssl[FIRSTSOCKET].handle);
-
- return 0; /* nothing */
+ return Curl_ssl_data_pending(conn, FIRSTSOCKET);
}
-#else
-/* non-SSL never have pending data */
-#define data_pending(x) 0
-#endif
#ifndef MIN
#define MIN(a,b) (a < b ? a : b)