diff options
| author | Valentin V. Bartenev <vbart@nginx.com> | 2018-11-20 18:48:06 +0300 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-11-20 21:30:02 +0100 |
| commit | 11ddf7669a58969ad9101032ce891b951819b3e1 (patch) | |
| tree | d04d7d9fdd895f405e70073763583ddeaccb4f86 | |
| parent | 05782f01f5d179187798551e901d06d2c621bdae (diff) | |
| download | php-git-11ddf7669a58969ad9101032ce891b951819b3e1.tar.gz | |
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.
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | Zend/zend_signal.c | 2 | ||||
| -rw-r--r-- | Zend/zend_signal.h | 2 |
3 files changed, 6 insertions, 2 deletions
@@ -2,6 +2,10 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2018, PHP 7.1.25 +- Core: + . Fixed bug #71041 (zend_signal_startup() needs ZEND_API). + (Valentin V. Bartenev) + - ftp: . Fixed bug #77151 (ftp_close(): SSL_read on shutdown). (Remi) diff --git a/Zend/zend_signal.c b/Zend/zend_signal.c index 24d454d739..63076209bf 100644 --- a/Zend/zend_signal.c +++ b/Zend/zend_signal.c @@ -399,7 +399,7 @@ void zend_signal_init(void) /* {{{ */ /* {{{ zend_signal_startup * alloc zend signal globals */ -void zend_signal_startup(void) +ZEND_API void zend_signal_startup(void) { #ifdef ZTS diff --git a/Zend/zend_signal.h b/Zend/zend_signal.h index e8ee7d6db0..462d06f464 100644 --- a/Zend/zend_signal.h +++ b/Zend/zend_signal.h @@ -89,7 +89,7 @@ ZEND_API void zend_signal_handler_unblock(void); void zend_signal_activate(void); void zend_signal_deactivate(void); BEGIN_EXTERN_C() -void zend_signal_startup(void); +ZEND_API void zend_signal_startup(void); END_EXTERN_C() void zend_signal_init(void); |