95 files changed, 452 insertions, 161 deletions

diff --git a/.gitignore b/.gitignore
index ddb1030..e243bfb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,4 +25,4 @@
 /modules/
 /run-tests.php
 /suhosin.la
-
+/tests/*/*.tmp
diff --git a/log.c b/log.c
index fbea503..1a4c783 100644
--- a/log.c
+++ b/log.c
@@ -261,10 +261,14 @@ log_file:
             return;
         }
 
-        gettimeofday(&tv, NULL);
-        now = tv.tv_sec;
-        php_localtime_r(&now, &tm);
-        ap_php_snprintf(error, sizeof(error), "%s %2d %02d:%02d:%02d [%u] %s\n", month_names[tm.tm_mon], tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec, getpid(),buf);
+        if (SUHOSIN_G(log_file_time)) {
+                gettimeofday(&tv, NULL);
+                now = tv.tv_sec;
+                php_localtime_r(&now, &tm);
+                ap_php_snprintf(error, sizeof(error), "%s %2d %02d:%02d:%02d [%u] %s\n", month_names[tm.tm_mon], tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec, getpid(),buf);
+        } else {
+                ap_php_snprintf(error, sizeof(error), "%s\n", buf);
+        }
         towrite = strlen(error);
         wbuf = error;
         php_flock(fd, LOCK_EX);
@@ -290,7 +294,7 @@ log_sapi:
 #endif
         }
         if ((SUHOSIN_G(log_stdout) & loglevel)!=0) {
-                printf("%s\n", buf);
+                fprintf(stdout, "%s\n", buf);
         }
 
 /*log_script:*/
diff --git a/php_suhosin.h b/php_suhosin.h
index 7be628a..28a88eb 100644
--- a/php_suhosin.h
+++ b/php_suhosin.h
@@ -252,7 +252,9 @@ ZEND_BEGIN_MODULE_GLOBALS(suhosin)
         zend_bool  upload_disallow_elf;
         zend_bool  upload_disallow_binary;
         zend_bool  upload_remove_binary;
+#ifdef SUHOSIN_EXPERIMENTAL
         zend_bool  upload_allow_utf8;
+#endif
         char *upload_verification_script;
         
         zend_bool  no_more_variables;
@@ -277,6 +279,7 @@ ZEND_BEGIN_MODULE_GLOBALS(suhosin)
         zend_bool log_phpscript_is_safe;
         long    log_file;
         char    *log_filename;
+        zend_bool log_file_time;
 
 /*      header handler */
         zend_bool allow_multiheader;
