diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-07-11 13:10:41 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-07-11 13:11:08 +0200 |
| commit | 17997a908de892468cc0114c2cc590e2bc8d13f3 (patch) | |
| tree | d6f6a8a6aba5e6436abfa8d95ab0a634ff6c388b | |
| parent | c02dfddda3c4e267c99d301f5f042f36da50a658 (diff) | |
| parent | fa65f5ecf5d0539f15a3048bf8c073f4c262baf1 (diff) | |
| download | php-git-17997a908de892468cc0114c2cc590e2bc8d13f3.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78212: Segfault in built-in webserver
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | win32/wsyslog.c | 4 |
2 files changed, 6 insertions, 0 deletions
@@ -2,6 +2,8 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? ????, PHP 7.4.0beta1 +- Core: + . Fixed bug #78212 (Segfault in built-in webserver). (cmb) 11 Jul 2019, PHP 7.4.0alpha3 diff --git a/win32/wsyslog.c b/win32/wsyslog.c index 50a34fabf0..b4e58b1562 100644 --- a/win32/wsyslog.c +++ b/win32/wsyslog.c @@ -95,6 +95,10 @@ void vsyslog(int priority, const char *message, va_list args) DWORD evid; wchar_t *strsw[2]; + /* default event source */ + if (INVALID_HANDLE_VALUE == PW32G(log_source)) + openlog("php", LOG_PID, LOG_SYSLOG); + switch (priority) { /* translate UNIX type into NT type */ case LOG_ALERT: etype = EVENTLOG_ERROR_TYPE; |