Patch 1006-multiline-syslog for Output Control Bug #74860

Patch version 2017-07-05 20:37 UTC

• 2017-07-05 20:37 UTC [diff to current]

Developer: philipp@redfish-solutions.com

--- a/main/main.c	2017-06-07 02:09:36.000000000 -0600
+++ b/main/main.c	2017-07-05 13:38:37.707402099 -0600
@@ -664,7 +664,13 @@ PHPAPI ZEND_COLD void php_log_err_with_s
 	if (PG(error_log) != NULL) {
 #ifdef HAVE_SYSLOG_H
 		if (!strcmp(PG(error_log), "syslog")) {
-			php_syslog(syslog_type_int, "%s", log_message);
+			char *nl, *msg;
+			for (msg = log_message; msg != NULL; msg = nl + 1) {
+				nl = strchrnul(msg, '\n');
+				php_syslog(syslog_type_int, "%.*s", (nl - msg), msg);
+				if (*nl == '\0')
+					break;
+			}
 			PG(in_error_log) = 0;
 			return;
 		}