summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2015-03-05 19:04:43 +0800
committerXinchen Hui <laruence@php.net>2015-03-05 19:04:43 +0800
commit7bcdbcf98e245467fcc9d481fd31cdfc353a114b (patch)
treeb9ea2baa44d3274b8b285db37d4483cef81b2f6a
parent56f9dc2d5902b9ae60da369fec449902f8dafa9e (diff)
downloadphp-git-7bcdbcf98e245467fcc9d481fd31cdfc353a114b.tar.gz
Revert commit to zend signal by mistake
-rw-r--r--Zend/zend_signal.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/Zend/zend_signal.c b/Zend/zend_signal.c
index 3e0ce64213..6105fb1119 100644
--- a/Zend/zend_signal.c
+++ b/Zend/zend_signal.c
@@ -78,8 +78,8 @@ void zend_signal_handler_defer(int signo, siginfo_t *siginfo, void *context)
if (SIGG(active)) {
if (SIGG(depth) == 0) { /* try to handle signal */
- if (SIGG(blocked) != 0) { /* inverse */
- SIGG(blocked) = 0; /* signal is not blocked */
+ if (SIGG(blocked) != -1) { /* inverse */
+ SIGG(blocked) = -1; /* signal is not blocked */
}
if (SIGG(running) == 0) {
SIGG(running) = 1;
@@ -99,7 +99,7 @@ void zend_signal_handler_defer(int signo, siginfo_t *siginfo, void *context)
SIGG(running) = 0;
}
} else { /* delay signal handling */
- SIGG(blocked) = 1; /* signal is blocked */
+ SIGG(blocked) = 0; /* signal is blocked */
if ((queue = SIGG(pavail))) { /* if none available it's simply forgotton */
SIGG(pavail) = queue->next;
@@ -314,7 +314,7 @@ void zend_signal_deactivate(TSRMLS_D)
SIGNAL_BEGIN_CRITICAL();
SIGG(active) = 0;
SIGG(running) = 0;
- SIGG(blocked) = 0;
+ SIGG(blocked) = -1;
SIGG(depth) = 0;
SIGNAL_END_CRITICAL();
}