Page MenuHomePhabricator
Files F18674148

D10376.id24978.diff
No OneTemporary
Actions

D10376.id24978.diff
View Options

diff --git a/extension/tests/xhprof_007.phpt b/extension/tests/xhprof_007.phpt
--- a/extension/tests/xhprof_007.phpt
+++ b/extension/tests/xhprof_007.phpt
@@ -6,7 +6,7 @@
include_once dirname(__FILE__).'/common.php';
-$xhprof_ignored_functions = array( 'ignored_functions' =>
+$xhprof_ignored_functions = array( 'ignored_functions' =>
array('call_user_func',
'call_user_func_array',
'my_call_user_func_safe',
@@ -20,8 +20,8 @@
for ($idx = 0; $idx < 2; $idx++) {
$sum += bar();
}
- echo "hello: {$x}\n" ;
- return strlen("hello: {$x}");
+ echo @"hello: {$x}\n" ;
+ return @strlen("hello: {$x}");
}
function foo_array($x1, $x2 = 'test') {
@@ -30,8 +30,8 @@
foreach ($x as $idx) {
$sum += bar();
}
- echo "hello: " . $x[0] . $x[1] . "\n";
- return strlen("hello: {$x[0]} {$x[1]}");
+ echo @"hello: {$x[0]}{$x[1]}\n";
+ return @strlen("hello: {$x[0]} {$x[1]}");
}
function my_call_user_func_safe($function, $args = 'my_safe') {
@@ -161,7 +161,7 @@
// 5c: Sanity test to only ignore my_call_user_func_array_safe
echo "Part 5c: Only ignore call_user_func_array\n";
-$xhprof_ignored_functions = array('ignored_functions' =>
+$xhprof_ignored_functions = array('ignored_functions' =>
'my_call_user_func_array_safe');
xhprof_enable(XHPROF_FLAGS_MEMORY, $xhprof_ignored_functions);
test_my_call_user_func_array_safe('foo_array');
diff --git a/extension/xhprof.c b/extension/xhprof.c
--- a/extension/xhprof.c
+++ b/extension/xhprof.c
@@ -961,7 +961,9 @@
/* we are dealing with a special directive/function like
* include, eval, etc.
*/
-#if ZEND_EXTENSION_API_NO >= 220100525
+#if ZEND_EXTENSION_API_NO >= 220121212
+ curr_op = data->prev_execute_data->opline->extended_value;
+#elif ZEND_EXTENSION_API_NO >= 220100525
curr_op = data->opline->extended_value;
#else
curr_op = data->opline->op2.u.constant.value.lval;

File Metadata

Mime Type
text/plain
Expires
Sep 26 2025, 1:25 PM (23 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
8402683
Default Alt Text
D10376.id24978.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility