Merge remote-tracking branch 'upstream/master'

1 files changed, 6 insertions, 2 deletions

diff --git a/src/tests/disable_function/disabled_function_super_global_var.phpt b/src/tests/disable_function/disabled_function_super_global_var.phpt
index 196d9e2..19bb892 100644
--- a/src/tests/disable_function/disabled_function_super_global_var.phpt
+++ b/src/tests/disable_function/disabled_function_super_global_var.phpt
@@ -9,13 +9,17 @@ bla=test
 --FILE--
 <?php 
 function test(){
+try {
     echo strtoupper($_GET['bla']) . "\n";
 }
-test();
+catch (Exception $e) { }
+catch (Error $e) { }
+}
+        test();
 $_GET['bla'] = 'test2';
 test();
 ?>
 --EXPECTF--
 TEST
 
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_super_global_var.php on line 3
+Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_super_global_var.php on line 4