summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Fuhrmannek2014-10-06 17:36:23 +0200
committerBen Fuhrmannek2014-10-06 17:36:23 +0200
commitff4edc6ecf463211c6527879d6b23f991fd5b73b (patch)
treed926fa666c778b5b422b5d7aaa18f516fa6f2abb
parentdef06bc8331efe49ad3a3768da7800f60459c390 (diff)
restructured error output in unittests. (issues #52 + #54)
Diffstat
-rw-r--r--.gitignore2
-rw-r--r--tests/executor/allow_symlink_off.phpt7
-rw-r--r--tests/filter/filter_logging_statistics.phpt7
-rw-r--r--tests/filter/get_filter_1.phpt7
-rw-r--r--tests/filter/get_filter_2.phpt7
-rw-r--r--tests/filter/get_filter_allow_ws.phpt2
-rw-r--r--tests/filter/get_filter_cookie_disallow_ws.phpt7
-rw-r--r--tests/filter/get_filter_get_disallow_ws.phpt7
-rw-r--r--tests/filter/get_filter_post_disallow_ws.phpt7
-rw-r--r--tests/filter/get_filter_request_disallow_ws.phpt7
-rw-r--r--tests/filter/input_filter_allow_nul.phptbin955 -> 958 bytes
-rw-r--r--tests/filter/input_filter_cookie_disallow_nul.phpt7
-rw-r--r--tests/filter/input_filter_cookie_max_array_depth.phpt7
-rw-r--r--tests/filter/input_filter_cookie_max_array_index_length.phpt7
-rw-r--r--tests/filter/input_filter_cookie_max_name_length.phpt7
-rw-r--r--tests/filter/input_filter_cookie_max_totalname_length.phpt7
-rw-r--r--tests/filter/input_filter_cookie_max_value_length.phpt7
-rw-r--r--tests/filter/input_filter_cookie_max_vars.phpt5
-rw-r--r--tests/filter/input_filter_get_disallow_nul.phpt7
-rw-r--r--tests/filter/input_filter_get_max_array_depth.phpt7
-rw-r--r--tests/filter/input_filter_get_max_array_index_length.phpt7
-rw-r--r--tests/filter/input_filter_get_max_name_length.phpt7
-rw-r--r--tests/filter/input_filter_get_max_totalname_length.phpt7
-rw-r--r--tests/filter/input_filter_get_max_value_length.phpt7
-rw-r--r--tests/filter/input_filter_post_disallow_nul.phpt7
-rw-r--r--tests/filter/input_filter_post_disallow_nul_rfc1867.phptbin1386 -> 1508 bytes
-rw-r--r--tests/filter/input_filter_post_max_array_depth.phpt7
-rw-r--r--tests/filter/input_filter_post_max_array_depth_rfc1867.phpt7
-rw-r--r--tests/filter/input_filter_post_max_array_index_length.phpt7
-rw-r--r--tests/filter/input_filter_post_max_array_index_length_rfc1867.phpt7
-rw-r--r--tests/filter/input_filter_post_max_name_length.phpt7
-rw-r--r--tests/filter/input_filter_post_max_name_length_rfc1867.phpt7
-rw-r--r--tests/filter/input_filter_post_max_totalname_length.phpt7
-rw-r--r--tests/filter/input_filter_post_max_totalname_length_rfc1867.phpt7
-rw-r--r--tests/filter/input_filter_post_max_value_length.phpt7
-rw-r--r--tests/filter/input_filter_post_max_value_length_rfc1867.phptbin1790 -> 1912 bytes
-rw-r--r--tests/filter/input_filter_request_disallow_nul.phpt7
-rw-r--r--tests/filter/input_filter_request_max_array_depth.phpt7
-rw-r--r--tests/filter/input_filter_request_max_array_index_length.phpt7
-rw-r--r--tests/filter/input_filter_request_max_name_length.phpt7
-rw-r--r--tests/filter/input_filter_request_max_totalname_length.phpt7
-rw-r--r--tests/filter/input_filter_request_max_value_length.phpt7
-rw-r--r--tests/filter/post_fileupload_filter_1.phpt7
-rw-r--r--tests/filter/post_fileupload_filter_2.phpt7
-rw-r--r--tests/filter/post_filter_1.phpt7
-rw-r--r--tests/filter/post_filter_2.phpt7
-rw-r--r--tests/filter/post_filter_empty_var.phpt2
-rw-r--r--tests/filter/server_encode_off.phpt2
-rw-r--r--tests/filter/server_encode_on.phpt2
-rw-r--r--tests/filter/server_filter.phpt7
-rw-r--r--tests/filter/server_strip_off.phpt2
-rw-r--r--tests/filter/server_strip_on.phpt2
-rw-r--r--tests/filter/server_user_agent_strip_off.phpt2
-rw-r--r--tests/filter/server_user_agent_strip_on.phpt2
-rw-r--r--tests/filter/suhosin_upload_disallow_binary_off.phptbin9471 -> 9474 bytes
-rw-r--r--tests/filter/suhosin_upload_disallow_binary_on.phptbin12142 -> 12264 bytes
-rw-r--r--tests/filter/suhosin_upload_disallow_binary_utf8.phpt2
-rw-r--r--tests/filter/suhosin_upload_disallow_binary_utf8fail.phpt7
-rw-r--r--tests/filter/suhosin_upload_disallow_elf.phpt7
-rw-r--r--tests/filter/suhosin_upload_disallow_elf_off.phpt2
-rw-r--r--tests/filter/suhosin_upload_max_uploads.phpt7
-rw-r--r--tests/filter/suhosin_upload_remove_binary.phptbin796 -> 799 bytes
-rw-r--r--tests/filter/suhosin_upload_remove_binary_utf8.phpt2
-rw-r--r--tests/filter/suhosin_upload_remove_binary_utf8fail.phpt2
-rw-r--r--tests/include/include_uploaded_file_diff_filename.phpt3
-rw-r--r--tests/include/include_uploaded_file_from_FILES.phpt3
-rw-r--r--tests/logging/use_x_forwarded_for_off.phpt12
-rw-r--r--tests/logging/use_x_forwarded_for_off_no_remote_addr.phpt12
-rw-r--r--tests/logging/use_x_forwarded_for_on.phpt12
-rw-r--r--tests/logging/use_x_forwarded_for_on_no_x_forwarded.phpt12
-rw-r--r--tests/sql/mysqli_comment_conditional.phpt2
-rw-r--r--tests/sql/mysqli_comment_cstyle_fail.phpt2
-rw-r--r--tests/sql/mysqli_comment_hashstyle_fail.phpt2
-rw-r--r--tests/sql/mysqli_comment_sqlstyle.phpt2
-rw-r--r--tests/sql/mysqli_comment_sqlstyle_fail.phpt2
-rw-r--r--tests/sql/mysqli_connect_invalid_username.phpt2
-rw-r--r--tests/sql/mysqli_multiselect.phpt2
-rw-r--r--tests/sql/mysqli_multiselect_fail.phpt2
-rw-r--r--tests/sql/mysqli_multiselect_subselect.phpt2
-rw-r--r--tests/sql/mysqli_no_constraints.phpt2
-rw-r--r--tests/sql/mysqli_open_comment.phpt2
-rw-r--r--tests/sql/mysqli_open_comment_fail.phpt2
-rw-r--r--tests/sql/mysqli_union.phpt2
-rw-r--r--tests/sql/mysqli_union_fail.phpt2
-rw-r--r--tests/sql/mysqli_user_match_error.phpt2
-rw-r--r--tests/sql/mysqli_user_match_ok.phpt2
-rw-r--r--tests/sql/mysqli_user_postfix.phpt2
-rw-r--r--tests/sql/mysqli_user_prefix.phpt2
-rw-r--r--tests/sql/skipifmysqli.inc3
89 files changed, 292 insertions, 140 deletions
diff --git a/.gitignore b/.gitignore
index ddb1030..e243bfb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,4 +25,4 @@
25/modules/ 25/modules/
26/run-tests.php 26/run-tests.php
27/suhosin.la 27/suhosin.la
28 28/tests/*/*.tmp
diff --git a/tests/executor/allow_symlink_off.phpt b/tests/executor/allow_symlink_off.phpt
index 782d818..8abdee8 100644
--- a/tests/executor/allow_symlink_off.phpt
+++ b/tests/executor/allow_symlink_off.phpt
@@ -5,10 +5,13 @@ suhosin.executor.allow_symlink=Off
5--INI-- 5--INI--
6error_reporting=E_ALL 6error_reporting=E_ALL
7open_basedir= 7open_basedir=
8suhosin.log.stdout=255
9suhosin.log.script=0
10suhosin.log.syslog=0 8suhosin.log.syslog=0
11suhosin.log.sapi=0 9suhosin.log.sapi=0
10suhosin.log.script=0
11suhosin.log.file=255
12suhosin.log.file.time=0
13suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
14auto_append_file={PWD}/suhosintest.$$.log.tmp
12suhosin.executor.allow_symlink=Off 15suhosin.executor.allow_symlink=Off
13--FILE-- 16--FILE--
14<?php 17<?php
diff --git a/tests/filter/filter_logging_statistics.phpt b/tests/filter/filter_logging_statistics.phpt
index a448d78..d7550fd 100644
--- a/tests/filter/filter_logging_statistics.phpt
+++ b/tests/filter/filter_logging_statistics.phpt
@@ -3,12 +3,15 @@ suhosin variable filter logging statistics
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.get.max_vars=5 11suhosin.get.max_vars=5
9error_reporting=E_ALL 12error_reporting=E_ALL
10--SKIPIF-- 13--SKIPIF--
11<?php include('skipif.inc'); ?> 14<?php include('../skipif.inc'); ?>
12--COOKIE-- 15--COOKIE--
13--GET-- 16--GET--
14A=A&B=B&C=C&D=D&E=E&F=F&G=G& 17A=A&B=B&C=C&D=D&E=E&F=F&G=G&
diff --git a/tests/filter/get_filter_1.phpt b/tests/filter/get_filter_1.phpt
index 0ab079c..a4218be 100644
--- a/tests/filter/get_filter_1.phpt
+++ b/tests/filter/get_filter_1.phpt
@@ -3,10 +3,13 @@ suhosin GET filter (disallowed variable names)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8--SKIPIF-- 11--SKIPIF--
9<?php include('skipif.inc'); ?> 12<?php include('../skipif.inc'); ?>
10--COOKIE-- 13--COOKIE--
11--GET-- 14--GET--
12HTTP_RAW_POST_DATA=HTTP_RAW_POST_DATA&HTTP_SESSION_VARS=HTTP_SESSION_VARS&harmless1=harmless1&HTTP_SERVER_VARS=HTTP_SERVER_VARS&HTTP_COOKIE_VARS=HTTP_COOKIE_VARS&HTTP_POST_FILES=HTTP_POST_FILES&HTTP_POST_VARS=HTTP_POST_VARS&HTTP_GET_VARS=HTTP_GET_VARS&HTTP_ENV_VARS=HTTP_ENV_VARS&_SESSION=_SESSION&_REQUEST=_REQUEST&GLOBALS=GLOBALS&_COOKIE=_COOKIE&_SERVER=_SERVER&_FILES=_FILES&_POST=_POST&_ENV=_ENV&_GET=_GET&harmless2=harmless2& 15HTTP_RAW_POST_DATA=HTTP_RAW_POST_DATA&HTTP_SESSION_VARS=HTTP_SESSION_VARS&harmless1=harmless1&HTTP_SERVER_VARS=HTTP_SERVER_VARS&HTTP_COOKIE_VARS=HTTP_COOKIE_VARS&HTTP_POST_FILES=HTTP_POST_FILES&HTTP_POST_VARS=HTTP_POST_VARS&HTTP_GET_VARS=HTTP_GET_VARS&HTTP_ENV_VARS=HTTP_ENV_VARS&_SESSION=_SESSION&_REQUEST=_REQUEST&GLOBALS=GLOBALS&_COOKIE=_COOKIE&_SERVER=_SERVER&_FILES=_FILES&_POST=_POST&_ENV=_ENV&_GET=_GET&harmless2=harmless2&
diff --git a/tests/filter/get_filter_2.phpt b/tests/filter/get_filter_2.phpt
index 189ac28..5aa53d7 100644
--- a/tests/filter/get_filter_2.phpt
+++ b/tests/filter/get_filter_2.phpt
@@ -3,11 +3,14 @@ suhosin GET filter (suhosin.get.max_vars)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.get.max_vars=5 11suhosin.get.max_vars=5
9--SKIPIF-- 12--SKIPIF--
10<?php include('skipif.inc'); ?> 13<?php include('../skipif.inc'); ?>
11--COOKIE-- 14--COOKIE--
12--GET-- 15--GET--
13A=A&B=B&C=C&D=D&E=E&F=F&G=G& 16A=A&B=B&C=C&D=D&E=E&F=F&G=G&
diff --git a/tests/filter/get_filter_allow_ws.phpt b/tests/filter/get_filter_allow_ws.phpt
index 41b230e..2a0445c 100644
--- a/tests/filter/get_filter_allow_ws.phpt
+++ b/tests/filter/get_filter_allow_ws.phpt
@@ -10,7 +10,7 @@ suhosin.get.disallow_ws=0
10suhosin.post.disallow_ws=0 10suhosin.post.disallow_ws=0
11suhosin.cookie.disallow_ws=0 11suhosin.cookie.disallow_ws=0
12--SKIPIF-- 12--SKIPIF--
13<?php include('skipif.inc'); ?> 13<?php include('../skipif.inc'); ?>
14--COOKIE-- 14--COOKIE--
15+var1=1;var2=2;%20var3=3; var4=4; 15+var1=1;var2=2;%20var3=3; var4=4;
16--GET-- 16--GET--
diff --git a/tests/filter/get_filter_cookie_disallow_ws.phpt b/tests/filter/get_filter_cookie_disallow_ws.phpt
index 4da6716..3065b7d 100644
--- a/tests/filter/get_filter_cookie_disallow_ws.phpt
+++ b/tests/filter/get_filter_cookie_disallow_ws.phpt
@@ -3,11 +3,14 @@ suhosin input filter (suhosin.cookie.disallow_ws)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.cookie.disallow_ws=1 11suhosin.cookie.disallow_ws=1
9--SKIPIF-- 12--SKIPIF--
10<?php include('skipif.inc'); ?> 13<?php include('../skipif.inc'); ?>
11--COOKIE-- 14--COOKIE--
12+var1=1;var2=2;%20var3=3; var4=4; 15+var1=1;var2=2;%20var3=3; var4=4;
13--GET-- 16--GET--
diff --git a/tests/filter/get_filter_get_disallow_ws.phpt b/tests/filter/get_filter_get_disallow_ws.phpt
index b92dd73..9495486 100644
--- a/tests/filter/get_filter_get_disallow_ws.phpt
+++ b/tests/filter/get_filter_get_disallow_ws.phpt
@@ -3,11 +3,14 @@ suhosin input filter (suhosin.get.disallow_ws)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.get.disallow_ws=1 11suhosin.get.disallow_ws=1
9--SKIPIF-- 12--SKIPIF--
10<?php include('skipif.inc'); ?> 13<?php include('../skipif.inc'); ?>
11--COOKIE-- 14--COOKIE--
12--GET-- 15--GET--
13+var1=1&var2=2&%20var3=3& var4=4& 16+var1=1&var2=2&%20var3=3& var4=4&
diff --git a/tests/filter/get_filter_post_disallow_ws.phpt b/tests/filter/get_filter_post_disallow_ws.phpt
index 55c7cf1..003afa5 100644
--- a/tests/filter/get_filter_post_disallow_ws.phpt
+++ b/tests/filter/get_filter_post_disallow_ws.phpt
@@ -3,11 +3,14 @@ suhosin input filter (suhosin.post.disallow_ws)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.post.disallow_ws=1 11suhosin.post.disallow_ws=1
9--SKIPIF-- 12--SKIPIF--
10<?php include('skipif.inc'); ?> 13<?php include('../skipif.inc'); ?>
11--COOKIE-- 14--COOKIE--
12--GET-- 15--GET--
13--POST-- 16--POST--
diff --git a/tests/filter/get_filter_request_disallow_ws.phpt b/tests/filter/get_filter_request_disallow_ws.phpt
index fd22d62..fe69e78 100644
--- a/tests/filter/get_filter_request_disallow_ws.phpt
+++ b/tests/filter/get_filter_request_disallow_ws.phpt
@@ -3,11 +3,14 @@ suhosin input filter (suhosin.request.disallow_ws)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.request.disallow_ws=1 11suhosin.request.disallow_ws=1
9--SKIPIF-- 12--SKIPIF--
10<?php include('skipif.inc'); ?> 13<?php include('../skipif.inc'); ?>
11--COOKIE-- 14--COOKIE--
12--GET-- 15--GET--
13+var1=1&var2=2&%20var3=3& var4=4& 16+var1=1&var2=2&%20var3=3& var4=4&
diff --git a/tests/filter/input_filter_allow_nul.phpt b/tests/filter/input_filter_allow_nul.phpt
index 478d4b4..a913189 100644
--- a/tests/filter/input_filter_allow_nul.phpt
+++ b/tests/filter/input_filter_allow_nul.phpt
Binary files differ
diff --git a/tests/filter/input_filter_cookie_disallow_nul.phpt b/tests/filter/input_filter_cookie_disallow_nul.phpt
index dab9241..ae05ac6 100644
--- a/tests/filter/input_filter_cookie_disallow_nul.phpt
+++ b/tests/filter/input_filter_cookie_disallow_nul.phpt
@@ -3,12 +3,15 @@ suhosin input filter (suhosin.cookie.disallow_nul)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.request.disallow_nul=0 11suhosin.request.disallow_nul=0
9suhosin.cookie.disallow_nul=1 12suhosin.cookie.disallow_nul=1
10--SKIPIF-- 13--SKIPIF--
11<?php include('skipif.inc'); ?> 14<?php include('../skipif.inc'); ?>
12--COOKIE-- 15--COOKIE--
13var1=xx%001;var2=2;var3=xx%003;var4=4; 16var1=xx%001;var2=2;var3=xx%003;var4=4;
14--GET-- 17--GET--
diff --git a/tests/filter/input_filter_cookie_max_array_depth.phpt b/tests/filter/input_filter_cookie_max_array_depth.phpt
index 10fc667..327fa36 100644
--- a/tests/filter/input_filter_cookie_max_array_depth.phpt
+++ b/tests/filter/input_filter_cookie_max_array_depth.phpt
@@ -3,12 +3,15 @@ suhosin input filter (suhosin.cookie.max_array_depth)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.request.max_array_depth=0 11suhosin.request.max_array_depth=0
9suhosin.cookie.max_array_depth=4 12suhosin.cookie.max_array_depth=4
10--SKIPIF-- 13--SKIPIF--
11<?php include('skipif.inc'); ?> 14<?php include('../skipif.inc'); ?>
12--COOKIE-- 15--COOKIE--
13var1[]=1;var2[][]=2;var3[][][]=3;var4[][][][]=4;var5[][][][][]=5;var6[][][][][][]=6; 16var1[]=1;var2[][]=2;var3[][][]=3;var4[][][][]=4;var5[][][][][]=5;var6[][][][][][]=6;
14--GET-- 17--GET--
diff --git a/tests/filter/input_filter_cookie_max_array_index_length.phpt b/tests/filter/input_filter_cookie_max_array_index_length.phpt
index 76dcad4..b954e63 100644
--- a/tests/filter/input_filter_cookie_max_array_index_length.phpt
+++ b/tests/filter/input_filter_cookie_max_array_index_length.phpt
@@ -3,12 +3,15 @@ suhosin input filter (suhosin.cookie.max_array_index_length)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.request.max_array_index_length=0 11suhosin.request.max_array_index_length=0
9suhosin.cookie.max_array_index_length=3 12suhosin.cookie.max_array_index_length=3
10--SKIPIF-- 13--SKIPIF--
11<?php include('skipif.inc'); ?> 14<?php include('../skipif.inc'); ?>
12--COOKIE-- 15--COOKIE--
13var1[AAA]=1;var2[BBBB]=1;var3[AAA][BBB]=1;var4[AAA][BBBB]=4;var5[AAA][BBB][CCC]=1;var6[AAA][BBBB][CCC]=1; 16var1[AAA]=1;var2[BBBB]=1;var3[AAA][BBB]=1;var4[AAA][BBBB]=4;var5[AAA][BBB][CCC]=1;var6[AAA][BBBB][CCC]=1;
14--GET-- 17--GET--
diff --git a/tests/filter/input_filter_cookie_max_name_length.phpt b/tests/filter/input_filter_cookie_max_name_length.phpt
index b655424..38b8558 100644
--- a/tests/filter/input_filter_cookie_max_name_length.phpt
+++ b/tests/filter/input_filter_cookie_max_name_length.phpt
@@ -3,12 +3,15 @@ suhosin input filter (suhosin.cookie.max_name_length)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.request.max_varname_length=0 11suhosin.request.max_varname_length=0
9suhosin.cookie.max_name_length=4 12suhosin.cookie.max_name_length=4
10--SKIPIF-- 13--SKIPIF--
11<?php include('skipif.inc'); ?> 14<?php include('../skipif.inc'); ?>
12--COOKIE-- 15--COOKIE--
13var=0;var1=1;var2[]=2;var3[xxx]=3;var04=4;var05[]=5;var06[xxx]=6; 16var=0;var1=1;var2[]=2;var3[xxx]=3;var04=4;var05[]=5;var06[xxx]=6;
14--GET-- 17--GET--
diff --git a/tests/filter/input_filter_cookie_max_totalname_length.phpt b/tests/filter/input_filter_cookie_max_totalname_length.phpt
index b356dc6..b9324fc 100644
--- a/tests/filter/input_filter_cookie_max_totalname_length.phpt
+++ b/tests/filter/input_filter_cookie_max_totalname_length.phpt
@@ -3,12 +3,15 @@ suhosin input filter (suhosin.cookie.max_totalname_length)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.request.max_totalname_length=0 11suhosin.request.max_totalname_length=0
9suhosin.cookie.max_totalname_length=7 12suhosin.cookie.max_totalname_length=7
10--SKIPIF-- 13--SKIPIF--
11<?php include('skipif.inc'); ?> 14<?php include('../skipif.inc'); ?>
12--COOKIE-- 15--COOKIE--
13var=0;var1=1;var2[]=2;var3[xxx]=3;var04=4;var05[]=5;var06[xxx]=6; 16var=0;var1=1;var2[]=2;var3[xxx]=3;var04=4;var05[]=5;var06[xxx]=6;
14--GET-- 17--GET--
diff --git a/tests/filter/input_filter_cookie_max_value_length.phpt b/tests/filter/input_filter_cookie_max_value_length.phpt
index fb8b3d8..d691c9e 100644
--- a/tests/filter/input_filter_cookie_max_value_length.phpt
+++ b/tests/filter/input_filter_cookie_max_value_length.phpt
@@ -3,12 +3,15 @@ suhosin input filter (suhosin.cookie.max_value_length)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.request.max_value_length=0 11suhosin.request.max_value_length=0
9suhosin.cookie.max_value_length=3 12suhosin.cookie.max_value_length=3
10--SKIPIF-- 13--SKIPIF--
11<?php include('skipif.inc'); ?> 14<?php include('../skipif.inc'); ?>
12--COOKIE-- 15--COOKIE--
13var1=1;var2=22;var3=333;var4=4444;var5=55%00555;var6=666666; 16var1=1;var2=22;var3=333;var4=4444;var5=55%00555;var6=666666;
14--GET-- 17--GET--
diff --git a/tests/filter/input_filter_cookie_max_vars.phpt b/tests/filter/input_filter_cookie_max_vars.phpt
index 9047df3..fed391e 100644
--- a/tests/filter/input_filter_cookie_max_vars.phpt
+++ b/tests/filter/input_filter_cookie_max_vars.phpt
@@ -5,8 +5,11 @@ suhosin input filter (suhosin.cookie.max_vars)
5--INI-- 5--INI--
6suhosin.log.syslog=0 6suhosin.log.syslog=0
7suhosin.log.sapi=0 7suhosin.log.sapi=0
8suhosin.log.stdout=255
9suhosin.log.script=0 8suhosin.log.script=0
9suhosin.log.file=255
10suhosin.log.file.time=0
11suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
12auto_append_file={PWD}/suhosintest.$$.log.tmp
10suhosin.cookie.max_vars=3 13suhosin.cookie.max_vars=3
11--COOKIE-- 14--COOKIE--
12a=1; b=2; c=3; d=4 15a=1; b=2; c=3; d=4
diff --git a/tests/filter/input_filter_get_disallow_nul.phpt b/tests/filter/input_filter_get_disallow_nul.phpt
index b7c2ad4..5a5b506 100644
--- a/tests/filter/input_filter_get_disallow_nul.phpt
+++ b/tests/filter/input_filter_get_disallow_nul.phpt
@@ -3,12 +3,15 @@ suhosin input filter (suhosin.get.disallow_nul)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.request.disallow_nul=0 11suhosin.request.disallow_nul=0
9suhosin.get.disallow_nul=1 12suhosin.get.disallow_nul=1
10--SKIPIF-- 13--SKIPIF--
11<?php include('skipif.inc'); ?> 14<?php include('../skipif.inc'); ?>
12--COOKIE-- 15--COOKIE--
13--GET-- 16--GET--
14var1=xx%001&var2=2&var3=xx%003&var4=4& 17var1=xx%001&var2=2&var3=xx%003&var4=4&
diff --git a/tests/filter/input_filter_get_max_array_depth.phpt b/tests/filter/input_filter_get_max_array_depth.phpt
index 9a32f29..99fb666 100644
--- a/tests/filter/input_filter_get_max_array_depth.phpt
+++ b/tests/filter/input_filter_get_max_array_depth.phpt
@@ -3,12 +3,15 @@ suhosin input filter (suhosin.get.max_array_depth)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.request.max_array_depth=0 11suhosin.request.max_array_depth=0
9suhosin.get.max_array_depth=4 12suhosin.get.max_array_depth=4
10--SKIPIF-- 13--SKIPIF--
11<?php include('skipif.inc'); ?> 14<?php include('../skipif.inc'); ?>
12--COOKIE-- 15--COOKIE--
13--GET-- 16--GET--
14var1[]=1&var2[][]=2&var3[][][]=3&var4[][][][]=4&var5[][][][][]=5&var6[][][][][][]=6& 17var1[]=1&var2[][]=2&var3[][][]=3&var4[][][][]=4&var5[][][][][]=5&var6[][][][][][]=6&
diff --git a/tests/filter/input_filter_get_max_array_index_length.phpt b/tests/filter/input_filter_get_max_array_index_length.phpt
index 890ec8e..54bf610 100644
--- a/tests/filter/input_filter_get_max_array_index_length.phpt
+++ b/tests/filter/input_filter_get_max_array_index_length.phpt
@@ -3,12 +3,15 @@ suhosin input filter (suhosin.get.max_array_index_length)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.request.max_array_index_length=0 11suhosin.request.max_array_index_length=0
9suhosin.get.max_array_index_length=3 12suhosin.get.max_array_index_length=3
10--SKIPIF-- 13--SKIPIF--
11<?php include('skipif.inc'); ?> 14<?php include('../skipif.inc'); ?>
12--COOKIE-- 15--COOKIE--
13--GET-- 16--GET--
14var1[AAA]=1&var2[BBBB]=1&var3[AAA][BBB]=1&var4[AAA][BBBB]=4&var5[AAA][BBB][CCC]=1&var6[AAA][BBBB][CCC]=1 17var1[AAA]=1&var2[BBBB]=1&var3[AAA][BBB]=1&var4[AAA][BBBB]=4&var5[AAA][BBB][CCC]=1&var6[AAA][BBBB][CCC]=1
diff --git a/tests/filter/input_filter_get_max_name_length.phpt b/tests/filter/input_filter_get_max_name_length.phpt
index 4fab0a0..76ca5f6 100644
--- a/tests/filter/input_filter_get_max_name_length.phpt
+++ b/tests/filter/input_filter_get_max_name_length.phpt
@@ -3,12 +3,15 @@ suhosin input filter (suhosin.get.max_name_length)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.request.max_varname_length=0 11suhosin.request.max_varname_length=0
9suhosin.get.max_name_length=4 12suhosin.get.max_name_length=4
10--SKIPIF-- 13--SKIPIF--
11<?php include('skipif.inc'); ?> 14<?php include('../skipif.inc'); ?>
12--COOKIE-- 15--COOKIE--
13--GET-- 16--GET--
14var=0&var1=1&var2[]=2&var3[xxx]=3&var04=4&var05[]=5&var06[xxx]=6& 17var=0&var1=1&var2[]=2&var3[xxx]=3&var04=4&var05[]=5&var06[xxx]=6&
diff --git a/tests/filter/input_filter_get_max_totalname_length.phpt b/tests/filter/input_filter_get_max_totalname_length.phpt
index 1353ee0..675708d 100644
--- a/tests/filter/input_filter_get_max_totalname_length.phpt
+++ b/tests/filter/input_filter_get_max_totalname_length.phpt
@@ -3,12 +3,15 @@ suhosin input filter (suhosin.get.max_totalname_length)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.request.max_totalname_length=0 11suhosin.request.max_totalname_length=0
9suhosin.get.max_totalname_length=7 12suhosin.get.max_totalname_length=7
10--SKIPIF-- 13--SKIPIF--
11<?php include('skipif.inc'); ?> 14<?php include('../skipif.inc'); ?>
12--COOKIE-- 15--COOKIE--
13--GET-- 16--GET--
14var=0&var1=1&var2[]=2&var3[xxx]=3&var04=4&var05[]=5&var06[xxx]=6& 17var=0&var1=1&var2[]=2&var3[xxx]=3&var04=4&var05[]=5&var06[xxx]=6&
diff --git a/tests/filter/input_filter_get_max_value_length.phpt b/tests/filter/input_filter_get_max_value_length.phpt
index a5eaf5b..3fa0cb7 100644
--- a/tests/filter/input_filter_get_max_value_length.phpt
+++ b/tests/filter/input_filter_get_max_value_length.phpt
@@ -3,12 +3,15 @@ suhosin input filter (suhosin.get.max_value_length)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.request.max_value_length=0 11suhosin.request.max_value_length=0
9suhosin.get.max_value_length=3 12suhosin.get.max_value_length=3
10--SKIPIF-- 13--SKIPIF--
11<?php include('skipif.inc'); ?> 14<?php include('../skipif.inc'); ?>
12--COOKIE-- 15--COOKIE--
13--GET-- 16--GET--
14var1=1&var2=22&var3=333&var4=4444&var5=55%00555&var6=666666& 17var1=1&var2=22&var3=333&var4=4444&var5=55%00555&var6=666666&
diff --git a/tests/filter/input_filter_post_disallow_nul.phpt b/tests/filter/input_filter_post_disallow_nul.phpt
index 60c797e..99462b8 100644
--- a/tests/filter/input_filter_post_disallow_nul.phpt
+++ b/tests/filter/input_filter_post_disallow_nul.phpt
@@ -3,12 +3,15 @@ suhosin input filter (suhosin.post.disallow_nul)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.request.disallow_nul=0 11suhosin.request.disallow_nul=0
9suhosin.post.disallow_nul=1 12suhosin.post.disallow_nul=1
10--SKIPIF-- 13--SKIPIF--
11<?php include('skipif.inc'); ?> 14<?php include('../skipif.inc'); ?>
12--COOKIE-- 15--COOKIE--
13--GET-- 16--GET--
14--POST-- 17--POST--
diff --git a/tests/filter/input_filter_post_disallow_nul_rfc1867.phpt b/tests/filter/input_filter_post_disallow_nul_rfc1867.phpt
index ffd252e..21fba1f 100644
--- a/tests/filter/input_filter_post_disallow_nul_rfc1867.phpt
+++ b/tests/filter/input_filter_post_disallow_nul_rfc1867.phpt
Binary files differ
diff --git a/tests/filter/input_filter_post_max_array_depth.phpt b/tests/filter/input_filter_post_max_array_depth.phpt
index 97cd501..5bf8858 100644
--- a/tests/filter/input_filter_post_max_array_depth.phpt
+++ b/tests/filter/input_filter_post_max_array_depth.phpt
@@ -3,12 +3,15 @@ suhosin input filter (suhosin.post.max_array_depth)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.request.max_array_depth=0 11suhosin.request.max_array_depth=0
9suhosin.post.max_array_depth=4 12suhosin.post.max_array_depth=4
10--SKIPIF-- 13--SKIPIF--
11<?php include('skipif.inc'); ?> 14<?php include('../skipif.inc'); ?>
12--COOKIE-- 15--COOKIE--
13--GET-- 16--GET--
14--POST-- 17--POST--
diff --git a/tests/filter/input_filter_post_max_array_depth_rfc1867.phpt b/tests/filter/input_filter_post_max_array_depth_rfc1867.phpt
index e8fd566..b2eab71 100644
--- a/tests/filter/input_filter_post_max_array_depth_rfc1867.phpt
+++ b/tests/filter/input_filter_post_max_array_depth_rfc1867.phpt
@@ -3,12 +3,15 @@ suhosin input filter (suhosin.post.max_array_depth - RFC1867 version)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.request.max_array_depth=0 11suhosin.request.max_array_depth=0
9suhosin.post.max_array_depth=4 12suhosin.post.max_array_depth=4
10--SKIPIF-- 13--SKIPIF--
11<?php include('skipif.inc'); ?> 14<?php include('../skipif.inc'); ?>
12--COOKIE-- 15--COOKIE--
13--GET-- 16--GET--
14--POST_RAW-- 17--POST_RAW--
diff --git a/tests/filter/input_filter_post_max_array_index_length.phpt b/tests/filter/input_filter_post_max_array_index_length.phpt
index 2c5adef..285b30e 100644
--- a/tests/filter/input_filter_post_max_array_index_length.phpt
+++ b/tests/filter/input_filter_post_max_array_index_length.phpt
@@ -3,12 +3,15 @@ suhosin input filter (suhosin.post.max_array_index_length)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.request.max_array_index_length=0 11suhosin.request.max_array_index_length=0
9suhosin.post.max_array_index_length=3 12suhosin.post.max_array_index_length=3
10--SKIPIF-- 13--SKIPIF--
11<?php include('skipif.inc'); ?> 14<?php include('../skipif.inc'); ?>
12--COOKIE-- 15--COOKIE--
13--GET-- 16--GET--
14--POST-- 17--POST--
diff --git a/tests/filter/input_filter_post_max_array_index_length_rfc1867.phpt b/tests/filter/input_filter_post_max_array_index_length_rfc1867.phpt
index 58f0ed2..a3a19fa 100644
--- a/tests/filter/input_filter_post_max_array_index_length_rfc1867.phpt
+++ b/tests/filter/input_filter_post_max_array_index_length_rfc1867.phpt
@@ -3,12 +3,15 @@ suhosin input filter (suhosin.post.max_array_index_length - RFC1867 version)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.request.max_array_index_length=0 11suhosin.request.max_array_index_length=0
9suhosin.post.max_array_index_length=3 12suhosin.post.max_array_index_length=3
10--SKIPIF-- 13--SKIPIF--
11<?php include('skipif.inc'); ?> 14<?php include('../skipif.inc'); ?>
12--COOKIE-- 15--COOKIE--
13--GET-- 16--GET--
14--POST-- 17--POST--
diff --git a/tests/filter/input_filter_post_max_name_length.phpt b/tests/filter/input_filter_post_max_name_length.phpt
index 0065993..cf7b35d 100644
--- a/tests/filter/input_filter_post_max_name_length.phpt
+++ b/tests/filter/input_filter_post_max_name_length.phpt
@@ -3,12 +3,15 @@ suhosin input filter (suhosin.post.max_name_length)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.request.max_varname_length=0 11suhosin.request.max_varname_length=0
9suhosin.post.max_name_length=4 12suhosin.post.max_name_length=4
10--SKIPIF-- 13--SKIPIF--
11<?php include('skipif.inc'); ?> 14<?php include('../skipif.inc'); ?>
12--COOKIE-- 15--COOKIE--
13--GET-- 16--GET--
14--POST-- 17--POST--
diff --git a/tests/filter/input_filter_post_max_name_length_rfc1867.phpt b/tests/filter/input_filter_post_max_name_length_rfc1867.phpt
index 45936d5..4ad072c 100644
--- a/tests/filter/input_filter_post_max_name_length_rfc1867.phpt
+++ b/tests/filter/input_filter_post_max_name_length_rfc1867.phpt
@@ -3,12 +3,15 @@ suhosin input filter (suhosin.post.max_name_length - RFC1867 version)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.request.max_varname_length=0 11suhosin.request.max_varname_length=0
9suhosin.post.max_name_length=4 12suhosin.post.max_name_length=4
10--SKIPIF-- 13--SKIPIF--
11<?php include('skipif.inc'); ?> 14<?php include('../skipif.inc'); ?>
12--COOKIE-- 15--COOKIE--
13--GET-- 16--GET--
14--POST_RAW-- 17--POST_RAW--
diff --git a/tests/filter/input_filter_post_max_totalname_length.phpt b/tests/filter/input_filter_post_max_totalname_length.phpt
index b922302..1fef2bb 100644
--- a/tests/filter/input_filter_post_max_totalname_length.phpt
+++ b/tests/filter/input_filter_post_max_totalname_length.phpt
@@ -3,12 +3,15 @@ suhosin input filter (suhosin.post.max_totalname_length)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.request.max_totalname_length=0 11suhosin.request.max_totalname_length=0
9suhosin.post.max_totalname_length=7 12suhosin.post.max_totalname_length=7
10--SKIPIF-- 13--SKIPIF--
11<?php include('skipif.inc'); ?> 14<?php include('../skipif.inc'); ?>
12--COOKIE-- 15--COOKIE--
13--GET-- 16--GET--
14--POST-- 17--POST--
diff --git a/tests/filter/input_filter_post_max_totalname_length_rfc1867.phpt b/tests/filter/input_filter_post_max_totalname_length_rfc1867.phpt
index bbbcca4..f8fa6db 100644
--- a/tests/filter/input_filter_post_max_totalname_length_rfc1867.phpt
+++ b/tests/filter/input_filter_post_max_totalname_length_rfc1867.phpt
@@ -3,12 +3,15 @@ suhosin input filter (suhosin.post.max_totalname_length - RFC1867 version)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.request.max_totalname_length=0 11suhosin.request.max_totalname_length=0
9suhosin.post.max_totalname_length=7 12suhosin.post.max_totalname_length=7
10--SKIPIF-- 13--SKIPIF--
11<?php include('skipif.inc'); ?> 14<?php include('../skipif.inc'); ?>
12--COOKIE-- 15--COOKIE--
13--GET-- 16--GET--
14--POST_RAW-- 17--POST_RAW--
diff --git a/tests/filter/input_filter_post_max_value_length.phpt b/tests/filter/input_filter_post_max_value_length.phpt
index b560bde..7c5493f 100644
--- a/tests/filter/input_filter_post_max_value_length.phpt
+++ b/tests/filter/input_filter_post_max_value_length.phpt
@@ -3,12 +3,15 @@ suhosin input filter (suhosin.post.max_value_length)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.request.max_value_length=0 11suhosin.request.max_value_length=0
9suhosin.post.max_value_length=3 12suhosin.post.max_value_length=3
10--SKIPIF-- 13--SKIPIF--
11<?php include('skipif.inc'); ?> 14<?php include('../skipif.inc'); ?>
12--COOKIE-- 15--COOKIE--
13--GET-- 16--GET--
14--POST-- 17--POST--
diff --git a/tests/filter/input_filter_post_max_value_length_rfc1867.phpt b/tests/filter/input_filter_post_max_value_length_rfc1867.phpt
index 7552255..a788dfd 100644
--- a/tests/filter/input_filter_post_max_value_length_rfc1867.phpt
+++ b/tests/filter/input_filter_post_max_value_length_rfc1867.phpt
Binary files differ
diff --git a/tests/filter/input_filter_request_disallow_nul.phpt b/tests/filter/input_filter_request_disallow_nul.phpt
index 09903ec..0e9636f 100644
--- a/tests/filter/input_filter_request_disallow_nul.phpt
+++ b/tests/filter/input_filter_request_disallow_nul.phpt
@@ -3,11 +3,14 @@ suhosin input filter (suhosin.request.disallow_nul)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.request.disallow_nul=1 11suhosin.request.disallow_nul=1
9--SKIPIF-- 12--SKIPIF--
10<?php include('skipif.inc'); ?> 13<?php include('../skipif.inc'); ?>
11--COOKIE-- 14--COOKIE--
12var1=xx%001;var2=2;var3=xx%003;var4=4; 15var1=xx%001;var2=2;var3=xx%003;var4=4;
13--GET-- 16--GET--
diff --git a/tests/filter/input_filter_request_max_array_depth.phpt b/tests/filter/input_filter_request_max_array_depth.phpt
index ca67a39..0f10afe 100644
--- a/tests/filter/input_filter_request_max_array_depth.phpt
+++ b/tests/filter/input_filter_request_max_array_depth.phpt
@@ -3,11 +3,14 @@ suhosin input filter (suhosin.request.max_array_depth)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.request.max_array_depth=4 11suhosin.request.max_array_depth=4
9--SKIPIF-- 12--SKIPIF--
10<?php include('skipif.inc'); ?> 13<?php include('../skipif.inc'); ?>
11--COOKIE-- 14--COOKIE--
12var1[]=1;var2[][]=2;var3[][][]=3;var4[][][][]=4;var5[][][][][]=5;var6[][][][][][]=6; 15var1[]=1;var2[][]=2;var3[][][]=3;var4[][][][]=4;var5[][][][][]=5;var6[][][][][][]=6;
13--GET-- 16--GET--
diff --git a/tests/filter/input_filter_request_max_array_index_length.phpt b/tests/filter/input_filter_request_max_array_index_length.phpt
index bb4c2ef..84b3849 100644
--- a/tests/filter/input_filter_request_max_array_index_length.phpt
+++ b/tests/filter/input_filter_request_max_array_index_length.phpt
@@ -3,11 +3,14 @@ suhosin input filter (suhosin.request.max_array_index_length)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.request.max_array_index_length=3 11suhosin.request.max_array_index_length=3
9--SKIPIF-- 12--SKIPIF--
10<?php include('skipif.inc'); ?> 13<?php include('../skipif.inc'); ?>
11--COOKIE-- 14--COOKIE--
12var1[AAA]=1;var2[BBBB]=1;var3[AAA][BBB]=1;var4[AAA][BBBB]=4;var5[AAA][BBB][CCC]=1;var6[AAA][BBBB][CCC]=1; 15var1[AAA]=1;var2[BBBB]=1;var3[AAA][BBB]=1;var4[AAA][BBBB]=4;var5[AAA][BBB][CCC]=1;var6[AAA][BBBB][CCC]=1;
13--GET-- 16--GET--
diff --git a/tests/filter/input_filter_request_max_name_length.phpt b/tests/filter/input_filter_request_max_name_length.phpt
index 03b4a3b..e231447 100644
--- a/tests/filter/input_filter_request_max_name_length.phpt
+++ b/tests/filter/input_filter_request_max_name_length.phpt
@@ -3,11 +3,14 @@ suhosin input filter (suhosin.request.max_varname_length)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.request.max_varname_length=4 11suhosin.request.max_varname_length=4
9--SKIPIF-- 12--SKIPIF--
10<?php include('skipif.inc'); ?> 13<?php include('../skipif.inc'); ?>
11--COOKIE-- 14--COOKIE--
12var=0;var1=1;var2[]=2;var3[xxx]=3;var04=4;var05[]=5;var06[xxx]=6; 15var=0;var1=1;var2[]=2;var3[xxx]=3;var04=4;var05[]=5;var06[xxx]=6;
13--GET-- 16--GET--
diff --git a/tests/filter/input_filter_request_max_totalname_length.phpt b/tests/filter/input_filter_request_max_totalname_length.phpt
index f028db1..e4ddd5b 100644
--- a/tests/filter/input_filter_request_max_totalname_length.phpt
+++ b/tests/filter/input_filter_request_max_totalname_length.phpt
@@ -3,11 +3,14 @@ suhosin input filter (suhosin.request.max_totalname_length)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.request.max_totalname_length=7 11suhosin.request.max_totalname_length=7
9--SKIPIF-- 12--SKIPIF--
10<?php include('skipif.inc'); ?> 13<?php include('../skipif.inc'); ?>
11--COOKIE-- 14--COOKIE--
12var=0;var1=1;var2[]=2;var3[xxx]=3;var04=4;var05[]=5;var06[xxx]=6; 15var=0;var1=1;var2[]=2;var3[xxx]=3;var04=4;var05[]=5;var06[xxx]=6;
13--GET-- 16--GET--
diff --git a/tests/filter/input_filter_request_max_value_length.phpt b/tests/filter/input_filter_request_max_value_length.phpt
index 6906fb0..7617ff2 100644
--- a/tests/filter/input_filter_request_max_value_length.phpt
+++ b/tests/filter/input_filter_request_max_value_length.phpt
@@ -3,11 +3,14 @@ suhosin input filter (suhosin.request.max_value_length)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.request.max_value_length=3 11suhosin.request.max_value_length=3
9--SKIPIF-- 12--SKIPIF--
10<?php include('skipif.inc'); ?> 13<?php include('../skipif.inc'); ?>
11--COOKIE-- 14--COOKIE--
12var1=1;var2=22;var3=333;var4=4444;var5=55%00555;var6=666666; 15var1=1;var2=22;var3=333;var4=4444;var5=55%00555;var6=666666;
13--GET-- 16--GET--
diff --git a/tests/filter/post_fileupload_filter_1.phpt b/tests/filter/post_fileupload_filter_1.phpt
index 453c38d..4cb67fd 100644
--- a/tests/filter/post_fileupload_filter_1.phpt
+++ b/tests/filter/post_fileupload_filter_1.phpt
@@ -3,12 +3,15 @@ suhosin rfc1867 file upload filter (disallowed variable names)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8file_uploads=1 11file_uploads=1
9upload_max_filesize=1024 12upload_max_filesize=1024
10--SKIPIF-- 13--SKIPIF--
11<?php include('skipif.inc'); ?> 14<?php include('../skipif.inc'); ?>
12--COOKIE-- 15--COOKIE--
13--GET-- 16--GET--
14--POST_RAW-- 17--POST_RAW--
diff --git a/tests/filter/post_fileupload_filter_2.phpt b/tests/filter/post_fileupload_filter_2.phpt
index 48c63dc..51064f2 100644
--- a/tests/filter/post_fileupload_filter_2.phpt
+++ b/tests/filter/post_fileupload_filter_2.phpt
@@ -3,13 +3,16 @@ suhosin rfc1867 file upload filter (suhosin.post.max_vars)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.post.max_vars=5 11suhosin.post.max_vars=5
9file_uploads=1 12file_uploads=1
10upload_max_filesize=1024 13upload_max_filesize=1024
11--SKIPIF-- 14--SKIPIF--
12<?php include('skipif.inc'); ?> 15<?php include('../skipif.inc'); ?>
13--COOKIE-- 16--COOKIE--
14--GET-- 17--GET--
15--POST_RAW-- 18--POST_RAW--
diff --git a/tests/filter/post_filter_1.phpt b/tests/filter/post_filter_1.phpt
index eee353d..61eee24 100644
--- a/tests/filter/post_filter_1.phpt
+++ b/tests/filter/post_filter_1.phpt
@@ -3,10 +3,13 @@ suhosin POST filter (disallowed variable names)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8--SKIPIF-- 11--SKIPIF--
9<?php include('skipif.inc'); ?> 12<?php include('../skipif.inc'); ?>
10--COOKIE-- 13--COOKIE--
11--GET-- 14--GET--
12--POST-- 15--POST--
diff --git a/tests/filter/post_filter_2.phpt b/tests/filter/post_filter_2.phpt
index 22e773a..b64ffd0 100644
--- a/tests/filter/post_filter_2.phpt
+++ b/tests/filter/post_filter_2.phpt
@@ -3,11 +3,14 @@ suhosin POST filter (suhosin.post.max_vars)
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.post.max_vars=5 11suhosin.post.max_vars=5
9--SKIPIF-- 12--SKIPIF--
10<?php include('skipif.inc'); ?> 13<?php include('../skipif.inc'); ?>
11--COOKIE-- 14--COOKIE--
12--GET-- 15--GET--
13--POST-- 16--POST--
diff --git a/tests/filter/post_filter_empty_var.phpt b/tests/filter/post_filter_empty_var.phpt
index f1eef0c..87866e2 100644
--- a/tests/filter/post_filter_empty_var.phpt
+++ b/tests/filter/post_filter_empty_var.phpt
@@ -6,7 +6,7 @@ suhosin.log.sapi=0
6suhosin.log.stdout=255 6suhosin.log.stdout=255
7suhosin.log.script=0 7suhosin.log.script=0
8--SKIPIF-- 8--SKIPIF--
9<?php include('skipif.inc'); ?> 9<?php include('../skipif.inc'); ?>
10--COOKIE-- 10--COOKIE--
11--GET-- 11--GET--
12--POST-- 12--POST--
diff --git a/tests/filter/server_encode_off.phpt b/tests/filter/server_encode_off.phpt
index 8daccea..69793fd 100644
--- a/tests/filter/server_encode_off.phpt
+++ b/tests/filter/server_encode_off.phpt
@@ -9,7 +9,7 @@ suhosin.log.stdout=255
9suhosin.log.script=0 9suhosin.log.script=0
10suhosin.server.encode=Off 10suhosin.server.encode=Off
11--SKIPIF-- 11--SKIPIF--
12<?php include('skipif.inc'); ?> 12<?php include('../skipif.inc'); ?>
13--ENV-- 13--ENV--
14return <<<END 14return <<<END
15REQUEST_URI=AAA<>"'`!AAA 15REQUEST_URI=AAA<>"'`!AAA
diff --git a/tests/filter/server_encode_on.phpt b/tests/filter/server_encode_on.phpt
index 4cd7a66..3b02ce4 100644
--- a/tests/filter/server_encode_on.phpt
+++ b/tests/filter/server_encode_on.phpt
@@ -9,7 +9,7 @@ suhosin.log.stdout=255
9suhosin.log.script=0 9suhosin.log.script=0
10suhosin.server.encode=On 10suhosin.server.encode=On
11--SKIPIF-- 11--SKIPIF--
12<?php include('skipif.inc'); ?> 12<?php include('../skipif.inc'); ?>
13--ENV-- 13--ENV--
14return <<<END 14return <<<END
15REQUEST_URI=AAA<>"'`!AAA 15REQUEST_URI=AAA<>"'`!AAA
diff --git a/tests/filter/server_filter.phpt b/tests/filter/server_filter.phpt
index b1271bd..f2afdf7 100644
--- a/tests/filter/server_filter.phpt
+++ b/tests/filter/server_filter.phpt
@@ -3,10 +3,13 @@ suhosin SERVER filter
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8--SKIPIF-- 11--SKIPIF--
9<?php include('skipif.inc'); ?> 12<?php include('../skipif.inc'); ?>
10--ENV-- 13--ENV--
11return <<<END 14return <<<END
12HTTP_POST_VARS=HTTP_POST_VARS 15HTTP_POST_VARS=HTTP_POST_VARS
diff --git a/tests/filter/server_strip_off.phpt b/tests/filter/server_strip_off.phpt
index 75c326e..57b2e97 100644
--- a/tests/filter/server_strip_off.phpt
+++ b/tests/filter/server_strip_off.phpt
@@ -9,7 +9,7 @@ suhosin.log.stdout=255
9suhosin.log.script=0 9suhosin.log.script=0
10suhosin.server.strip=Off 10suhosin.server.strip=Off
11--SKIPIF-- 11--SKIPIF--
12<?php include('skipif.inc'); ?> 12<?php include('../skipif.inc'); ?>
13--ENV-- 13--ENV--
14return <<<END 14return <<<END
15SCRIPT_NAME=X/index.php/THIS_IS_A_FAKE_NAME<>"'`!AAA 15SCRIPT_NAME=X/index.php/THIS_IS_A_FAKE_NAME<>"'`!AAA
diff --git a/tests/filter/server_strip_on.phpt b/tests/filter/server_strip_on.phpt
index c595e95..9e9d991 100644
--- a/tests/filter/server_strip_on.phpt
+++ b/tests/filter/server_strip_on.phpt
@@ -9,7 +9,7 @@ suhosin.log.stdout=255
9suhosin.log.script=0 9suhosin.log.script=0
10suhosin.server.strip=On 10suhosin.server.strip=On
11--SKIPIF-- 11--SKIPIF--
12<?php include('skipif.inc'); ?> 12<?php include('../skipif.inc'); ?>
13--ENV-- 13--ENV--
14return <<<END 14return <<<END
15SCRIPT_NAME=X/index.php/THIS_IS_A_FAKE_NAME<>"'`!AAA 15SCRIPT_NAME=X/index.php/THIS_IS_A_FAKE_NAME<>"'`!AAA
diff --git a/tests/filter/server_user_agent_strip_off.phpt b/tests/filter/server_user_agent_strip_off.phpt
index 36c6580..1f58007 100644
--- a/tests/filter/server_user_agent_strip_off.phpt
+++ b/tests/filter/server_user_agent_strip_off.phpt
@@ -9,7 +9,7 @@ suhosin.log.stdout=255
9suhosin.log.script=0 9suhosin.log.script=0
10suhosin.server.strip=Off 10suhosin.server.strip=Off
11--SKIPIF-- 11--SKIPIF--
12<?php include('skipif.inc'); ?> 12<?php include('../skipif.inc'); ?>
13--ENV-- 13--ENV--
14return <<<END 14return <<<END
15HTTP_USER_AGENT=Mozilla/5.0 (Windows NT 6.0; rv:29.0) <script>alert('123');</script>Gecko/20100101 Firefox/29.0 15HTTP_USER_AGENT=Mozilla/5.0 (Windows NT 6.0; rv:29.0) <script>alert('123');</script>Gecko/20100101 Firefox/29.0
diff --git a/tests/filter/server_user_agent_strip_on.phpt b/tests/filter/server_user_agent_strip_on.phpt
index 73d577c..df1d040 100644
--- a/tests/filter/server_user_agent_strip_on.phpt
+++ b/tests/filter/server_user_agent_strip_on.phpt
@@ -9,7 +9,7 @@ suhosin.log.stdout=255
9suhosin.log.script=0 9suhosin.log.script=0
10suhosin.server.strip=On 10suhosin.server.strip=On
11--SKIPIF-- 11--SKIPIF--
12<?php include('skipif.inc'); ?> 12<?php include('../skipif.inc'); ?>
13--ENV-- 13--ENV--
14return <<<END 14return <<<END
15HTTP_USER_AGENT=Mozilla/5.0 (Windows NT 6.0; rv:29.0) <script>alert('123');</script>Gecko/20100101 Firefox/29.0 15HTTP_USER_AGENT=Mozilla/5.0 (Windows NT 6.0; rv:29.0) <script>alert('123');</script>Gecko/20100101 Firefox/29.0
diff --git a/tests/filter/suhosin_upload_disallow_binary_off.phpt b/tests/filter/suhosin_upload_disallow_binary_off.phpt
index cde9ea7..bcb76be 100644
--- a/tests/filter/suhosin_upload_disallow_binary_off.phpt
+++ b/tests/filter/suhosin_upload_disallow_binary_off.phpt
Binary files differ
diff --git a/tests/filter/suhosin_upload_disallow_binary_on.phpt b/tests/filter/suhosin_upload_disallow_binary_on.phpt
index 1e3444e..bc2c7ea 100644
--- a/tests/filter/suhosin_upload_disallow_binary_on.phpt
+++ b/tests/filter/suhosin_upload_disallow_binary_on.phpt
Binary files differ
diff --git a/tests/filter/suhosin_upload_disallow_binary_utf8.phpt b/tests/filter/suhosin_upload_disallow_binary_utf8.phpt
index 557a8d5..c4f1bcc 100644
--- a/tests/filter/suhosin_upload_disallow_binary_utf8.phpt
+++ b/tests/filter/suhosin_upload_disallow_binary_utf8.phpt
@@ -11,7 +11,7 @@ suhosin.upload.allow_utf8=On
11max_file_uploads=40 11max_file_uploads=40
12suhosin.upload.max_uploads=40 12suhosin.upload.max_uploads=40
13--SKIPIF-- 13--SKIPIF--
14<?php include('skipif.inc'); ?> 14<?php include('../skipif.inc'); ?>
15--COOKIE-- 15--COOKIE--
16--GET-- 16--GET--
17--POST_RAW-- 17--POST_RAW--
diff --git a/tests/filter/suhosin_upload_disallow_binary_utf8fail.phpt b/tests/filter/suhosin_upload_disallow_binary_utf8fail.phpt
index 413d25a..1d7279d 100644
--- a/tests/filter/suhosin_upload_disallow_binary_utf8fail.phpt
+++ b/tests/filter/suhosin_upload_disallow_binary_utf8fail.phpt
@@ -3,15 +3,18 @@ Testing: suhosin.upload.disallow_binary=On with UTF-8 and allow_utf8=Off
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8file_uploads=1 11file_uploads=1
9suhosin.upload.disallow_binary=On 12suhosin.upload.disallow_binary=On
10suhosin.upload.allow_utf8=Off 13suhosin.upload.allow_utf8=Off
11max_file_uploads=40 14max_file_uploads=40
12suhosin.upload.max_uploads=40 15suhosin.upload.max_uploads=40
13--SKIPIF-- 16--SKIPIF--
14<?php include('skipif.inc'); ?> 17<?php include('../skipif.inc'); ?>
15--COOKIE-- 18--COOKIE--
16--GET-- 19--GET--
17--POST_RAW-- 20--POST_RAW--
diff --git a/tests/filter/suhosin_upload_disallow_elf.phpt b/tests/filter/suhosin_upload_disallow_elf.phpt
index 4ad2071..7b074f7 100644
--- a/tests/filter/suhosin_upload_disallow_elf.phpt
+++ b/tests/filter/suhosin_upload_disallow_elf.phpt
@@ -3,12 +3,15 @@ Testing: suhosin.upload.disallow_elf=On
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8file_uploads=1 11file_uploads=1
9suhosin.upload.disallow_elf=On 12suhosin.upload.disallow_elf=On
10--SKIPIF-- 13--SKIPIF--
11<?php include('skipif.inc'); ?> 14<?php include('../skipif.inc'); ?>
12--COOKIE-- 15--COOKIE--
13--GET-- 16--GET--
14--POST_RAW-- 17--POST_RAW--
diff --git a/tests/filter/suhosin_upload_disallow_elf_off.phpt b/tests/filter/suhosin_upload_disallow_elf_off.phpt
index 8be8301..832692c 100644
--- a/tests/filter/suhosin_upload_disallow_elf_off.phpt
+++ b/tests/filter/suhosin_upload_disallow_elf_off.phpt
@@ -8,7 +8,7 @@ suhosin.log.script=0
8file_uploads=1 8file_uploads=1
9suhosin.upload.disallow_elf=Off 9suhosin.upload.disallow_elf=Off
10--SKIPIF-- 10--SKIPIF--
11<?php include('skipif.inc'); ?> 11<?php include('../skipif.inc'); ?>
12--COOKIE-- 12--COOKIE--
13--GET-- 13--GET--
14--POST_RAW-- 14--POST_RAW--
diff --git a/tests/filter/suhosin_upload_max_uploads.phpt b/tests/filter/suhosin_upload_max_uploads.phpt
index 2e984bc..fb6f249 100644
--- a/tests/filter/suhosin_upload_max_uploads.phpt
+++ b/tests/filter/suhosin_upload_max_uploads.phpt
@@ -3,13 +3,16 @@ suhosin.upload.max_uploads
3--INI-- 3--INI--
4suhosin.log.syslog=0 4suhosin.log.syslog=0
5suhosin.log.sapi=0 5suhosin.log.sapi=0
6suhosin.log.stdout=255
7suhosin.log.script=0 6suhosin.log.script=0
7suhosin.log.file=255
8suhosin.log.file.time=0
9suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
10auto_append_file={PWD}/suhosintest.$$.log.tmp
8suhosin.post.max_vars=5 11suhosin.post.max_vars=5
9file_uploads=1 12file_uploads=1
10suhosin.upload.max_uploads=3 13suhosin.upload.max_uploads=3
11--SKIPIF-- 14--SKIPIF--
12<?php include('skipif.inc'); ?> 15<?php include('../skipif.inc'); ?>
13--COOKIE-- 16--COOKIE--
14--GET-- 17--GET--
15--POST_RAW-- 18--POST_RAW--
diff --git a/tests/filter/suhosin_upload_remove_binary.phpt b/tests/filter/suhosin_upload_remove_binary.phpt
index f4337d9..8d158c3 100644
--- a/tests/filter/suhosin_upload_remove_binary.phpt
+++ b/tests/filter/suhosin_upload_remove_binary.phpt
Binary files differ
diff --git a/tests/filter/suhosin_upload_remove_binary_utf8.phpt b/tests/filter/suhosin_upload_remove_binary_utf8.phpt
index 6fbd240..0a8e097 100644
--- a/tests/filter/suhosin_upload_remove_binary_utf8.phpt
+++ b/tests/filter/suhosin_upload_remove_binary_utf8.phpt
@@ -12,7 +12,7 @@ suhosin.upload.allow_utf8=On
12max_file_uploads=40 12max_file_uploads=40
13suhosin.upload.max_uploads=40 13suhosin.upload.max_uploads=40
14--SKIPIF-- 14--SKIPIF--
15<?php include('skipif.inc'); ?> 15<?php include('../skipif.inc'); ?>
16--COOKIE-- 16--COOKIE--
17--GET-- 17--GET--
18--POST_RAW-- 18--POST_RAW--
diff --git a/tests/filter/suhosin_upload_remove_binary_utf8fail.phpt b/tests/filter/suhosin_upload_remove_binary_utf8fail.phpt
index 5c31115..4c9fcbc 100644
--- a/tests/filter/suhosin_upload_remove_binary_utf8fail.phpt
+++ b/tests/filter/suhosin_upload_remove_binary_utf8fail.phpt
@@ -12,7 +12,7 @@ suhosin.upload.allow_utf8=Off
12max_file_uploads=40 12max_file_uploads=40
13suhosin.upload.max_uploads=40 13suhosin.upload.max_uploads=40
14--SKIPIF-- 14--SKIPIF--
15<?php include('skipif.inc'); ?> 15<?php include('../skipif.inc'); ?>
16--COOKIE-- 16--COOKIE--
17--GET-- 17--GET--
18--POST_RAW-- 18--POST_RAW--
diff --git a/tests/include/include_uploaded_file_diff_filename.phpt b/tests/include/include_uploaded_file_diff_filename.phpt
index 8d3bca5..2c28340 100644
--- a/tests/include/include_uploaded_file_diff_filename.phpt
+++ b/tests/include/include_uploaded_file_diff_filename.phpt
@@ -5,9 +5,8 @@ Testing include file from $_FILES (but change name a bit)
5--INI-- 5--INI--
6suhosin.log.syslog=0 6suhosin.log.syslog=0
7suhosin.log.sapi=0 7suhosin.log.sapi=0
8suhosin.log.stdout=255
9suhosin.log.script=0 8suhosin.log.script=0
10suhosin.log.phpscript=0 9suhosin.log.stdout=255
11suhosin.executor.include.whitelist= 10suhosin.executor.include.whitelist=
12suhosin.executor.include.blacklist= 11suhosin.executor.include.blacklist=
13--POST_RAW-- 12--POST_RAW--
diff --git a/tests/include/include_uploaded_file_from_FILES.phpt b/tests/include/include_uploaded_file_from_FILES.phpt
index 1ec20f3..2c782b4 100644
--- a/tests/include/include_uploaded_file_from_FILES.phpt
+++ b/tests/include/include_uploaded_file_from_FILES.phpt
@@ -5,9 +5,8 @@ Testing include file from $_FILES
5--INI-- 5--INI--
6suhosin.log.syslog=0 6suhosin.log.syslog=0
7suhosin.log.sapi=0 7suhosin.log.sapi=0
8suhosin.log.stdout=255
9suhosin.log.script=0 8suhosin.log.script=0
10suhosin.log.phpscript=0 9suhosin.log.stdout=255
11suhosin.executor.include.whitelist= 10suhosin.executor.include.whitelist=
12suhosin.executor.include.blacklist= 11suhosin.executor.include.blacklist=
13--POST_RAW-- 12--POST_RAW--
diff --git a/tests/logging/use_x_forwarded_for_off.phpt b/tests/logging/use_x_forwarded_for_off.phpt
index 6b31d53..2820523 100644
--- a/tests/logging/use_x_forwarded_for_off.phpt
+++ b/tests/logging/use_x_forwarded_for_off.phpt
@@ -3,12 +3,16 @@ Testing: suhosin.log.use-x-forwarded-for=Off
3--SKIPIF-- 3--SKIPIF--
4<?php include "../skipifnotcli.inc"; ?> 4<?php include "../skipifnotcli.inc"; ?>
5--INI-- 5--INI--
6suhosin.log.syslog=0
6suhosin.log.sapi=0 7suhosin.log.sapi=0
7suhosin.log.stdout=255
8suhosin.log.script=0 8suhosin.log.script=0
9suhosin.log.syslog=0 9suhosin.log.file=255
10suhosin.log.file.time=0
11suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
12auto_append_file={PWD}/suhosintest.$$.log.tmp
10suhosin.executor.func.blacklist=max 13suhosin.executor.func.blacklist=max
11suhosin.log.use-x-forwarded-for=Off 14suhosin.log.use-x-forwarded-for=Off
15suhosin.simulation=1
12--ENV-- 16--ENV--
13return <<<END 17return <<<END
14REMOTE_ADDR=101.102.103.104 18REMOTE_ADDR=101.102.103.104
@@ -19,5 +23,5 @@ END;
19 max(1,2); 23 max(1,2);
20?> 24?>
21--EXPECTF-- 25--EXPECTF--
22Warning: max() has been disabled for security reasons in %s on line 2 26Warning: SIMULATION - max() has been disabled for security reasons in %s on line 2
23ALERT - function within blacklist called: max() (attacker '101.102.103.104', file '%s', line 2) \ No newline at end of file 27ALERT-SIMULATION - function within blacklist called: max() (attacker '101.102.103.104', file '%s', line 2) \ No newline at end of file
diff --git a/tests/logging/use_x_forwarded_for_off_no_remote_addr.phpt b/tests/logging/use_x_forwarded_for_off_no_remote_addr.phpt
index bd4c72b..1a30e81 100644
--- a/tests/logging/use_x_forwarded_for_off_no_remote_addr.phpt
+++ b/tests/logging/use_x_forwarded_for_off_no_remote_addr.phpt
@@ -3,16 +3,20 @@ Testing: suhosin.log.use-x-forwarded-for=Off (without REMOTE_ADDR set)
3--SKIPIF-- 3--SKIPIF--
4<?php include "../skipifnotcli.inc"; ?> 4<?php include "../skipifnotcli.inc"; ?>
5--INI-- 5--INI--
6suhosin.log.syslog=0
6suhosin.log.sapi=0 7suhosin.log.sapi=0
7suhosin.log.stdout=255
8suhosin.log.script=0 8suhosin.log.script=0
9suhosin.log.syslog=0 9suhosin.log.file=255
10suhosin.log.file.time=0
11suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
12auto_append_file={PWD}/suhosintest.$$.log.tmp
10suhosin.executor.func.blacklist=max 13suhosin.executor.func.blacklist=max
11suhosin.log.use-x-forwarded-for=Off 14suhosin.log.use-x-forwarded-for=Off
15suhosin.simulation=1
12--FILE-- 16--FILE--
13<?php 17<?php
14 max(1,2); 18 max(1,2);
15?> 19?>
16--EXPECTF-- 20--EXPECTF--
17Warning: max() has been disabled for security reasons in %s on line 2 21Warning: SIMULATION - max() has been disabled for security reasons in %s on line 2
18ALERT - function within blacklist called: max() (attacker 'REMOTE_ADDR not set', file '%s', line 2) \ No newline at end of file 22ALERT-SIMULATION - function within blacklist called: max() (attacker 'REMOTE_ADDR not set', file '%s', line 2) \ No newline at end of file
diff --git a/tests/logging/use_x_forwarded_for_on.phpt b/tests/logging/use_x_forwarded_for_on.phpt
index 5f37ca9..e476ba7 100644
--- a/tests/logging/use_x_forwarded_for_on.phpt
+++ b/tests/logging/use_x_forwarded_for_on.phpt
@@ -3,12 +3,16 @@ Testing: suhosin.log.use-x-forwarded-for=On
3--SKIPIF-- 3--SKIPIF--
4<?php include "../skipifnotcli.inc"; ?> 4<?php include "../skipifnotcli.inc"; ?>
5--INI-- 5--INI--
6suhosin.log.syslog=0
6suhosin.log.sapi=0 7suhosin.log.sapi=0
7suhosin.log.stdout=255
8suhosin.log.script=0 8suhosin.log.script=0
9suhosin.log.syslog=0 9suhosin.log.file=255
10suhosin.log.file.time=0
11suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
12auto_append_file={PWD}/suhosintest.$$.log.tmp
10suhosin.executor.func.blacklist=max 13suhosin.executor.func.blacklist=max
11suhosin.log.use-x-forwarded-for=On 14suhosin.log.use-x-forwarded-for=On
15suhosin.simulation=1
12--ENV-- 16--ENV--
13return <<<END 17return <<<END
14REMOTE_ADDR=101.102.103.104 18REMOTE_ADDR=101.102.103.104
@@ -19,5 +23,5 @@ END;
19 max(1,2); 23 max(1,2);
20?> 24?>
21--EXPECTF-- 25--EXPECTF--
22Warning: max() has been disabled for security reasons in %s on line 2 26Warning: SIMULATION - max() has been disabled for security reasons in %s on line 2
23ALERT - function within blacklist called: max() (attacker '1.2.3.4', file '%s', line 2) \ No newline at end of file 27ALERT-SIMULATION - function within blacklist called: max() (attacker '1.2.3.4', file '%s', line 2) \ No newline at end of file
diff --git a/tests/logging/use_x_forwarded_for_on_no_x_forwarded.phpt b/tests/logging/use_x_forwarded_for_on_no_x_forwarded.phpt
index aea6e06..b3e26de 100644
--- a/tests/logging/use_x_forwarded_for_on_no_x_forwarded.phpt
+++ b/tests/logging/use_x_forwarded_for_on_no_x_forwarded.phpt
@@ -3,16 +3,20 @@ Testing: suhosin.log.use-x-forwarded-for=On (without X-Forwarded-For set)
3--SKIPIF-- 3--SKIPIF--
4<?php include "../skipifnotcli.inc"; ?> 4<?php include "../skipifnotcli.inc"; ?>
5--INI-- 5--INI--
6suhosin.log.syslog=0
6suhosin.log.sapi=0 7suhosin.log.sapi=0
7suhosin.log.stdout=255
8suhosin.log.script=0 8suhosin.log.script=0
9suhosin.log.syslog=0 9suhosin.log.file=255
10suhosin.log.file.time=0
11suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
12auto_append_file={PWD}/suhosintest.$$.log.tmp
10suhosin.executor.func.blacklist=max 13suhosin.executor.func.blacklist=max
11suhosin.log.use-x-forwarded-for=On 14suhosin.log.use-x-forwarded-for=On
15suhosin.simulation=1
12--FILE-- 16--FILE--
13<?php 17<?php
14 max(1,2); 18 max(1,2);
15?> 19?>
16--EXPECTF-- 20--EXPECTF--
17Warning: max() has been disabled for security reasons in %s on line 2 21Warning: SIMULATION - max() has been disabled for security reasons in %s on line 2
18ALERT - function within blacklist called: max() (attacker 'X-FORWARDED-FOR not set', file '%s', line 2) \ No newline at end of file 22ALERT-SIMULATION - function within blacklist called: max() (attacker 'X-FORWARDED-FOR not set', file '%s', line 2) \ No newline at end of file
diff --git a/tests/sql/mysqli_comment_conditional.phpt b/tests/sql/mysqli_comment_conditional.phpt
index 0436c64..02366c0 100644
--- a/tests/sql/mysqli_comment_conditional.phpt
+++ b/tests/sql/mysqli_comment_conditional.phpt
@@ -11,7 +11,7 @@ suhosin.log.stdout=32
11--SKIPIF-- 11--SKIPIF--
12<?php 12<?php
13include('skipifmysqli.inc'); 13include('skipifmysqli.inc');
14include('skipif.inc'); 14include('../skipif.inc');
15?> 15?>
16--FILE-- 16--FILE--
17<?php 17<?php
diff --git a/tests/sql/mysqli_comment_cstyle_fail.phpt b/tests/sql/mysqli_comment_cstyle_fail.phpt
index 56a8ccb..5a4c5e7 100644
--- a/tests/sql/mysqli_comment_cstyle_fail.phpt
+++ b/tests/sql/mysqli_comment_cstyle_fail.phpt
@@ -11,7 +11,7 @@ suhosin.log.stdout=32
11--SKIPIF-- 11--SKIPIF--
12<?php 12<?php
13include('skipifmysqli.inc'); 13include('skipifmysqli.inc');
14include('skipif.inc'); 14include('../skipif.inc');
15?> 15?>
16--FILE-- 16--FILE--
17<?php 17<?php
diff --git a/tests/sql/mysqli_comment_hashstyle_fail.phpt b/tests/sql/mysqli_comment_hashstyle_fail.phpt
index 6f5b517..c67cf44 100644
--- a/tests/sql/mysqli_comment_hashstyle_fail.phpt
+++ b/tests/sql/mysqli_comment_hashstyle_fail.phpt
@@ -11,7 +11,7 @@ suhosin.log.stdout=32
11--SKIPIF-- 11--SKIPIF--
12<?php 12<?php
13include('skipifmysqli.inc'); 13include('skipifmysqli.inc');
14include('skipif.inc'); 14include('../skipif.inc');
15?> 15?>
16--FILE-- 16--FILE--
17<?php 17<?php
diff --git a/tests/sql/mysqli_comment_sqlstyle.phpt b/tests/sql/mysqli_comment_sqlstyle.phpt
index c32c76a..d0e454e 100644
--- a/tests/sql/mysqli_comment_sqlstyle.phpt
+++ b/tests/sql/mysqli_comment_sqlstyle.phpt
@@ -11,7 +11,7 @@ suhosin.log.stdout=32
11--SKIPIF-- 11--SKIPIF--
12<?php 12<?php
13include('skipifmysqli.inc'); 13include('skipifmysqli.inc');
14include('skipif.inc'); 14include('../skipif.inc');
15?> 15?>
16--FILE-- 16--FILE--
17<?php 17<?php
diff --git a/tests/sql/mysqli_comment_sqlstyle_fail.phpt b/tests/sql/mysqli_comment_sqlstyle_fail.phpt
index 83e63c5..9894d96 100644
--- a/tests/sql/mysqli_comment_sqlstyle_fail.phpt
+++ b/tests/sql/mysqli_comment_sqlstyle_fail.phpt
@@ -11,7 +11,7 @@ suhosin.log.stdout=32
11--SKIPIF-- 11--SKIPIF--
12<?php 12<?php
13include('skipifmysqli.inc'); 13include('skipifmysqli.inc');
14include('skipif.inc'); 14include('../skipif.inc');
15?> 15?>
16--FILE-- 16--FILE--
17<?php 17<?php
diff --git a/tests/sql/mysqli_connect_invalid_username.phpt b/tests/sql/mysqli_connect_invalid_username.phpt
index 532254f..c83bf1e 100644
--- a/tests/sql/mysqli_connect_invalid_username.phpt
+++ b/tests/sql/mysqli_connect_invalid_username.phpt
@@ -6,7 +6,7 @@ suhosin.log.stdout=32
6--SKIPIF-- 6--SKIPIF--
7<?php 7<?php
8include('skipifmysqli.inc'); 8include('skipifmysqli.inc');
9include('skipif.inc'); 9include('../skipif.inc');
10?> 10?>
11--FILE-- 11--FILE--
12<?php 12<?php
diff --git a/tests/sql/mysqli_multiselect.phpt b/tests/sql/mysqli_multiselect.phpt
index 63d6c19..2595441 100644
--- a/tests/sql/mysqli_multiselect.phpt
+++ b/tests/sql/mysqli_multiselect.phpt
@@ -11,7 +11,7 @@ suhosin.log.stdout=32
11--SKIPIF-- 11--SKIPIF--
12<?php 12<?php
13include('skipifmysqli.inc'); 13include('skipifmysqli.inc');
14include('skipif.inc'); 14include('../skipif.inc');
15?> 15?>
16--FILE-- 16--FILE--
17<?php 17<?php
diff --git a/tests/sql/mysqli_multiselect_fail.phpt b/tests/sql/mysqli_multiselect_fail.phpt
index 2bee62a..9f4216f 100644
--- a/tests/sql/mysqli_multiselect_fail.phpt
+++ b/tests/sql/mysqli_multiselect_fail.phpt
@@ -11,7 +11,7 @@ suhosin.log.stdout=32
11--SKIPIF-- 11--SKIPIF--
12<?php 12<?php
13include('skipifmysqli.inc'); 13include('skipifmysqli.inc');
14include('skipif.inc'); 14include('../skipif.inc');
15?> 15?>
16--FILE-- 16--FILE--
17<?php 17<?php
diff --git a/tests/sql/mysqli_multiselect_subselect.phpt b/tests/sql/mysqli_multiselect_subselect.phpt
index e629720..6308cfa 100644
--- a/tests/sql/mysqli_multiselect_subselect.phpt
+++ b/tests/sql/mysqli_multiselect_subselect.phpt
@@ -11,7 +11,7 @@ suhosin.log.stdout=32
11--SKIPIF-- 11--SKIPIF--
12<?php 12<?php
13include('skipifmysqli.inc'); 13include('skipifmysqli.inc');
14include('skipif.inc'); 14include('../skipif.inc');
15?> 15?>
16--FILE-- 16--FILE--
17<?php 17<?php
diff --git a/tests/sql/mysqli_no_constraints.phpt b/tests/sql/mysqli_no_constraints.phpt
index 1d7fff6..1ba2875 100644
--- a/tests/sql/mysqli_no_constraints.phpt
+++ b/tests/sql/mysqli_no_constraints.phpt
@@ -11,7 +11,7 @@ suhosin.sql.union=0
11--SKIPIF-- 11--SKIPIF--
12<?php 12<?php
13include('skipifmysqli.inc'); 13include('skipifmysqli.inc');
14include('skipif.inc'); 14include('../skipif.inc');
15?> 15?>
16--FILE-- 16--FILE--
17<?php 17<?php
diff --git a/tests/sql/mysqli_open_comment.phpt b/tests/sql/mysqli_open_comment.phpt
index 29d3536..e65ebd5 100644
--- a/tests/sql/mysqli_open_comment.phpt
+++ b/tests/sql/mysqli_open_comment.phpt
@@ -11,7 +11,7 @@ suhosin.log.stdout=32
11--SKIPIF-- 11--SKIPIF--
12<?php 12<?php
13include('skipifmysqli.inc'); 13include('skipifmysqli.inc');
14include('skipif.inc'); 14include('../skipif.inc');
15?> 15?>
16--FILE-- 16--FILE--
17<?php 17<?php
diff --git a/tests/sql/mysqli_open_comment_fail.phpt b/tests/sql/mysqli_open_comment_fail.phpt
index 4645523..a898153 100644
--- a/tests/sql/mysqli_open_comment_fail.phpt
+++ b/tests/sql/mysqli_open_comment_fail.phpt
@@ -11,7 +11,7 @@ suhosin.log.stdout=32
11--SKIPIF-- 11--SKIPIF--
12<?php 12<?php
13include('skipifmysqli.inc'); 13include('skipifmysqli.inc');
14include('skipif.inc'); 14include('../skipif.inc');
15?> 15?>
16--FILE-- 16--FILE--
17<?php 17<?php
diff --git a/tests/sql/mysqli_union.phpt b/tests/sql/mysqli_union.phpt
index 9af9c61..77eb8e4 100644
--- a/tests/sql/mysqli_union.phpt
+++ b/tests/sql/mysqli_union.phpt
@@ -11,7 +11,7 @@ suhosin.log.stdout=32
11--SKIPIF-- 11--SKIPIF--
12<?php 12<?php
13include('skipifmysqli.inc'); 13include('skipifmysqli.inc');
14include('skipif.inc'); 14include('../skipif.inc');
15?> 15?>
16--FILE-- 16--FILE--
17<?php 17<?php
diff --git a/tests/sql/mysqli_union_fail.phpt b/tests/sql/mysqli_union_fail.phpt
index ee51a79..ddcfd0e 100644
--- a/tests/sql/mysqli_union_fail.phpt
+++ b/tests/sql/mysqli_union_fail.phpt
@@ -11,7 +11,7 @@ suhosin.log.stdout=32
11--SKIPIF-- 11--SKIPIF--
12<?php 12<?php
13include('skipifmysqli.inc'); 13include('skipifmysqli.inc');
14include('skipif.inc'); 14include('../skipif.inc');
15?> 15?>
16--FILE-- 16--FILE--
17<?php 17<?php
diff --git a/tests/sql/mysqli_user_match_error.phpt b/tests/sql/mysqli_user_match_error.phpt
index 69db081..a8d1068 100644
--- a/tests/sql/mysqli_user_match_error.phpt
+++ b/tests/sql/mysqli_user_match_error.phpt
@@ -7,7 +7,7 @@ suhosin.log.stdout=32
7--SKIPIF-- 7--SKIPIF--
8<?php 8<?php
9include('skipifmysqli.inc'); 9include('skipifmysqli.inc');
10include('skipif.inc'); 10include('../skipif.inc');
11?> 11?>
12--FILE-- 12--FILE--
13<?php 13<?php
diff --git a/tests/sql/mysqli_user_match_ok.phpt b/tests/sql/mysqli_user_match_ok.phpt
index a2ad832..a1365ed 100644
--- a/tests/sql/mysqli_user_match_ok.phpt
+++ b/tests/sql/mysqli_user_match_ok.phpt
@@ -7,7 +7,7 @@ suhosin.log.stdout=32
7--SKIPIF-- 7--SKIPIF--
8<?php 8<?php
9include('skipifmysqli.inc'); 9include('skipifmysqli.inc');
10include('skipif.inc'); 10include('../skipif.inc');
11?> 11?>
12--FILE-- 12--FILE--
13<?php 13<?php
diff --git a/tests/sql/mysqli_user_postfix.phpt b/tests/sql/mysqli_user_postfix.phpt
index 11e3fe6..90be13f 100644
--- a/tests/sql/mysqli_user_postfix.phpt
+++ b/tests/sql/mysqli_user_postfix.phpt
@@ -7,7 +7,7 @@ suhosin.log.stdout=32
7--SKIPIF-- 7--SKIPIF--
8<?php 8<?php
9include('skipifmysqli.inc'); 9include('skipifmysqli.inc');
10include('skipif.inc'); 10include('../skipif.inc');
11?> 11?>
12--FILE-- 12--FILE--
13<?php 13<?php
diff --git a/tests/sql/mysqli_user_prefix.phpt b/tests/sql/mysqli_user_prefix.phpt
index bb229f0..5ec793f 100644
--- a/tests/sql/mysqli_user_prefix.phpt
+++ b/tests/sql/mysqli_user_prefix.phpt
@@ -7,7 +7,7 @@ suhosin.log.stdout=32
7--SKIPIF-- 7--SKIPIF--
8<?php 8<?php
9include('skipifmysqli.inc'); 9include('skipifmysqli.inc');
10include('skipif.inc'); 10include('../skipif.inc');
11?> 11?>
12--FILE-- 12--FILE--
13<?php 13<?php
diff --git a/tests/sql/skipifmysqli.inc b/tests/sql/skipifmysqli.inc
index ee16cf1..99c235d 100644
--- a/tests/sql/skipifmysqli.inc
+++ b/tests/sql/skipifmysqli.inc
@@ -2,4 +2,7 @@
2if (!extension_loaded("mysqli")) { 2if (!extension_loaded("mysqli")) {
3 die('skip - mysqli extension not available'); 3 die('skip - mysqli extension not available');
4} 4}
5if (!getenv("TEST_SUHOSIN_MYSQL")) {
6 die("skip TEST_SUHOSIN_MYSQL is not set");
7}
5?> \ No newline at end of file 8?> \ No newline at end of file