Merge from main trunk, all conflicts resolved.

2000-10-10 08:40:05 +00:00
parent 73701c27b3
commit 5209202f3b
77 changed files with 551 additions and 318 deletions
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -1178,7 +1178,7 @@ int SSL_get_ex_data_X509_STORE_CTX_idx(void );
 #define SSL_CTX_get_read_ahead(ctx) \
 	SSL_CTX_ctrl(ctx,SSL_CTRL_GET_READ_AHEAD,0,NULL)
 #define SSL_CTX_set_read_ahead(ctx,m) \
-	SSL_CTX_ctrl(ctx,SSL_CTRL_SET_READ_AHEAD,0,NULL)
+	SSL_CTX_ctrl(ctx,SSL_CTRL_SET_READ_AHEAD,m,NULL)

     /* NB: the keylength is only applicable when is_export is true */
 #ifndef NO_RSA