Rename none syslog.filter to all and update ini description

Author: bukka

main/main.c

@@ -334,10 +334,10 @@ static PHP_INI_MH(OnChangeMemoryLimit)
  */
 static PHP_INI_MH(OnSetLogFilter)
 {
-	const char *filter  = ZSTR_VAL(new_value);
+	const char *filter = ZSTR_VAL(new_value);
 
-	if (!strcmp(filter, "none")) {
-		PG(syslog_filter) = PHP_SYSLOG_FILTER_NONE;
+	if (!strcmp(filter, "all")) {
+		PG(syslog_filter) = PHP_SYSLOG_FILTER_ALL;
 		return SUCCESS;
 	}
 	if (!strcmp(filter, "no-ctrl")) {

main/php_syslog.c

@@ -94,7 +94,7 @@ PHPAPI void php_syslog(int priority, const char *format, ...) /* {{{ */
 		else if (c == '\n') {
 			syslog(priority, "%.*s", (int)sbuf.len, sbuf.c);
 			smart_string_reset(&sbuf);
-		} else if ((c < 0x20) && (PG(syslog_filter) == PHP_SYSLOG_FILTER_NONE))
+		} else if ((c < 0x20) && (PG(syslog_filter) == PHP_SYSLOG_FILTER_ALL))
 			smart_string_appendc(&sbuf, c);
 		else {
 			const char xdigits[] = "0123456789abcdef";

main/php_syslog.h

@@ -33,7 +33,7 @@
 #endif
 
 /* Syslog filters */
-#define PHP_SYSLOG_FILTER_NONE		0
+#define PHP_SYSLOG_FILTER_ALL		0
 #define PHP_SYSLOG_FILTER_NO_CTRL	1
 #define PHP_SYSLOG_FILTER_ASCII		2
 

php.ini-development

@@ -517,14 +517,6 @@ report_memleaks = On
 ; This setting is on by default.
 ;report_zend_debug = 0
 
-; Set this to disable filtering control characters (the default).
-; Some loggers only accept NVT-ASCII, others accept anything that's not
-; control characters.  If your logger accepts everything, then no filtering
-; is needed at all.
-; Values are: ascii (space-tilde), no_ctrl (all characters space and above),
-; and none (all characters)
-;syslog.filter = ascii
-
 ; Store the last error/warning message in $php_errormsg (boolean).
 ; This directive is DEPRECATED.
 ; Default Value: Off
@@ -594,6 +586,16 @@ html_errors = On
 ; the message. Only used when error_log is set to syslog.
 ;syslog.facility = user
 
+; Set this to disable filtering control characters (the default).
+; Some loggers only accept NVT-ASCII, others accept anything that's not
+; control characters. If your logger accepts everything, then no filtering
+; is needed at all.
+; Allowed values are:
+;   ascii (only base ASCII characters)
+;   no_ctrl (all characters except control characters)
+;   all (all characters)
+;syslog.filter = ascii
+
 ;windows.show_crt_warning
 ; Default value: 0
 ; Development value: 0

php.ini-production

@@ -522,14 +522,6 @@ report_memleaks = On
 ; This setting is on by default.
 ;report_zend_debug = 0
 
-; Set this to disable filtering control characters (the default).
-; Some loggers only accept NVT-ASCII, others accept anything that's not
-; control characters.  If your logger accepts everything, then no filtering
-; is needed at all.
-; Values are: ascii (space-tilde), no_ctrl (all characters space and above),
-; and none (all characters)
-;syslog.filter = ascii
-
 ; Store the last error/warning message in $php_errormsg (boolean). Setting this value
 ; to On can assist in debugging and is appropriate for development servers. It should
 ; however be disabled on production servers.
@@ -601,6 +593,16 @@ html_errors = On
 ; the message. Only used when error_log is set to syslog.
 ;syslog.facility = user
 
+; Set this to disable filtering control characters (the default).
+; Some loggers only accept NVT-ASCII, others accept anything that's not
+; control characters. If your logger accepts everything, then no filtering
+; is needed at all.
+; Allowed values are:
+;   ascii (only base ASCII characters)
+;   no_ctrl (all characters except control characters)
+;   all (all characters)
+;syslog.filter = ascii
+
 ;windows.show_crt_warning
 ; Default value: 0
 ; Development value: 0