diff --git a/pkg/build_deb.sh b/pkg/build_deb.sh
new file mode 100755
index 0000000..d4a44fa
--- /dev/null
+++ b/pkg/build_deb.sh
@@ -0,0 +1,119 @@
+#!/bin/bash
+
+_exit() {
+        echo "[E] bye."
+        exit 1
+}
+
+yn_or_exit() {
+        echo -n "[?] OK? [y] "
+        read yn
+        if [ "$yn" != "" -a "$yn" != "y" ]; then
+                _exit
+        fi
+}
+
+##
+
+echo "[*] checking prerequisites..."
+for i in phpize make install fakeroot php-config dpkg-deb dpkg-architecture; do
+        if [ "`which $i`" == "" ]; then
+                echo "[E] please install '$i' and try again."
+                _exit
+        fi
+done
+
+##
+
+HERE=`(cd $(dirname $0); pwd)`
+SUHOSIN=$HERE/..
+ROOT=$HERE/tmp
+PKGDIR=$HERE
+PHP_EX=`php-config --extension-dir`
+eval `dpkg-architecture -l`
+VERSION=${SUHOSIN_VERSION:-$1}
+
+if [ "$VERSION" == "" ]; then
+        echo "[E] please set SUHOSIN_VERSION, e.g. $0 0.9.36-1~dev1"
+        _exit
+fi
+
+echo "[*] -----------------------------------------------------------"
+echo "[+]         suhosin dir: $SUHOSIN"
+echo "[+]             tmp dir: $ROOT"
+echo "[+]   PHP extension dir: $PHP_EX"
+echo "[+]        architecture: $DEB_HOST_ARCH"
+echo "[+] suhosin deb version: $VERSION"
+echo "[+]      pkg output dir: $PKGDIR"
+yn_or_exit
+
+if [ ! -f "$SUHOSIN/modules/suhosin.so" ]; then
+        echo "[+] Cannot find suhosin.so. I will try to build it."
+        yn_or_exit
+        
+        if [ ! -f "$SUHOSIN/configure" ]; then
+                echo "[*] phpize"
+                cd $SUHOSIN
+                phpize || _exit
+        fi
+        
+        if [ ! -f "$SUHOSIN/Makefile" ]; then
+                echo "[*] configure"
+                cd $SUHOSIN
+                ./configure --enable-suhosin-experimental
+        fi
+        
+        echo "[*] make"
+        make clean
+        make -C $SUHOSIN || _exit
+fi
+
+##
+
+echo "[*] deb"
+
+if [ -d "$ROOT" ]; then
+        echo "[+] tmp dir $ROOT already exists. Delete?"
+        yn_or_exit
+        rm -rf $ROOT
+fi
+
+##
+
+mkdir -p $ROOT/DEBIAN
+echo "9" >$ROOT/DEBIAN/compat
+cat >$ROOT/DEBIAN/control <<EOF
+Package: php5-suhosin-extension
+Section: php
+Priority: extra
+Maintainer: Ben Fuhrmannek <ben@sektioneins.de>
+Homepage: http://www.suhosin.org/
+Conflicts: php5-suhosin
+Description: advanced protection system for PHP5
+ This package provides a PHP hardening module.
+ .
+ Suhosin is an advanced protection system for PHP installations. It was
+ designed to protect servers and users from known and unknown flaws in PHP
+ applications and the PHP core. Suhosin comes in two independent parts, that
+ can be used separately or in combination. The first part is a small patch
+ against the PHP core, that implements a few low-level protections against
+ bufferoverflows or format string vulnerabilities and the second part is a
+ powerful PHP extension that implements all the other protections.
+ .
+ This Package provides the suhosin extension only.
+EOF
+
+echo "Architecture: $DEB_HOST_ARCH" >>$ROOT/DEBIAN/control
+echo "Version: $VERSION" >>$ROOT/DEBIAN/control
+
+install -d -g 0 -o 0 $ROOT$PHP_EX
+install -g 0 -o 0 $SUHOSIN/modules/suhosin.so $ROOT$PHP_EX
+install -d -g 0 -o 0 $ROOT/usr/share/doc/php5-suhosin-extension
+install -g 0 -o 0 -m 644 $SUHOSIN/suhosin.ini $ROOT/usr/share/doc/php5-suhosin-extension/suhosin.ini.example
+install -d -g 0 -o 0 $ROOT/etc/php5/mods-available
+sed -e 's/^;extension=/extension=/' $SUHOSIN/suhosin.ini >$ROOT/etc/php5/mods-available/suhosin.ini
+chown root:root $ROOT/etc/php5/mods-available/suhosin.ini
+
+fakeroot dpkg-deb -b $ROOT $PKGDIR
+
+echo "[*] done."
diff --git a/suhosin.c b/suhosin.c
index 4a965ac..81711b1 100644
--- a/suhosin.c
+++ b/suhosin.c
@@ -750,6 +750,7 @@ static zend_ini_entry shared_ini_entries[] = {
         STD_ZEND_INI_ENTRY("suhosin.log.phpscript.name",                        NULL,           ZEND_INI_PERDIR|ZEND_INI_SYSTEM,        OnUpdateLogString, log_phpscriptname, zend_suhosin_globals, suhosin_globals)
         ZEND_INI_ENTRY("suhosin.log.file",                      "0",            ZEND_INI_PERDIR|ZEND_INI_SYSTEM,        OnUpdateSuhosin_log_file)
         STD_ZEND_INI_ENTRY("suhosin.log.file.name",             NULL,           ZEND_INI_PERDIR|ZEND_INI_SYSTEM,        OnUpdateLogString, log_filename, zend_suhosin_globals, suhosin_globals)
+        STD_ZEND_INI_BOOLEAN("suhosin.log.file.time",                   "1",            ZEND_INI_PERDIR|ZEND_INI_SYSTEM,        OnUpdateLogBool, log_file_time, zend_suhosin_globals,   suhosin_globals)
         STD_ZEND_INI_BOOLEAN("suhosin.log.phpscript.is_safe",                   "0",            ZEND_INI_PERDIR|ZEND_INI_SYSTEM,        OnUpdateLogBool, log_phpscript_is_safe, zend_suhosin_globals,   suhosin_globals)
 ZEND_INI_END()
  
@@ -826,7 +827,9 @@ PHP_INI_BEGIN()
         STD_PHP_INI_ENTRY("suhosin.upload.disallow_elf", "1", PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateUploadBool, upload_disallow_elf, zend_suhosin_globals, suhosin_globals)
         STD_PHP_INI_ENTRY("suhosin.upload.disallow_binary", "0", PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateUploadBool, upload_disallow_binary, zend_suhosin_globals, suhosin_globals)
         STD_PHP_INI_ENTRY("suhosin.upload.remove_binary", "0", PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateUploadBool, upload_remove_binary, zend_suhosin_globals, suhosin_globals)
-        STD_PHP_INI_ENTRY("suhosin.upload.allow_utf8", "0", PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateUploadBool, upload_allow_utf8, zend_suhosin_globals, suhosin_globals)
+#ifdef SUHOSIN_EXPERIMENTAL
+        STD_PHP_INI_BOOLEAN("suhosin.upload.allow_utf8", "0", PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateUploadBool, upload_allow_utf8, zend_suhosin_globals, suhosin_globals)
+#endif
         STD_PHP_INI_ENTRY("suhosin.upload.verification_script", NULL, PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateUploadString, upload_verification_script, zend_suhosin_globals, suhosin_globals)
 
 
diff --git a/suhosin.ini b/suhosin.ini
index 3ae8ff5..311bca7 100644
--- a/suhosin.ini
+++ b/suhosin.ini
@@ -105,9 +105,6 @@
 ; | LOG_LOCAL7   | 31    |
 ; +--------------+-------+
 ; 
-; Using constant names is only supported with the Suhosin-Patch. If in doubt, use
-; the numeric value.
-; 
 ;suhosin.log.syslog.facility = LOG_USER
 ;
 
@@ -141,9 +138,6 @@
 ; |LOG_ERR     | 7     |
 ; +------------+-------+
 ; 
-; Using constant names is only supported with the Suhosin-Patch. If in doubt, use
-; the numeric value.
-; 
 ;suhosin.log.syslog.priority = LOG_ALERT
 ;
 
@@ -1325,8 +1319,8 @@
 ; * Type: Boolean
 ; * Default: Off
 ; 
-; This option allows UTF-8 along with ASCII when using
-; `suhosin.upload.disallow_binary` or `suhosin.upload.remove_binary`.
+; This is an experimental feature. This option allows UTF-8 along with ASCII when
+; using `suhosin.upload.disallow_binary` or `suhosin.upload.remove_binary`.
 ; 
 ;suhosin.upload.allow_utf8 = Off
 ;
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
 --INI--
 error_reporting=E_ALL
 open_basedir=
-suhosin.log.stdout=255
-suhosin.log.script=0
 suhosin.log.syslog=0
 suhosin.log.sapi=0
+suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.executor.allow_symlink=Off
 --FILE--
 <?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
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.get.max_vars=5
 error_reporting=E_ALL
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 --GET--
 A=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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 --GET--
 HTTP_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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.get.max_vars=5
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 --GET--
 A=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
 suhosin.post.disallow_ws=0
 suhosin.cookie.disallow_ws=0
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 +var1=1;var2=2;%20var3=3; var4=4;
 --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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.cookie.disallow_ws=1
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 +var1=1;var2=2;%20var3=3; var4=4;
 --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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.get.disallow_ws=1
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 --GET--
 +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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.post.disallow_ws=1
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 --GET--
 --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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.request.disallow_ws=1
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 --GET--
 +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
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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.request.disallow_nul=0
 suhosin.cookie.disallow_nul=1
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 var1=xx%001;var2=2;var3=xx%003;var4=4;
 --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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.request.max_array_depth=0
 suhosin.cookie.max_array_depth=4
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 var1[]=1;var2[][]=2;var3[][][]=3;var4[][][][]=4;var5[][][][][]=5;var6[][][][][][]=6;
 --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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.request.max_array_index_length=0
 suhosin.cookie.max_array_index_length=3
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 var1[AAA]=1;var2[BBBB]=1;var3[AAA][BBB]=1;var4[AAA][BBBB]=4;var5[AAA][BBB][CCC]=1;var6[AAA][BBBB][CCC]=1;
 --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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.request.max_varname_length=0
 suhosin.cookie.max_name_length=4
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 var=0;var1=1;var2[]=2;var3[xxx]=3;var04=4;var05[]=5;var06[xxx]=6;
 --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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.request.max_totalname_length=0
 suhosin.cookie.max_totalname_length=7
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 var=0;var1=1;var2[]=2;var3[xxx]=3;var04=4;var05[]=5;var06[xxx]=6;
 --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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.request.max_value_length=0
 suhosin.cookie.max_value_length=3
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 var1=1;var2=22;var3=333;var4=4444;var5=55%00555;var6=666666;
 --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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.cookie.max_vars=3
 --COOKIE--
 a=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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.request.disallow_nul=0
 suhosin.get.disallow_nul=1
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 --GET--
 var1=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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.request.max_array_depth=0
 suhosin.get.max_array_depth=4
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 --GET--
 var1[]=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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.request.max_array_index_length=0
 suhosin.get.max_array_index_length=3
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 --GET--
 var1[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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.request.max_varname_length=0
 suhosin.get.max_name_length=4
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 --GET--
 var=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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.request.max_totalname_length=0
 suhosin.get.max_totalname_length=7
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 --GET--
 var=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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.request.max_value_length=0
 suhosin.get.max_value_length=3
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 --GET--
 var1=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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.request.disallow_nul=0
 suhosin.post.disallow_nul=1
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 --GET--
 --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
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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.request.max_array_depth=0
 suhosin.post.max_array_depth=4
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 --GET--
 --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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.request.max_array_depth=0
 suhosin.post.max_array_depth=4
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 --GET--
 --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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.request.max_array_index_length=0
 suhosin.post.max_array_index_length=3
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 --GET--
 --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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.request.max_array_index_length=0
 suhosin.post.max_array_index_length=3
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 --GET--
 --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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.request.max_varname_length=0
 suhosin.post.max_name_length=4
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 --GET--
 --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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.request.max_varname_length=0
 suhosin.post.max_name_length=4
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 --GET--
 --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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.request.max_totalname_length=0
 suhosin.post.max_totalname_length=7
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 --GET--
 --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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.request.max_totalname_length=0
 suhosin.post.max_totalname_length=7
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 --GET--
 --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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.request.max_value_length=0
 suhosin.post.max_value_length=3
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 --GET--
 --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
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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.request.disallow_nul=1
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 var1=xx%001;var2=2;var3=xx%003;var4=4;
 --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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.request.max_array_depth=4
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 var1[]=1;var2[][]=2;var3[][][]=3;var4[][][][]=4;var5[][][][][]=5;var6[][][][][][]=6;
 --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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.request.max_array_index_length=3
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 var1[AAA]=1;var2[BBBB]=1;var3[AAA][BBB]=1;var4[AAA][BBBB]=4;var5[AAA][BBB][CCC]=1;var6[AAA][BBBB][CCC]=1;
 --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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.request.max_varname_length=4
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 var=0;var1=1;var2[]=2;var3[xxx]=3;var04=4;var05[]=5;var06[xxx]=6;
 --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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.request.max_totalname_length=7
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 var=0;var1=1;var2[]=2;var3[xxx]=3;var04=4;var05[]=5;var06[xxx]=6;
 --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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.request.max_value_length=3
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 var1=1;var2=22;var3=333;var4=4444;var5=55%00555;var6=666666;
 --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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 file_uploads=1
 upload_max_filesize=1024
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 --GET--
 --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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.post.max_vars=5
 file_uploads=1
 upload_max_filesize=1024
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 --GET--
 --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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 --GET--
 --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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.post.max_vars=5
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 --GET--
 --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
 suhosin.log.stdout=255
 suhosin.log.script=0
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 --GET--
 --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
 suhosin.log.script=0
 suhosin.server.encode=Off
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --ENV--
 return <<<END
 REQUEST_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
 suhosin.log.script=0
 suhosin.server.encode=On
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --ENV--
 return <<<END
 REQUEST_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
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --ENV--
 return <<<END
 HTTP_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
 suhosin.log.script=0
 suhosin.server.strip=Off
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --ENV--
 return <<<END
 SCRIPT_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
 suhosin.log.script=0
 suhosin.server.strip=On
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --ENV--
 return <<<END
 SCRIPT_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
 suhosin.log.script=0
 suhosin.server.strip=Off
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --ENV--
 return <<<END
 HTTP_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
 suhosin.log.script=0
 suhosin.server.strip=On
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --ENV--
 return <<<END
 HTTP_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
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
diff --git a/tests/filter/suhosin_upload_disallow_binary_utf8.phpt b/tests/filter/suhosin_upload_disallow_binary_utf8.phpt
index 557a8d5..d14f041 100644
--- a/tests/filter/suhosin_upload_disallow_binary_utf8.phpt
+++ b/tests/filter/suhosin_upload_disallow_binary_utf8.phpt
@@ -11,7 +11,9 @@ suhosin.upload.allow_utf8=On
 max_file_uploads=40
 suhosin.upload.max_uploads=40
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc');
+if (ini_get('suhosin.upload.allow_utf8') === FALSE) { die("skip feature not compiled in"); }
+?>
 --COOKIE--
 --GET--
 --POST_RAW--
diff --git a/tests/filter/suhosin_upload_disallow_binary_utf8fail.phpt b/tests/filter/suhosin_upload_disallow_binary_utf8fail.phpt
index 413d25a..95e4864 100644
--- a/tests/filter/suhosin_upload_disallow_binary_utf8fail.phpt
+++ b/tests/filter/suhosin_upload_disallow_binary_utf8fail.phpt
@@ -3,15 +3,20 @@ Testing: suhosin.upload.disallow_binary=On with UTF-8 and allow_utf8=Off
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 file_uploads=1
 suhosin.upload.disallow_binary=On
 suhosin.upload.allow_utf8=Off
 max_file_uploads=40
 suhosin.upload.max_uploads=40
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc');
+if (ini_get('suhosin.upload.allow_utf8') === FALSE) { die("skip feature not compiled in"); }
+?>
 --COOKIE--
 --GET--
 --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
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 file_uploads=1
 suhosin.upload.disallow_elf=On
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 --GET--
 --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
 file_uploads=1
 suhosin.upload.disallow_elf=Off
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 --GET--
 --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
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.post.max_vars=5
 file_uploads=1
 suhosin.upload.max_uploads=3
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 --GET--
 --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
diff --git a/tests/filter/suhosin_upload_remove_binary_utf8.phpt b/tests/filter/suhosin_upload_remove_binary_utf8.phpt
index 6fbd240..564c095 100644
--- a/tests/filter/suhosin_upload_remove_binary_utf8.phpt
+++ b/tests/filter/suhosin_upload_remove_binary_utf8.phpt
@@ -12,7 +12,9 @@ suhosin.upload.allow_utf8=On
 max_file_uploads=40
 suhosin.upload.max_uploads=40
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc');
+if (ini_get('suhosin.upload.allow_utf8') === FALSE) { die("skip feature not compiled in"); }
+?>
 --COOKIE--
 --GET--
 --POST_RAW--
diff --git a/tests/filter/suhosin_upload_remove_binary_utf8fail.phpt b/tests/filter/suhosin_upload_remove_binary_utf8fail.phpt
index 5c31115..4787a3a 100644
--- a/tests/filter/suhosin_upload_remove_binary_utf8fail.phpt
+++ b/tests/filter/suhosin_upload_remove_binary_utf8fail.phpt
@@ -12,7 +12,9 @@ suhosin.upload.allow_utf8=Off
 max_file_uploads=40
 suhosin.upload.max_uploads=40
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc');
+if (ini_get('suhosin.upload.allow_utf8') === FALSE) { die("skip feature not compiled in"); }
+?>
 --COOKIE--
 --GET--
 --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)
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
-suhosin.log.phpscript=0
+suhosin.log.stdout=255
 suhosin.executor.include.whitelist=
 suhosin.executor.include.blacklist=
 --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
 --INI--
 suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
-suhosin.log.phpscript=0
+suhosin.log.stdout=255
 suhosin.executor.include.whitelist=
 suhosin.executor.include.blacklist=
 --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
 --SKIPIF--
 <?php include "../skipifnotcli.inc"; ?>
 --INI--
+suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
-suhosin.log.syslog=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.executor.func.blacklist=max
 suhosin.log.use-x-forwarded-for=Off
+suhosin.simulation=1
 --ENV--
 return <<<END
 REMOTE_ADDR=101.102.103.104
@@ -19,5 +23,5 @@ END;
         max(1,2);
 ?>
 --EXPECTF--
-Warning: max() has been disabled for security reasons in %s on line 2
-ALERT - function within blacklist called: max() (attacker '101.102.103.104', file '%s', line 2)
\ No newline at end of file
+Warning: SIMULATION - max() has been disabled for security reasons in %s on line 2
+ALERT-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)
 --SKIPIF--
 <?php include "../skipifnotcli.inc"; ?>
 --INI--
+suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
-suhosin.log.syslog=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.executor.func.blacklist=max
 suhosin.log.use-x-forwarded-for=Off
+suhosin.simulation=1
 --FILE--
 <?php
         max(1,2);
 ?>
 --EXPECTF--
-Warning: max() has been disabled for security reasons in %s on line 2
-ALERT - function within blacklist called: max() (attacker 'REMOTE_ADDR not set', file '%s', line 2)
\ No newline at end of file
+Warning: SIMULATION - max() has been disabled for security reasons in %s on line 2
+ALERT-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
 --SKIPIF--
 <?php include "../skipifnotcli.inc"; ?>
 --INI--
+suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
-suhosin.log.syslog=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.executor.func.blacklist=max
 suhosin.log.use-x-forwarded-for=On
+suhosin.simulation=1
 --ENV--
 return <<<END
 REMOTE_ADDR=101.102.103.104
@@ -19,5 +23,5 @@ END;
         max(1,2);
 ?>
 --EXPECTF--
-Warning: max() has been disabled for security reasons in %s on line 2
-ALERT - function within blacklist called: max() (attacker '1.2.3.4', file '%s', line 2)
\ No newline at end of file
+Warning: SIMULATION - max() has been disabled for security reasons in %s on line 2
+ALERT-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)
 --SKIPIF--
 <?php include "../skipifnotcli.inc"; ?>
 --INI--
