diff options
| author | Antony Dovgal <tony2001@php.net> | 2017-01-23 14:50:09 +0300 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2017-01-23 14:50:09 +0300 |
| commit | 9d7054693ec2cb81b5e061a6c9efbda4f9c9d410 (patch) | |
| tree | 819ef137da31fe1c174cde8a948ee45419a57912 | |
| parent | 5589df128cd7f98c48f5d2c1c154eb927f84f53c (diff) | |
| download | php-git-9d7054693ec2cb81b5e061a6c9efbda4f9c9d410.tar.gz | |
use correct shift and fix slowlog bt in 7.1
| -rw-r--r-- | sapi/fpm/fpm/fpm_php_trace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sapi/fpm/fpm/fpm_php_trace.c b/sapi/fpm/fpm/fpm_php_trace.c index e6482b6380..4ab2db6e3f 100644 --- a/sapi/fpm/fpm/fpm_php_trace.c +++ b/sapi/fpm/fpm/fpm_php_trace.c @@ -101,9 +101,9 @@ static int fpm_php_trace_dump(struct fpm_child_s *child, FILE *slowlog) /* {{{ * return -1; } - if (ZEND_CALL_KIND_EX((*call_info) >> 24) == ZEND_CALL_TOP_CODE) { + if (ZEND_CALL_KIND_EX((*call_info) >> ZEND_CALL_INFO_SHIFT) == ZEND_CALL_TOP_CODE) { return 0; - } else if (ZEND_CALL_KIND_EX(*(call_info) >> 24) == ZEND_CALL_NESTED_CODE) { + } else if (ZEND_CALL_KIND_EX(*(call_info) >> ZEND_CALL_INFO_SHIFT) == ZEND_CALL_NESTED_CODE) { memcpy(buf, "[INCLUDE_OR_EVAL]", sizeof("[INCLUDE_OR_EVAL]")); } else { ZEND_ASSERT(0); |