[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690

[Alexandre Julliard]

The following commit has been merged in the wheezy branch:
commit a1a9712b70548f9afdf4d75c37d74f0b8b7822f0
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.
    (cherry picked from commit 8b64a2f13cc5cb0d0289039a41de84d5bf21128e)

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;
     }

-- 
Debian Wine packaging