Skip to content

Commit aa893c4

Browse files
authored
Simplify SSL_set_mode() calls (#7444)
SSL_set_mode() adds the mode set via bitmask in mode to ssl.
1 parent a13730c commit aa893c4

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

ext/openssl/xp_ssl.c

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1758,7 +1758,7 @@ int php_openssl_setup_crypto(php_stream *stream,
17581758
}
17591759

17601760
#ifdef SSL_MODE_RELEASE_BUFFERS
1761-
SSL_set_mode(sslsock->ssl_handle, SSL_get_mode(sslsock->ssl_handle) | SSL_MODE_RELEASE_BUFFERS);
1761+
SSL_set_mode(sslsock->ssl_handle, SSL_MODE_RELEASE_BUFFERS);
17621762
#endif
17631763

17641764
if (cparam->inputs.session) {
@@ -1861,14 +1861,7 @@ static int php_openssl_enable_crypto(php_stream *stream,
18611861
sslsock->s.is_blocked = 0;
18621862
/* The following mode are added only if we are able to change socket
18631863
* to non blocking mode which is also used for read and write */
1864-
SSL_set_mode(
1865-
sslsock->ssl_handle,
1866-
(
1867-
SSL_get_mode(sslsock->ssl_handle) |
1868-
SSL_MODE_ENABLE_PARTIAL_WRITE |
1869-
SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER
1870-
)
1871-
);
1864+
SSL_set_mode(sslsock->ssl_handle, SSL_MODE_ENABLE_PARTIAL_WRITE | SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);
18721865
}
18731866

18741867
timeout = sslsock->is_client ? &sslsock->connect_timeout : &sslsock->s.timeout;

0 commit comments

Comments
 (0)