Patch bug60627.patch for Apache2 related Bug #60627

Patch version 2012-01-04 07:46 UTC

• 2012-01-04 07:46 UTC [diff to current]

Developer: laruence@php.net

Index: Zend/zend.h
===================================================================
--- Zend/zend.h	(revision 321673)
+++ Zend/zend.h	(working copy)
@@ -709,8 +709,8 @@
 #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()
Index: Zend/zend_signal.h
===================================================================
--- Zend/zend_signal.h	(revision 321673)
+++ Zend/zend_signal.h	(working copy)
@@ -69,9 +69,13 @@
 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; \