Skip to content

Commit 11ddf76

Browse files
VBartnikic
authored andcommitted
Fix bug #71041 dynamic embed SAPI load error
If the library is built with ZEND_SIGNALS defined, it's unusable with an external SAPI module because the zend_signal_startup() call is mandatory in this case. This bug is similar to #74149, but related to dynamic loading of PHP library.
1 parent 05782f0 commit 11ddf76

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ PHP NEWS
22
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
33
?? ??? 2018, PHP 7.1.25
44

5+
- Core:
6+
. Fixed bug #71041 (zend_signal_startup() needs ZEND_API).
7+
(Valentin V. Bartenev)
8+
59
- ftp:
610
. Fixed bug #77151 (ftp_close(): SSL_read on shutdown). (Remi)
711

Zend/zend_signal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ void zend_signal_init(void) /* {{{ */
399399

400400
/* {{{ zend_signal_startup
401401
* alloc zend signal globals */
402-
void zend_signal_startup(void)
402+
ZEND_API void zend_signal_startup(void)
403403
{
404404

405405
#ifdef ZTS

Zend/zend_signal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ ZEND_API void zend_signal_handler_unblock(void);
8989
void zend_signal_activate(void);
9090
void zend_signal_deactivate(void);
9191
BEGIN_EXTERN_C()
92-
void zend_signal_startup(void);
92+
ZEND_API void zend_signal_startup(void);
9393
END_EXTERN_C()
9494
void zend_signal_init(void);
9595

0 commit comments

Comments
 (0)