Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #67033 Remove reference to Windows 95
This commit is contained in:
Anatol Belski 2014-04-14 09:33:49 +02:00
commit e3abcf7826
2 changed files with 4 additions and 4 deletions

View file

@ -573,7 +573,7 @@ html_errors = On
; http://php.net/error-log ; http://php.net/error-log
; Example: ; Example:
;error_log = php_errors.log ;error_log = php_errors.log
; Log errors to syslog (Event Log on NT, not valid in Windows 95). ; Log errors to syslog (Event Log on Windows).
;error_log = syslog ;error_log = syslog
;windows.show_crt_warning ;windows.show_crt_warning
@ -1044,7 +1044,7 @@ mail.add_x_header = On
; The path to a log file that will log all mail() calls. Log entries include ; The path to a log file that will log all mail() calls. Log entries include
; the full path of the script, line number, To address and headers. ; the full path of the script, line number, To address and headers.
;mail.log = ;mail.log =
; Log mail to syslog (Event Log on NT, not valid in Windows 95). ; Log mail to syslog (Event Log on Windows).
;mail.log = syslog ;mail.log = syslog
[SQL] [SQL]

View file

@ -573,7 +573,7 @@ html_errors = On
; http://php.net/error-log ; http://php.net/error-log
; Example: ; Example:
;error_log = php_errors.log ;error_log = php_errors.log
; Log errors to syslog (Event Log on NT, not valid in Windows 95). ; Log errors to syslog (Event Log on Windows).
;error_log = syslog ;error_log = syslog
;windows.show_crt_warning ;windows.show_crt_warning
@ -1042,7 +1042,7 @@ mail.add_x_header = On
; The path to a log file that will log all mail() calls. Log entries include ; The path to a log file that will log all mail() calls. Log entries include
; the full path of the script, line number, To address and headers. ; the full path of the script, line number, To address and headers.
;mail.log = ;mail.log =
; Log mail to syslog (Event Log on NT, not valid in Windows 95). ; Log mail to syslog (Event Log on Windows).
;mail.log = syslog ;mail.log = syslog
[SQL] [SQL]