winhttp(4/6): Remove calls to SSL_CTX_set_timeout, as they affect the session's lifetime, not the read timeout

Juan Lang juan.lang at gmail.com
Tue Jul 21 16:55:45 CDT 2009


--Juan
-------------- next part --------------
From fbfd5f869338584234f83e6de4662fc47dc33d9b Mon Sep 17 00:00:00 2001
From: Juan Lang <juan.lang at gmail.com>
Date: Tue, 21 Jul 2009 13:53:54 -0700
Subject: [PATCH 08/10] Remove calls to SSL_CTX_set_timeout, as they affect the session's lifetime, not the read timeout

---
 dlls/winhttp/net.c |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)

diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c
index 94bfd89..50842a8 100644
--- a/dlls/winhttp/net.c
+++ b/dlls/winhttp/net.c
@@ -100,8 +100,6 @@ MAKE_FUNCPTR( SSL_write );
 MAKE_FUNCPTR( SSL_read );
 MAKE_FUNCPTR( SSL_get_verify_result );
 MAKE_FUNCPTR( SSL_get_peer_certificate );
-MAKE_FUNCPTR( SSL_CTX_get_timeout );
-MAKE_FUNCPTR( SSL_CTX_set_timeout );
 MAKE_FUNCPTR( SSL_CTX_set_default_verify_paths );
 
 MAKE_FUNCPTR( BIO_new_fp );
@@ -218,8 +216,6 @@ BOOL netconn_init( netconn_t *conn, BOOL secure )
     LOAD_FUNCPTR( SSL_read );
     LOAD_FUNCPTR( SSL_get_verify_result );
     LOAD_FUNCPTR( SSL_get_peer_certificate );
-    LOAD_FUNCPTR( SSL_CTX_get_timeout );
-    LOAD_FUNCPTR( SSL_CTX_set_timeout );
     LOAD_FUNCPTR( SSL_CTX_set_default_verify_paths );
 #undef LOAD_FUNCPTR
 
@@ -482,11 +478,6 @@ BOOL netconn_get_next_line( netconn_t *conn, char *buffer, DWORD *buflen )
     if (conn->secure)
     {
 #ifdef SONAME_LIBSSL
-        long timeout;
-
-        timeout = pSSL_CTX_get_timeout( ctx );
-        pSSL_CTX_set_timeout( ctx, DEFAULT_RECEIVE_TIMEOUT );
-
         while (recvd < *buflen)
         {
             int dummy;
@@ -502,7 +493,6 @@ BOOL netconn_get_next_line( netconn_t *conn, char *buffer, DWORD *buflen )
             }
             if (buffer[recvd] != '\r') recvd++;
         }
-        pSSL_CTX_set_timeout( ctx, timeout );
         if (ret)
         {
             buffer[recvd++] = 0;
-- 
1.6.3.2


More information about the wine-patches mailing list