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

winhttp: Enable more OpenSSL-independent code when OpenSSL is not available.

This commit is contained in:
Jacek Caban 2013-01-23 15:48:16 +01:00 committed by Alexandre Julliard
parent 0ebbd991c1
commit 25de5d7a55
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/winhttp/net.c
View File

@ -414,6 +414,8 @@ BOOL netconn_init( netconn_t *conn, BOOL secure )
{ {
#if defined(SONAME_LIBSSL) && defined(SONAME_LIBCRYPTO) #if defined(SONAME_LIBSSL) && defined(SONAME_LIBCRYPTO)
int i; int i;
#else
memset(conn, 0, sizeof(*conn));
#endif #endif
conn->socket = -1; conn->socket = -1;
@ -549,10 +551,6 @@ BOOL netconn_init( netconn_t *conn, BOOL secure )
pCRYPTO_set_locking_callback(ssl_lock_callback); pCRYPTO_set_locking_callback(ssl_lock_callback);
LeaveCriticalSection( &init_ssl_cs ); LeaveCriticalSection( &init_ssl_cs );
#else
WARN("SSL support not compiled in.\n");
set_last_error( ERROR_WINHTTP_SECURE_CHANNEL_ERROR );
return FALSE;
#endif #endif
return TRUE; return TRUE;
} }
@ -835,8 +833,9 @@ BOOL netconn_query_data_available( netconn_t *conn, DWORD *available )
if (conn->secure) if (conn->secure)
{ {
*available = conn->peek_len;
#ifdef SONAME_LIBSSL #ifdef SONAME_LIBSSL
*available = pSSL_pending( conn->ssl_conn ) + conn->peek_len; *available += pSSL_pending( conn->ssl_conn );
#endif #endif
return TRUE; return TRUE;
} }
@ -856,7 +855,6 @@ BOOL netconn_get_next_line( netconn_t *conn, char *buffer, DWORD *buflen )
if (conn->secure) if (conn->secure)
{ {
#ifdef SONAME_LIBSSL
while (recvd < *buflen) while (recvd < *buflen)
{ {
int dummy; int dummy;
@ -879,9 +877,6 @@ BOOL netconn_get_next_line( netconn_t *conn, char *buffer, DWORD *buflen )
TRACE("received line %s\n", debugstr_a(buffer)); TRACE("received line %s\n", debugstr_a(buffer));
} }
return ret; return ret;
#else
return FALSE;
#endif
} }
pfd.fd = conn->socket; pfd.fd = conn->socket;