mirror of
https://github.com/php/php-src.git
synced 2024-09-21 18:07:23 +00:00
Fixed bug #60627 (httpd.worker segfault on startup with php_value)
This commit is contained in:
parent
5d2dba81a1
commit
b31c12435c
@ -709,8 +709,8 @@ END_EXTERN_C()
|
||||
#else
|
||||
#include "zend_signal.h"
|
||||
|
||||
#define HANDLE_BLOCK_INTERRUPTIONS() SIGG(depth)++;
|
||||
#define HANDLE_UNBLOCK_INTERRUPTIONS() if (UNEXPECTED((--SIGG(depth))==SIGG(blocked))) { zend_signal_handler_unblock(TSRMLS_C); }
|
||||
#define HANDLE_BLOCK_INTERRUPTIONS() ZEND_SIGNAL_BLOCK_INTERRUPUTIONS()
|
||||
#define HANDLE_UNBLOCK_INTERRUPTIONS() ZEND_SIGNAL_UNBLOCK_INTERRUPTIONS()
|
||||
#endif
|
||||
|
||||
BEGIN_EXTERN_C()
|
||||
|
@ -69,9 +69,13 @@ typedef struct _zend_signal_globals_t {
|
||||
BEGIN_EXTERN_C()
|
||||
ZEND_API extern int zend_signal_globals_id;
|
||||
END_EXTERN_C()
|
||||
# define ZEND_SIGNAL_BLOCK_INTERRUPUTIONS() if (EXPECTED(zend_signal_globals_id)) { SIGG(depth)++; }
|
||||
# define ZEND_SIGNAL_UNBLOCK_INTERRUPTIONS() if (EXPECTED(zend_signal_globals_id) && UNEXPECTED((--SIGG(depth))==SIGG(blocked))) { zend_signal_handler_unblock(TSRMLS_C); }
|
||||
#else /* ZTS */
|
||||
# define SIGG(v) (zend_signal_globals.v)
|
||||
extern ZEND_API zend_signal_globals_t zend_signal_globals;
|
||||
# define ZEND_SIGNAL_BLOCK_INTERRUPUTIONS() SIGG(depth)++;
|
||||
# define ZEND_SIGNAL_UNBLOCK_INTERRUPTIONS() if (UNEXPECTED((--SIGG(depth))==SIGG(blocked))) { zend_signal_handler_unblock(TSRMLS_C); }
|
||||
#endif /* not ZTS */
|
||||
|
||||
# define SIGNAL_BEGIN_CRITICAL() sigset_t oldmask; \
|
||||
|
Loading…
Reference in New Issue
Block a user