diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-03 12:36:33 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-03 12:36:50 +0200 |
| commit | af3c85407432b357ddeda6eac847424d36d0ad83 (patch) | |
| tree | 063760ea030a90396487c93b0f85c5f74d414ff0 | |
| parent | 4892bbc167dfa0ea188baebbce538225f4a0455a (diff) | |
| parent | 0e48e35e0485bc6d6458a45ecab5b19a0c2ec001 (diff) | |
| download | php-git-af3c85407432b357ddeda6eac847424d36d0ad83.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/openssl/xp_ssl.c | 3 |
2 files changed, 6 insertions, 1 deletions
@@ -9,6 +9,10 @@ PHP NEWS . Fixed #69044 (discrepency between time and microtime). (krakjoe) . Updated timelib to 2018.02. (Derick) +- Openssl: + . Fixed bug #78231 (Segmentation fault upon stream_socket_accept of exported + socket-to-stream). (Nikita) + - Opcache: . Fixed bug #78189 (file cache strips last character of uname hash). (cmb) . Fixed bug #78202 (Opcache stats for cache hits are capped at 32bit NUM). diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index acec874b61..a0375826e9 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -2322,7 +2322,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; } |