From d0c2cd9dad27515ad7c899e5ccaa54fdac01a15e Mon Sep 17 00:00:00 2001
From: Stefan Esser
Date: Wed, 12 Feb 2014 12:49:23 +0100
Subject: Added suhosin.log.stdout to log to stdout (dor debugging purposes)

---
 Changelog     |  1 +
 log.c         |  3 +++
 php_suhosin.h |  1 +
 suhosin.c     | 11 +++++++++++
 suhosin.ini   |  3 +++
 5 files changed, 19 insertions(+)

diff --git a/Changelog b/Changelog
index 2f4a050..10993a5 100644
--- a/Changelog
+++ b/Changelog
@@ -8,6 +8,7 @@
 	- Change fileupload handling for PHP >= 5.4.0 to just register the callback
     - Adapted suhosin to PHP 5.5 executor
     - Added some test cases for various things
+	- Added suhosin.log.stdout to log to stdout (for debugging purposes only)
     - TODO: WARN THAT FUNCTION WHITELISTS/BLACKLISTS NEVER WORKED CORRECTLY WITH PHP < 5.5
 
 2012-02-12 - 0.9.34
diff --git a/log.c b/log.c
index ea81cae..8b23063 100644
--- a/log.c
+++ b/log.c
@@ -286,6 +286,9 @@ log_sapi:
 		sapi_module.log_message(buf TSRMLS_CC);
 #endif
 	}
+	if ((SUHOSIN_G(log_stdout) & loglevel)!=0) {
+		printf("%s\n", buf);
+	}
 
 /*log_script:*/
 	/* script logging activaed? */
diff --git a/php_suhosin.h b/php_suhosin.h
index 90c588a..46e21a3 100644
--- a/php_suhosin.h
+++ b/php_suhosin.h
@@ -167,6 +167,7 @@ ZEND_BEGIN_MODULE_GLOBALS(suhosin)
 	long	log_syslog_priority;
 	long	log_script;
 	long	log_sapi;
+	long	log_stdout;
 	char	*log_scriptname;
 	long	log_phpscript;
 	char	*log_phpscriptname;
diff --git a/suhosin.c b/suhosin.c
index fbc39dd..f3e6317 100644
--- a/suhosin.c
+++ b/suhosin.c
@@ -419,6 +419,16 @@ static ZEND_INI_MH(OnUpdateSuhosin_log_sapi)
 	}
 	return SUCCESS;
 }
+static ZEND_INI_MH(OnUpdateSuhosin_log_stdout)
+{
+    LOG_PERDIR_CHECK()
+	if (!new_value) {
+		SUHOSIN_G(log_stdout) = (S_ALL & ~S_SQL);
+	} else {
+		SUHOSIN_G(log_stdout) = atoi(new_value);
+	}
+	return SUCCESS;
+}
 static ZEND_INI_MH(OnUpdateSuhosin_log_script)
 {
     LOG_PERDIR_CHECK()
@@ -857,6 +867,7 @@ static zend_ini_entry shared_ini_entries[] = {
 	ZEND_INI_ENTRY("suhosin.log.syslog.facility",		NULL,		ZEND_INI_PERDIR|ZEND_INI_SYSTEM,	OnUpdateSuhosin_log_syslog_facility)
 	ZEND_INI_ENTRY("suhosin.log.syslog.priority",		NULL,		ZEND_INI_PERDIR|ZEND_INI_SYSTEM,	OnUpdateSuhosin_log_syslog_priority)
 	ZEND_INI_ENTRY("suhosin.log.sapi",				"0",		ZEND_INI_PERDIR|ZEND_INI_SYSTEM,	OnUpdateSuhosin_log_sapi)
+	ZEND_INI_ENTRY("suhosin.log.stdout",				"0",		ZEND_INI_PERDIR|ZEND_INI_SYSTEM,	OnUpdateSuhosin_log_stdout)
 	ZEND_INI_ENTRY("suhosin.log.script",			"0",		ZEND_INI_PERDIR|ZEND_INI_SYSTEM,	OnUpdateSuhosin_log_script)
 	ZEND_INI_ENTRY("suhosin.log.script.name",			NULL,		ZEND_INI_PERDIR|ZEND_INI_SYSTEM,	OnUpdateSuhosin_log_scriptname)
 	STD_ZEND_INI_BOOLEAN("suhosin.log.use-x-forwarded-for",	"0",		ZEND_INI_PERDIR|ZEND_INI_SYSTEM,	OnUpdateLogBool, log_use_x_forwarded_for,	zend_suhosin_globals,	suhosin_globals)
diff --git a/suhosin.ini b/suhosin.ini
index 2420501..3d3e89b 100644
--- a/suhosin.ini
+++ b/suhosin.ini
@@ -24,6 +24,9 @@ extension = suhosin.so
 ; Defines what classes of security alerts are logged through the SAPI error log.
 ;suhosin.log.sapi = 
 
+; Defines what classes of security alerts are logged to stdout. Mostly for debugging purposes.
+;suhosin.log.stdout = 
+
 ; Defines what classes of security alerts are logged through the external
 ; logging.
 ;suhosin.log.script = 
-- 
cgit v1.3