From 85a511d2c1b7d7489630d7e2d1112bddd4e20203 Mon Sep 17 00:00:00 2001 From: Joe Watkins Date: Tue, 1 Sep 2015 09:34:54 +0100 Subject: fix zend signal and tsrm compat --- sapi/embed/php_embed.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'sapi/embed/php_embed.c') diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c index 4e50133dd4..70cc2f1ba3 100644 --- a/sapi/embed/php_embed.c +++ b/sapi/embed/php_embed.c @@ -177,6 +177,10 @@ EMBED_SAPI_API int php_embed_init(int argc, char **argv) ZEND_TSRMLS_CACHE_UPDATE(); #endif +#ifdef ZEND_SIGNALS + zend_signal_startup(); +#endif + sapi_startup(&php_embed_module); #ifdef PHP_WIN32 -- cgit v1.2.1 From 49493a2dcfb2cd1758b69b13d9006ead3be0e066 Mon Sep 17 00:00:00 2001 From: Lior Kaplan Date: Fri, 1 Jan 2016 19:19:27 +0200 Subject: Happy new year (Update copyright to 2016) --- sapi/embed/php_embed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sapi/embed/php_embed.c') diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c index bfeb2c0ba1..c6ff039060 100644 --- a/sapi/embed/php_embed.c +++ b/sapi/embed/php_embed.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2015 The PHP Group | + | Copyright (c) 1997-2016 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | -- cgit v1.2.1 From 1ac152938cfe40e98b7b3c8cf403abb113266cfa Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 3 Mar 2016 16:46:04 +0100 Subject: Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE Also re bug #71575. --- sapi/embed/php_embed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sapi/embed/php_embed.c') diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c index 289dc121df..18c2027271 100644 --- a/sapi/embed/php_embed.c +++ b/sapi/embed/php_embed.c @@ -34,7 +34,7 @@ const char HARDCODED_INI[] = "max_input_time=-1\n\0"; #if defined(PHP_WIN32) && defined(ZTS) -ZEND_TSRMLS_CACHE_DEFINE(); +ZEND_TSRMLS_CACHE_DEFINE() #endif static char* php_embed_read_cookies(void) -- cgit v1.2.1