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, 1 insertions, 0 deletions

diff --git a/suhosin.c b/suhosin.c
index 8d25acc..78dd865 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()