Merge branch 'PHP-7.3' into PHP-7.4

Author: nikic

main/main.c

@@ -344,6 +344,10 @@ static PHP_INI_MH(OnSetLogFilter)
 		PG(syslog_filter) = PHP_SYSLOG_FILTER_ASCII;
 		return SUCCESS;
 	}
+	if (!strcmp(filter, "raw")) {
+		PG(syslog_filter) = PHP_SYSLOG_FILTER_RAW;
+		return SUCCESS;
+	}
 
 	return FAILURE;
 }

main/php_syslog.c

@@ -76,6 +76,13 @@ PHPAPI void php_syslog(int priority, const char *format, ...) /* {{{ */
 	smart_string_0(&fbuf);
 	va_end(args);
 
+	if (PG(syslog_filter) == PHP_SYSLOG_FILTER_RAW) {
+		/* Just send it directly to the syslog */
+		syslog(priority, "%.*s", (int)fbuf.len, fbuf.c);
+		smart_string_free(&fbuf);
+		return;
+	}
+
 	for (ptr = fbuf.c; ; ++ptr) {
 		c = *ptr;
 		if (c == '\0') {

main/php_syslog.h

@@ -34,6 +34,7 @@
 #define PHP_SYSLOG_FILTER_ALL		0
 #define PHP_SYSLOG_FILTER_NO_CTRL	1
 #define PHP_SYSLOG_FILTER_ASCII		2
+#define PHP_SYSLOG_FILTER_RAW		3
 
 BEGIN_EXTERN_C()
 PHPAPI void php_syslog(int, const char *format, ...);

php.ini-development

@@ -588,6 +588,7 @@ report_memleaks = On
 ;   ascii (all printable ASCII characters and NL)
 ;   no-ctrl (all characters except control characters)
 ;   all (all characters)
+;   raw (like "all", but messages are not split at newlines)
 ; http://php.net/syslog.filter
 ;syslog.filter = ascii
 

php.ini-production

@@ -595,6 +595,7 @@ report_memleaks = On
 ;   ascii (all printable ASCII characters and NL)
 ;   no-ctrl (all characters except control characters)
 ;   all (all characters)
+;   raw (like "all", but messages are not split at newlines)
 ; http://php.net/syslog.filter
 ;syslog.filter = ascii