+suhosin.log.syslog=0
 suhosin.log.sapi=0
-suhosin.log.stdout=255
 suhosin.log.script=0
-suhosin.log.syslog=0
+suhosin.log.file=255
+suhosin.log.file.time=0
+suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
+auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.executor.func.blacklist=max
 suhosin.log.use-x-forwarded-for=On
+suhosin.simulation=1
 --FILE--
 <?php
         max(1,2);
 ?>
 --EXPECTF--
-Warning: max() has been disabled for security reasons in %s on line 2
-ALERT - function within blacklist called: max() (attacker 'X-FORWARDED-FOR not set', file '%s', line 2)
\ No newline at end of file
+Warning: SIMULATION - max() has been disabled for security reasons in %s on line 2
+ALERT-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
 --SKIPIF--
 <?php
 include('skipifmysqli.inc');
-include('skipif.inc');
+include('../skipif.inc');
 ?>
 --FILE--
 <?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
 --SKIPIF--
 <?php
 include('skipifmysqli.inc');
-include('skipif.inc');
+include('../skipif.inc');
 ?>
 --FILE--
 <?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
 --SKIPIF--
 <?php
 include('skipifmysqli.inc');
-include('skipif.inc');
+include('../skipif.inc');
 ?>
 --FILE--
 <?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
 --SKIPIF--
 <?php
 include('skipifmysqli.inc');
