diff options
| author | Ben Fuhrmannek | 2014-10-14 10:09:51 +0200 |
|---|---|---|
| committer | Ben Fuhrmannek | 2014-10-14 10:09:51 +0200 |
| commit | 82e8d0eb03fb3bd88062e99065f990b26fb9fc8b (patch) | |
| tree | 1df0307a474e42e031b5a7aafcf7bfe762de4b4a /tests/include/include_uploaded_file_diff_filename.phpt | |
| parent | c8724cde260e6c8bab4aefffffa1aa46f92a57ee (diff) | |
| parent | ff4edc6ecf463211c6527879d6b23f991fd5b73b (diff) | |
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
Diffstat (limited to 'tests/include/include_uploaded_file_diff_filename.phpt')
| -rw-r--r-- | tests/include/include_uploaded_file_diff_filename.phpt | 3 |
1 files changed, 1 insertions, 2 deletions
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-- |
| 6 | suhosin.log.syslog=0 | 6 | suhosin.log.syslog=0 |
| 7 | suhosin.log.sapi=0 | 7 | suhosin.log.sapi=0 |
| 8 | suhosin.log.stdout=255 | ||
| 9 | suhosin.log.script=0 | 8 | suhosin.log.script=0 |
| 10 | suhosin.log.phpscript=0 | 9 | suhosin.log.stdout=255 |
| 11 | suhosin.executor.include.whitelist= | 10 | suhosin.executor.include.whitelist= |
| 12 | suhosin.executor.include.blacklist= | 11 | suhosin.executor.include.blacklist= |
| 13 | --POST_RAW-- | 12 | --POST_RAW-- |