Skip to content

Commit e0e5d26

Browse files
committed
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Fix #76956: Wrong value for 'syslog.filter' documented in php.ini
2 parents 1b411c0 + ad2d2e4 commit e0e5d26

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

php.ini-development

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -593,9 +593,10 @@ html_errors = On
593593
; control characters. If your logger accepts everything, then no filtering
594594
; is needed at all.
595595
; Allowed values are:
596-
; ascii (only base ASCII characters)
597-
; no_ctrl (all characters except control characters)
596+
; ascii (all printable ASCII characters and NL)
597+
; no-ctrl (all characters except control characters)
598598
; all (all characters)
599+
; http://php.net/syslog.filter
599600
;syslog.filter = ascii
600601

601602
;windows.show_crt_warning

php.ini-production

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -600,9 +600,10 @@ html_errors = On
600600
; control characters. If your logger accepts everything, then no filtering
601601
; is needed at all.
602602
; Allowed values are:
603-
; ascii (only base ASCII characters)
604-
; no_ctrl (all characters except control characters)
603+
; ascii (all printable ASCII characters and NL)
604+
; no-ctrl (all characters except control characters)
605605
; all (all characters)
606+
; http://php.net/syslog.filter
606607
;syslog.filter = ascii
607608

608609
;windows.show_crt_warning

0 commit comments

Comments
 (0)