-include('skipif.inc');
+include('../skipif.inc');
 ?>
 --FILE--
 <?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
 --SKIPIF--
 <?php
 include('skipifmysqli.inc');
-include('skipif.inc');
+include('../skipif.inc');
 ?>
 --FILE--
 <?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
 --SKIPIF--
 <?php
 include('skipifmysqli.inc');
-include('skipif.inc');
+include('../skipif.inc');
 ?>
 --FILE--
 <?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
 --SKIPIF--
 <?php
 include('skipifmysqli.inc');
-include('skipif.inc');
+include('../skipif.inc');
 ?>
 --FILE--
 <?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
 --SKIPIF--
 <?php
 include('skipifmysqli.inc');
-include('skipif.inc');
+include('../skipif.inc');
 ?>
 --FILE--
 <?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
 --SKIPIF--
 <?php
 include('skipifmysqli.inc');
-include('skipif.inc');
+include('../skipif.inc');
 ?>
 --FILE--
 <?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
 --SKIPIF--
 <?php
 include('skipifmysqli.inc');
-include('skipif.inc');
+include('../skipif.inc');
 ?>
 --FILE--
 <?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
 --SKIPIF--
 <?php
 include('skipifmysqli.inc');
-include('skipif.inc');
+include('../skipif.inc');
 ?>
 --FILE--
 <?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
 --SKIPIF--
 <?php
 include('skipifmysqli.inc');
