3 files changed, 11 insertions, 5 deletions

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 d567877..fc6fef1 100644
--- a/php_suhosin.h
+++ b/php_suhosin.h
@@ -275,6 +275,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/suhosin.c b/suhosin.c
index fc84a94..fa57ee1 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()