From c8724cde260e6c8bab4aefffffa1aa46f92a57ee Mon Sep 17 00:00:00 2001
From: Ben Fuhrmannek
Date: Sat, 11 Oct 2014 10:25:59 +0200
Subject: fixed utf8 detection + made feature experimental

---
 tests/filter/suhosin_upload_disallow_binary_utf8.phpt     | 4 +++-
 tests/filter/suhosin_upload_disallow_binary_utf8fail.phpt | 4 +++-
 tests/filter/suhosin_upload_remove_binary_utf8.phpt       | 4 +++-
 tests/filter/suhosin_upload_remove_binary_utf8fail.phpt   | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'tests')

diff --git a/tests/filter/suhosin_upload_disallow_binary_utf8.phpt b/tests/filter/suhosin_upload_disallow_binary_utf8.phpt
index 557a8d5..b4627c7 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..0bf122b 100644
--- a/tests/filter/suhosin_upload_disallow_binary_utf8fail.phpt
+++ b/tests/filter/suhosin_upload_disallow_binary_utf8fail.phpt
@@ -11,7 +11,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/filter/suhosin_upload_remove_binary_utf8.phpt b/tests/filter/suhosin_upload_remove_binary_utf8.phpt
index 6fbd240..1920dc5 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..56de404 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--
-- 
cgit v1.3