diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-03 12:37:17 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-03 12:37:17 +0200 |
| commit | 97b84a36945f1ec648a9d76645d9de40fc4640b6 (patch) | |
| tree | d3e05b45a88abc2c142070c8c91c971d7f9bbe21 /ext/openssl | |
| parent | f6f0d383b3cd2509bef6beecc3dfa3dbf935cc5f (diff) | |
| parent | a023eb39672784da5932aa6eed46b304fc6e333f (diff) | |
| download | php-git-97b84a36945f1ec648a9d76645d9de40fc4640b6.tar.gz | |
Merge branch 'PHP-7.4'
Diffstat (limited to 'ext/openssl')
| -rw-r--r-- | ext/openssl/xp_ssl.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 6b96b2cb0f..3910bf815b 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -2383,7 +2383,8 @@ static inline int php_openssl_tcp_sockop_accept(php_stream *stream, php_openssl_ xparam->outputs.client = NULL; - if ((tmpzval = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "socket", "tcp_nodelay")) != NULL && + if (PHP_STREAM_CONTEXT(stream) && + (tmpzval = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "socket", "tcp_nodelay")) != NULL && zend_is_true(tmpzval)) { nodelay = 1; } |