]> granicus.if.org Git - php/commitdiff
Revert commit to zend signal by mistake
authorXinchen Hui <laruence@php.net>
Thu, 5 Mar 2015 11:04:43 +0000 (19:04 +0800)
committerXinchen Hui <laruence@php.net>
Thu, 5 Mar 2015 11:04:43 +0000 (19:04 +0800)
Zend/zend_signal.c

index 3e0ce642136264f6be9df909cda50a0e23018ce5..6105fb11193b4b69a411394b115449b369abcdce 100644 (file)
@@ -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();
 }