Merge remote-tracking branch 'upstream/master'

1 files changed, 8 insertions, 8 deletions

diff --git a/src/tests/dump_request/dump_eval_blacklist.phpt b/src/tests/dump_request/dump_eval_blacklist.phpt
index f3c0b2b..07c17f2 100644
--- a/src/tests/dump_request/dump_eval_blacklist.phpt
+++ b/src/tests/dump_request/dump_eval_blacklist.phpt
@@ -2,7 +2,7 @@
 Dump eval blacklist
 --SKIPIF--
 <?php 
-if (!extension_loaded("snuffleupagus")) die "skip";
+if (!extension_loaded("snuffleupagus")) print "skip";
 ?>
 --POST--
 post_a=data_post_a&post_b=data_post_b
@@ -25,16 +25,16 @@ eval('$a = strtoupper("1234");');
 echo "After eval: $a\n";
 $filename = glob('/tmp/dump_result/sp_dump.*')[0];
 $res = file($filename);
-if ($res[2] != "GET:get_a='data_get_a' get_b='data_get_b' \n") {
-    echo "1\n";
-} elseif ($res[3] != "POST:post_a='data_post_a' post_b='data_post_b' \n") {
-    echo "2\n";
-} elseif ($res[4] != "COOKIE:cookie_a='data_cookie_a&cookie_b=data_cookie_b' \n") {
-    echo "3\n";
+if ($res[3] != "GET:get_a='data_get_a' get_b='data_get_b' \n") {
+    echo "Invalid GET";
+} elseif ($res[4] != "POST:post_a='data_post_a' post_b='data_post_b' \n") {
+    echo "Invalid POST";
+} elseif ($res[5] != "COOKIE:cookie_a='data_cookie_a&cookie_b=data_cookie_b' \n") {
+    echo "Invalid COOKIE";
 }
 ?>
 --EXPECTF--
 Outside of eval: 1337 1337 1337
 
-Warning: [snuffleupagus][0.0.0.0][eval] A call to strtoupper was tried in eval, in %a/dump_eval_blacklist.php:1, logging it. in %a/dump_eval_blacklist.php(9) : eval()'d code on line 1
+Warning: [snuffleupagus][0.0.0.0][eval][simulation] A call to strtoupper was tried in eval, in %a/dump_eval_blacklist.php:1, logging it. in %a/dump_eval_blacklist.php(9) : eval()'d code on line 1
 After eval: 1234