-include('skipif.inc');
+include('../skipif.inc');
 ?>
 --FILE--
 <?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
 --SKIPIF--
 <?php
 include('skipifmysqli.inc');
-include('skipif.inc');
+include('../skipif.inc');
 ?>
 --FILE--
 <?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
 --SKIPIF--
 <?php
 include('skipifmysqli.inc');
-include('skipif.inc');
+include('../skipif.inc');
 ?>
 --FILE--
 <?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
 --SKIPIF--
 <?php
 include('skipifmysqli.inc');
-include('skipif.inc');
+include('../skipif.inc');
 ?>
 --FILE--
 <?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
 --SKIPIF--
 <?php
 include('skipifmysqli.inc');
-include('skipif.inc');
+include('../skipif.inc');
 ?>
 --FILE--
 <?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
 --SKIPIF--
 <?php
 include('skipifmysqli.inc');
-include('skipif.inc');
+include('../skipif.inc');
 ?>
 --FILE--
 <?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
 --SKIPIF--
 <?php
 include('skipifmysqli.inc');
-include('skipif.inc');
+include('../skipif.inc');
 ?>
 --FILE--
 <?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 @@
 if (!extension_loaded("mysqli")) {
         die('skip - mysqli extension not available');
 }
+if (!getenv("TEST_SUHOSIN_MYSQL")) {
+    die("skip TEST_SUHOSIN_MYSQL is not set");
+}
 ?>
