Hi,
I've disabled SAPI based signal protection.
It was used only by Apache1 SAPI, but PHP7 doesn't support it anyway.
So, we had to perform useless checks on each zend_hash_add().
Please take a look, and tell me if you see possible problems.
I think, it makes sense to completely remove corresponding API in zend.h
and SAPI.h.
Thanks. Dmitry
---------- Forwarded message ----------
From: Dmitry Stogov dmitry@php.net
Date: Fri, Aug 28, 2015 at 4:10 PM
Subject: [PHP-CVS] com php-src: HANDLE_BLOCK_INTERRUPTIONS() is not used by
SAPIs anymore. It may be useful only when PHP configured with
--enable-zend-signals.: Zend/zend.h
To: php-cvs@lists.php.net
Commit: 127db5a37d178caac24f4eabbc6695923864e60a
Author: Dmitry Stogov dmitry@zend.com Fri, 28 Aug 2015
16:10:07 +0300
Parents: 7e3fb9446112c654f246767d93e1f2dfc5167aca
Branches: master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=127db5a37d178caac24f4eabbc6695923864e60a
Log:
HANDLE_BLOCK_INTERRUPTIONS() is not used by SAPIs anymore. It may be useful
only when PHP configured with --enable-zend-signals.
Changed paths:
M Zend/zend.h
Diff:
diff --git a/Zend/zend.h b/Zend/zend.h
index 8062d75..de85a2c 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -45,8 +45,11 @@
#endif
#ifndef ZEND_SIGNALS
-# define HANDLE_BLOCK_INTERRUPTIONS() if
(zend_block_interruptions) { zend_block_interruptions(); }
-# define HANDLE_UNBLOCK_INTERRUPTIONS() if
(zend_unblock_interruptions) { zend_unblock_interruptions(); }
+/* block/unblock interruptions callbacks might be used by SAPI, and were
used
-
- by mod_php for Apache 1, but now they are not usefull anymore.
- */
+# define HANDLE_BLOCK_INTERRUPTIONS() /if
(zend_block_interruptions) { zend_block_interruptions(); }/
+# define HANDLE_UNBLOCK_INTERRUPTIONS() /if
(zend_unblock_interruptions) { zend_unblock_interruptions(); }/
#else
define HANDLE_BLOCK_INTERRUPTIONS()
ZEND_SIGNAL_BLOCK_INTERRUPUTIONS()
define HANDLE_UNBLOCK_INTERRUPTIONS()
ZEND_SIGNAL_UNBLOCK_INTERRUPTIONS()
--
PHP CVS Mailing List (http://www.php.net/)
Hi Dmitry,
-----Original Message-----
From: Dmitry Stogov [mailto:dmitry@zend.com]
Sent: Friday, August 28, 2015 3:24 PM
To: Rasmus Lerdorf rasmus@lerdorf.com; Ilia Alshanetsky iliaa@php.net;
Zeev Suraski zeev@zend.com; PHP Internals internals@lists.php.net
Cc: Anatol Belski ab@php.net; Nikita Popov nikita.ppv@gmail.com; Xinchen
Hui xinchen.h@zend.com
Subject: [PHP-DEV] Disable SAPI based HANDLE_BLOCK_INTERRUPTIONS()Hi,
I've disabled SAPI based signal protection.
It was used only by Apache1 SAPI, but PHP7 doesn't support it anyway.
So, we had to perform useless checks on each zend_hash_add().Please take a look, and tell me if you see possible problems.
I think, it makes sense to completely remove corresponding API in zend.h and
SAPI.h.
It doesn't look like zend_utility_functions struct was ever used outside the core, so ABI compat is not really a concern. Given no SAPI would inject these hooks anymore (and that was actually Apache only that did it), IMHO it is fine to remove the corresponding parts.
Regards
Anatol