]> granicus.if.org Git - php/commitdiff
use correct shift and fix slowlog bt in 7.1
authorAntony Dovgal <tony2001@php.net>
Mon, 23 Jan 2017 11:50:09 +0000 (14:50 +0300)
committerAntony Dovgal <tony2001@php.net>
Mon, 23 Jan 2017 11:50:09 +0000 (14:50 +0300)
sapi/fpm/fpm/fpm_php_trace.c

index e6482b63806e8c44e86a4d9e043a86c73892f0c4..4ab2db6e3f6c2de90f8b8e23b4f82219df774cd0 100644 (file)
@@ -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);