From aa893c4a71f6dad4ba87adce55fe4b30bd10fd7c Mon Sep 17 00:00:00 2001 From: twosee Date: Wed, 1 Sep 2021 16:33:19 +0800 Subject: [PATCH] Simplify SSL_set_mode() calls (#7444) SSL_set_mode() adds the mode set via bitmask in mode to ssl. --- ext/openssl/xp_ssl.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 918b3ca5b21df..15d11e3b9b63a 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -1758,7 +1758,7 @@ int php_openssl_setup_crypto(php_stream *stream, } #ifdef SSL_MODE_RELEASE_BUFFERS - SSL_set_mode(sslsock->ssl_handle, SSL_get_mode(sslsock->ssl_handle) | SSL_MODE_RELEASE_BUFFERS); + SSL_set_mode(sslsock->ssl_handle, SSL_MODE_RELEASE_BUFFERS); #endif if (cparam->inputs.session) { @@ -1861,14 +1861,7 @@ static int php_openssl_enable_crypto(php_stream *stream, sslsock->s.is_blocked = 0; /* The following mode are added only if we are able to change socket * to non blocking mode which is also used for read and write */ - SSL_set_mode( - sslsock->ssl_handle, - ( - SSL_get_mode(sslsock->ssl_handle) | - SSL_MODE_ENABLE_PARTIAL_WRITE | - SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER - ) - ); + SSL_set_mode(sslsock->ssl_handle, SSL_MODE_ENABLE_PARTIAL_WRITE | SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER); } timeout = sslsock->is_client ? &sslsock->connect_timeout : &sslsock->s.timeout;