\ No newline at end of file
diff --git a/ufilter.c b/ufilter.c
index 28b61e1..b6c5986 100644
--- a/ufilter.c
+++ b/ufilter.c
@@ -167,19 +167,23 @@ return_failure:
 }
 /* }}} */
 
-static inline int suhosin_validate_utf8_multibyte(const char* cp)
+#ifdef SUHOSIN_EXPERIMENTAL
+static inline int suhosin_validate_utf8_multibyte(const char* cp, size_t maxlen)
 {
+        if (maxlen < 2 || !(*cp & 0x80)) { return 0; }
         if ((*cp & 0xe0) == 0xc0 &&                                     // 1st byte is 110xxxxx
                 (*(cp+1) & 0xc0) == 0x80 &&                             // 2nd byte is 10xxxxxx
                 (*cp & 0x1e)) {                                                 // overlong check 110[xxxx]x 10xxxxxx
                          return 2;
         }
+        if (maxlen < 3) { return 0; }
         if ((*cp & 0xf0) == 0xe0 &&                                     // 1st byte is 1110xxxx
                 (*(cp+1) & 0xc0) == 0x80 &&                             // 2nd byte is 10xxxxxx
                 (*(cp+2) & 0xc0) == 0x80 &&                             // 3rd byte is 10xxxxxx
                 ((*cp & 0x0f) | (*(cp+1) & 0x20))) {    // 1110[xxxx] 10[x]xxxxx 10xxxxxx
                         return 3;
         }
+        if (maxlen < 4) { return 0; }
         if ((*cp & 0xf8) == 0xf0 &&                             // 1st byte is 11110xxx
                 (*(cp+1) & 0xc0) == 0x80 &&                             // 2nd byte is 10xxxxxx
                 (*(cp+2) & 0xc0) == 0x80 &&                             // 3rd byte is 10xxxxxx
@@ -189,6 +193,7 @@ static inline int suhosin_validate_utf8_multibyte(const char* cp)
         }
         return 0;
 }
