com php-src: Disable TLS compression by default in both clients and servers: ext/openssl/xp_ssl.c
| From: | rdlowrey@php.net | Date: | Fri, 21 Feb 2014 00:10:06 +0000 |
| Subject: | com php-src: Disable TLS compression by default in both clients and servers: ext/openssl/xp_ssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76146@lists.php.net to get a copy of this message | ||
Commit: b98b093d73e935f4ab4d30423b652ed38a4c6d68
Author: Daniel Lowrey <rdlowrey@php.net> Tue, 11 Feb 2014 06:27:32 -0700
Parents: b9ba011c0f2b147bd5b0faba04a6ef7aabaa48c4
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b98b093d73e935f4ab4d30423b652ed38a4c6d68
Log:
Disable TLS compression by default in both clients and servers
Changed paths:
M ext/openssl/xp_ssl.c
Diff:
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index 4dda5a4..99995b6 100644
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -418,9 +418,9 @@ static inline int php_openssl_setup_crypto(php_stream *stream,
{
zval **val;
- if (stream->context && SUCCESS == php_stream_context_get_option(
- stream->context, "ssl", "disable_compression", &val) &&
- zend_is_true(*val)
+ if (stream->context && (FAILURE == php_stream_context_get_option(
+ stream->context, "ssl", "disable_compression", &val) ||
+ zend_is_true(*val))
) {
SSL_CTX_set_options(sslsock->ctx, SSL_OP_NO_COMPRESSION);
}