Merge branch 'buf2' (closes #52 and #54)

Conflicts:
	tests/filter/suhosin_upload_disallow_binary_utf8.phpt
	tests/filter/suhosin_upload_disallow_binary_utf8fail.phpt
	tests/filter/suhosin_upload_remove_binary_utf8.phpt
	tests/filter/suhosin_upload_remove_binary_utf8fail.phpt

1 files changed, 5 insertions, 2 deletions

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