com php-src: Fix indent and add comment: ext/openssl/xp_ssl .c
| From: | Jakub Zelenka | Date: | Tue, 14 Mar 2017 18:13:57 +0000 |
| Subject: | com php-src: Fix indent and add comment: ext/openssl/xp_ssl .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-97303@lists.php.net to get a copy of this message | ||
Commit: 411f4b1b6f6f18e64b451711c19ebbc8463e5d19
Author: Jakub Zelenka <bukka@php.net> Wed, 8 Mar 2017 19:38:54 +0000
Parents: 760ff21bf3999f0ca6bf3dae300a057b2997661d
Branches: PHP-7.0
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=411f4b1b6f6f18e64b451711c19ebbc8463e5d19
Log:
Fix indent and add comment
Changed paths:
M ext/openssl/xp_ssl.c
Diff:
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index e1bb510..7db219d 100644
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -1661,7 +1661,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_get_mode(sslsock->ssl_handle) |
SSL_MODE_RELEASE_BUFFERS);
#endif
if (cparam->inputs.session) {
@@ -1801,6 +1801,8 @@ static int php_openssl_enable_crypto(php_stream *stream,
if (SUCCESS == php_set_sock_blocking(sslsock->s.socket, 0)) {
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,
(