+#endif
 
 int suhosin_rfc1867_filter(unsigned int event, void *event_data, void **extra TSRMLS_DC)
 {
@@ -254,14 +259,15 @@ int suhosin_rfc1867_filter(unsigned int event, void *event_data, void **extra TS
                                         if (*cp >= 32 || isspace(*cp)) {
                                                 continue;
                                         }
+#ifdef SUHOSIN_EXPERIMENTAL
                                         if ((*cp & 0x80) && SUHOSIN_G(upload_allow_utf8)) {
                                                 SDEBUG("checking char %x", *cp);
-                                                if ((n = suhosin_validate_utf8_multibyte(cp))) { // valid UTF8 multibyte character
+                                                if ((n = suhosin_validate_utf8_multibyte(cp, cpend-cp))) { // valid UTF8 multibyte character
                                                         cp += n - 1;
                                                         continue;
                                                 }
                                         }
-                                        
+#endif
                                         suhosin_log(S_FILES, "uploaded file contains binary data - file dropped");
                                         if (!SUHOSIN_G(simulation)) {
                                                 goto continue_with_failure;
@@ -279,15 +285,17 @@ int suhosin_rfc1867_filter(unsigned int event, void *event_data, void **extra TS
                                 for (i=0, j=0; i<mefd->length; i++) {
                                         if (mefd->data[i] >= 32 || isspace(mefd->data[i])) {
                                                 mefd->data[j++] = mefd->data[i];
-                                        } else if (SUHOSIN_G(upload_allow_utf8) && mefd->data[i] & 0x80) {
-                                                n = suhosin_validate_utf8_multibyte(mefd->data + i);
+                                        }
+#ifdef SUHOSIN_EXPERIMENTAL
+                                        else if (SUHOSIN_G(upload_allow_utf8) && mefd->data[i] & 0x80) {
+                                                n = suhosin_validate_utf8_multibyte(mefd->data + i, mefd->length - i);
                                                 if (!n) { continue; }
-                                                while (n) {
+                                                while (n--) {
                                                         mefd->data[j++] = mefd->data[i++];
-                                                        n--;
                                                 }
                                                 i--;
                                         }
+#endif
                                 }
                                 mefd->data[j] = '\0';