clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 09:57:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.3' into PHP-7.4

Browse Source 
* PHP-7.3:
  Fix #78212: Segfault in built-in webserver
This commit is contained in:
Christoph M. Becker 2019-07-11 13:10:41 +02:00
commit 17997a908d
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -2,6 +2,8 @@ PHP NEWS
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? ????, PHP 7.4.0beta1 ?? ??? ????, PHP 7.4.0beta1
- Core:
. Fixed bug #78212 (Segfault in built-in webserver). (cmb)
11 Jul 2019, PHP 7.4.0alpha3 11 Jul 2019, PHP 7.4.0alpha3

4
win32/wsyslog.c
View File

@ -95,6 +95,10 @@ void vsyslog(int priority, const char *message, va_list args)
DWORD evid; DWORD evid;
wchar_t *strsw[2]; 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 */ switch (priority) { /* translate UNIX type into NT type */
case LOG_ALERT: case LOG_ALERT:
etype = EVENTLOG_ERROR_TYPE; etype = EVENTLOG_ERROR_TYPE;