diff options
| -rw-r--r-- | main/main.c | 6 | ||||
| -rw-r--r-- | main/php_syslog.c | 2 | ||||
| -rw-r--r-- | main/php_syslog.h | 2 | ||||
| -rw-r--r-- | php.ini-development | 18 | ||||
| -rw-r--r-- | php.ini-production | 18 |
5 files changed, 25 insertions, 21 deletions
diff --git a/main/main.c b/main/main.c index 3c7eaf6ceb..4fc9cba103 100644 --- a/main/main.c +++ b/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")) { diff --git a/main/php_syslog.c b/main/php_syslog.c index 3bb9ee86dd..fd31a12d8c 100644 --- a/main/php_syslog.c +++ b/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"; diff --git a/main/php_syslog.h b/main/php_syslog.h index d8e45acfc9..6afb094658 100644 --- a/main/php_syslog.h +++ b/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 diff --git a/php.ini-development b/php.ini-development index d7aac12a16..af2cf1092f 100644 --- a/php.ini-development +++ b/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 diff --git a/php.ini-production b/php.ini-production index 339a632c04..59f9f6fd50 100644 --- a/php.ini-production +++ b/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 |