felipe Fri, 03 Jun 2011 00:35:22 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=311744
Advertising
Log:
- Fix crash in pcntl
Changed paths:
U php/php-src/trunk/ext/pcntl/php_signal.c
Modified: php/php-src/trunk/ext/pcntl/php_signal.c
===================================================================
--- php/php-src/trunk/ext/pcntl/php_signal.c 2011-06-03 00:12:22 UTC (rev
311743)
+++ php/php-src/trunk/ext/pcntl/php_signal.c 2011-06-03 00:35:22 UTC (rev
311744)
@@ -18,6 +18,7 @@
/* $Id$ */
+#include "TSRM.h"
#include "php_signal.h"
/* php_signal using sigaction is derrived from Advanced Programing
@@ -25,6 +26,9 @@
Sigfunc *php_signal4(int signo, Sigfunc *func, int restart, int mask_all)
{
struct sigaction act,oact;
+#ifdef ZEND_SIGNALS
+ TSRMLS_FETCH();
+#endif
act.sa_handler = func;
if (mask_all) {
sigfillset(&act.sa_mask);
@@ -42,7 +46,7 @@
#endif
}
#ifdef ZEND_SIGNALS
- if (zend_sigaction(signo, &act, &oact) < 0)
+ if (zend_sigaction(signo, &act, &oact TSRMLS_CC) < 0)
#else
if (sigaction(signo, &act, &oact) < 0)
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
