archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.1' into PHP-7.2

Browse source
This commit is contained in:
Nikita Popov 2018-11-20 21:30:27 +01:00
commit bbbaf1ca85
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
NEWS
View file

@ -2,6 +2,10 @@ PHP NEWS
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2018, PHP 7.2.14 ?? ??? 2018, PHP 7.2.14
- Core:
. Fixed bug #71041 (zend_signal_startup() needs ZEND_API).
(Valentin V. Bartenev)
- Sockets: - Sockets:
. Fixed bug #77136 (Unsupported IPV6_RECVPKTINFO constants on macOS). . Fixed bug #77136 (Unsupported IPV6_RECVPKTINFO constants on macOS).
(Mizunashi Mana) (Mizunashi Mana)

2
Zend/zend_signal.c
View file

@ -399,7 +399,7 @@ void zend_signal_init(void) /* {{{ */
/* {{{ zend_signal_startup /* {{{ zend_signal_startup
* alloc zend signal globals */ * alloc zend signal globals */
void zend_signal_startup(void) ZEND_API void zend_signal_startup(void)
{ {
#ifdef ZTS #ifdef ZTS

2
Zend/zend_signal.h
View file

@ -89,7 +89,7 @@ ZEND_API void zend_signal_handler_unblock(void);
void zend_signal_activate(void); void zend_signal_activate(void);
void zend_signal_deactivate(void); void zend_signal_deactivate(void);
BEGIN_EXTERN_C() BEGIN_EXTERN_C()
void zend_signal_startup(void); ZEND_API void zend_signal_startup(void);
END_EXTERN_C() END_EXTERN_C()
void zend_signal_init(void); void zend_signal_init(void);