Jacek Caban : winhttp: Use SSL_pending in netconn_query_data_available.
Alexandre Julliard
julliard at winehq.org
Thu Apr 19 13:27:52 CDT 2012
Module: wine
Branch: master
Commit: 8b64a2f13cc5cb0d0289039a41de84d5bf21128e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b64a2f13cc5cb0d0289039a41de84d5bf21128e
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Apr 19 13:36:02 2012 +0200
winhttp: Use SSL_pending in netconn_query_data_available.
---
dlls/winhttp/net.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c
index 7e8c211..5ec4e1a 100644
--- a/dlls/winhttp/net.c
+++ b/dlls/winhttp/net.c
@@ -116,6 +116,7 @@ MAKE_FUNCPTR( SSL_connect );
MAKE_FUNCPTR( SSL_shutdown );
MAKE_FUNCPTR( SSL_write );
MAKE_FUNCPTR( SSL_read );
+MAKE_FUNCPTR( SSL_pending );
MAKE_FUNCPTR( SSL_get_error );
MAKE_FUNCPTR( SSL_get_ex_new_index );
MAKE_FUNCPTR( SSL_get_ex_data );
@@ -459,6 +460,7 @@ BOOL netconn_init( netconn_t *conn, BOOL secure )
LOAD_FUNCPTR( SSL_shutdown );
LOAD_FUNCPTR( SSL_write );
LOAD_FUNCPTR( SSL_read );
+ LOAD_FUNCPTR( SSL_pending );
LOAD_FUNCPTR( SSL_get_error );
LOAD_FUNCPTR( SSL_get_ex_new_index );
LOAD_FUNCPTR( SSL_get_ex_data );
@@ -834,7 +836,7 @@ BOOL netconn_query_data_available( netconn_t *conn, DWORD *available )
if (conn->secure)
{
#ifdef SONAME_LIBSSL
- if (conn->peek_msg) *available = conn->peek_len;
+ *available = pSSL_pending( conn->ssl_conn ) + conn->peek_len;
#endif
return TRUE;
}
More information about the wine-cvs
mailing list