ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winhttp: Use SSL_pending in netconn_query_data_available.

This commit is contained in:
Jacek Caban 2012-04-19 13:36:02 +02:00 committed by Alexandre Julliard
parent 9a82f6a812
commit 8b64a2f13c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/winhttp/net.c
View File

@ -116,6 +116,7 @@ MAKE_FUNCPTR( SSL_connect );
MAKE_FUNCPTR( SSL_shutdown ); MAKE_FUNCPTR( SSL_shutdown );
MAKE_FUNCPTR( SSL_write ); MAKE_FUNCPTR( SSL_write );
MAKE_FUNCPTR( SSL_read ); MAKE_FUNCPTR( SSL_read );
MAKE_FUNCPTR( SSL_pending );
MAKE_FUNCPTR( SSL_get_error ); MAKE_FUNCPTR( SSL_get_error );
MAKE_FUNCPTR( SSL_get_ex_new_index ); MAKE_FUNCPTR( SSL_get_ex_new_index );
MAKE_FUNCPTR( SSL_get_ex_data ); 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_shutdown );
LOAD_FUNCPTR( SSL_write ); LOAD_FUNCPTR( SSL_write );
LOAD_FUNCPTR( SSL_read ); LOAD_FUNCPTR( SSL_read );
LOAD_FUNCPTR( SSL_pending );
LOAD_FUNCPTR( SSL_get_error ); LOAD_FUNCPTR( SSL_get_error );
LOAD_FUNCPTR( SSL_get_ex_new_index ); LOAD_FUNCPTR( SSL_get_ex_new_index );
LOAD_FUNCPTR( SSL_get_ex_data ); LOAD_FUNCPTR( SSL_get_ex_data );
@ -834,7 +836,7 @@ BOOL netconn_query_data_available( netconn_t *conn, DWORD *available )
if (conn->secure) if (conn->secure)
{ {
#ifdef SONAME_LIBSSL #ifdef SONAME_LIBSSL
if (conn->peek_msg) *available = conn->peek_len; *available = pSSL_pending( conn->ssl_conn ) + conn->peek_len;
#endif #endif
return TRUE; return TRUE;
} }