diff options
| author | Xinchen Hui <laruence@php.net> | 2012-01-04 08:25:06 +0000 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-01-04 08:25:06 +0000 |
| commit | b31c12435cdd260485d3ec078299d18f26f69f53 (patch) | |
| tree | 9732b7c076aa91a289c20166ae015a4713d8092c | |
| parent | 5d2dba81a1274e24d2e1c0538c479b4ffd0e9081 (diff) | |
| download | php-git-b31c12435cdd260485d3ec078299d18f26f69f53.tar.gz | |
Fixed bug #60627 (httpd.worker segfault on startup with php_value)
| -rw-r--r-- | Zend/zend.h | 4 | ||||
| -rw-r--r-- | Zend/zend_signal.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Zend/zend.h b/Zend/zend.h index 151cbc1d54..e8bd10725e 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -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() diff --git a/Zend/zend_signal.h b/Zend/zend_signal.h index 54f47ee54f..02d6495437 100644 --- a/Zend/zend_signal.h +++ b/Zend/zend_signal.h @@ -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; \ |