Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #76956: Wrong value for 'syslog.filter' documented in php.ini
This commit is contained in:
Christoph M. Becker 2019-03-18 10:21:38 +01:00
commit 2b54140b72
2 changed files with 6 additions and 4 deletions

View file

@ -585,9 +585,10 @@ html_errors = On
; control characters. If your logger accepts everything, then no filtering ; control characters. If your logger accepts everything, then no filtering
; is needed at all. ; is needed at all.
; Allowed values are: ; Allowed values are:
; ascii (only base ASCII characters) ; ascii (all printable ASCII characters and NL)
; no_ctrl (all characters except control characters) ; no-ctrl (all characters except control characters)
; all (all characters) ; all (all characters)
; http://php.net/syslog.filter
;syslog.filter = ascii ;syslog.filter = ascii
;windows.show_crt_warning ;windows.show_crt_warning

View file

@ -585,9 +585,10 @@ html_errors = On
; control characters. If your logger accepts everything, then no filtering ; control characters. If your logger accepts everything, then no filtering
; is needed at all. ; is needed at all.
; Allowed values are: ; Allowed values are:
; ascii (only base ASCII characters) ; ascii (all printable ASCII characters and NL)
; no_ctrl (all characters except control characters) ; no-ctrl (all characters except control characters)
; all (all characters) ; all (all characters)
; http://php.net/syslog.filter
;syslog.filter = ascii ;syslog.filter = ascii
;windows.show_crt_warning ;windows.show_crt_warning