summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--UPGRADING8
-rw-r--r--php.ini-development8
-rw-r--r--php.ini-production8
4 files changed, 22 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 77f5fbd1c9..f751b42136 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,8 @@ PHP NEWS
. Fixed bug #76509 (Inherited static properties can be desynchronized from
their parent by ref). (Nikita)
. Fixed bug #76439 (Changed behaviour in unclosed HereDoc). (Nikita, tpunt)
+ . Added syslog.facility and syslog.ident INI entries for customizing syslog
+ logging. (Philip Prindeville)
- DOM:
. Fixed bug #76285 (DOMDocument::formatOutput attribute sometimes ignored).
diff --git a/UPGRADING b/UPGRADING
index adc813349d..2e0b8d2dcc 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -372,6 +372,14 @@ Standard:
. This INI directive has been removed. The value has already been ignored
since PHP 5.3.0.
+- syslog.facility
+ - New INI to set syslog facility which specifies what type of program is
+ logging the message. It is used only when error_log is set to syslog.
+
+- syslog.ident
+ . New INI to set syslog ident string which is prepended to every message. It
+ is used only when error_log is set syslog.
+
========================================
12. Windows Support
========================================
diff --git a/php.ini-development b/php.ini-development
index 90fc821802..3f45c08498 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -577,9 +577,13 @@ html_errors = On
;error_log = php_errors.log
; Log errors to syslog (Event Log on Windows).
;error_log = syslog
-; the next two lines ony happen if the previous line sending errors to syslog
-; has been set as well.
+
+; The syslog ident is a string which is prepended to every message logged
+; to syslog. Only used when error_log is set to syslog.
;syslog.ident = php
+
+; The syslog facility is used to specify what type of program is logging
+; the message. Only used when error_log is set to syslog.
;syslog.facility = user
;windows.show_crt_warning
diff --git a/php.ini-production b/php.ini-production
index a2205b8ed3..7cfade4220 100644
--- a/php.ini-production
+++ b/php.ini-production
@@ -586,9 +586,13 @@ html_errors = On
;error_log = syslog
; Log errors to syslog (Event Log on Windows).
;error_log = syslog
-; the next two lines ony happen if the previous line sending errors to syslog
-; has been set as well.
+
+; The syslog ident is a string which is prepended to every message logged
+; to syslog. Only used when error_log is set to syslog.
;syslog.ident = php
+
+; The syslog facility is used to specify what type of program is logging
+; the message. Only used when error_log is set to syslog.
;syslog.facility = user
;windows.show_crt_warning