com php-src: use correct shift and fix slowlog bt in 7.1: sapi/fpm/fpm/fpm_php_trace.c

Commit: 9d7054693ec2cb81b5e061a6c9efbda4f9c9d410 Author: Antony Dovgal <tony2001@php.net> Mon, 23 Jan 2017 14:50:09 +0300 Parents: 5589df128cd7f98c48f5d2c1c154eb927f84f53c Branches: PHP-7.1 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9d7054693ec2cb81b5e061a6c9efbda4f9c9d410 Log: use correct shift and fix slowlog bt in 7.1 Changed paths: M sapi/fpm/fpm/fpm_php_trace.c Diff: diff --git a/sapi/fpm/fpm/fpm_php_trace.c b/sapi/fpm/fpm/fpm_php_trace.c index e6482b6..4ab2db6 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);