diff options
| author | Remi Collet <remi@remirepo.net> | 2017-05-15 14:01:18 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2017-05-15 14:01:18 +0200 |
| commit | 9c66361b24317349c955b365d6ed2c4dbf769f2e (patch) | |
| tree | 54e0f90f5486273556df307e9f0e3b9cb8f85403 /2d9cebd20b8e2eeac8c0116876b5ba76bd4d24ee.patch | |
| parent | 328d35f38185daa126f8ef5a9197cf9d53e25b8a (diff) | |
v2.5.4
Diffstat (limited to '2d9cebd20b8e2eeac8c0116876b5ba76bd4d24ee.patch')
| -rw-r--r-- | 2d9cebd20b8e2eeac8c0116876b5ba76bd4d24ee.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/2d9cebd20b8e2eeac8c0116876b5ba76bd4d24ee.patch b/2d9cebd20b8e2eeac8c0116876b5ba76bd4d24ee.patch deleted file mode 100644 index 13fe7ad..0000000 --- a/2d9cebd20b8e2eeac8c0116876b5ba76bd4d24ee.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2d9cebd20b8e2eeac8c0116876b5ba76bd4d24ee Mon Sep 17 00:00:00 2001 -From: "Frode E. Moe" <fluff.github@git.noloop.net> -Date: Thu, 20 Apr 2017 17:34:10 -0400 -Subject: [PATCH] Fix set_time_limit hanging on PHP 5.6 when pcntl_exec does - not exist - ---- - xdebug.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/xdebug.c b/xdebug.c -index 54932db..c4e8768 100644 ---- a/xdebug.c -+++ b/xdebug.c -@@ -1292,7 +1292,9 @@ PHP_RINIT_FUNCTION(xdebug) - #if PHP_VERSION_ID >= 70000 - orig = zend_hash_str_find_ptr(EG(function_table), "pcntl_exec", sizeof("pcntl_exec") - 1); - #else -- zend_hash_find(EG(function_table), "pcntl_exec", sizeof("pcntl_exec"), (void **)&orig); -+ if (zend_hash_find(EG(function_table), "pcntl_exec", sizeof("pcntl_exec"), (void **)&orig) == FAILURE) { -+ orig = NULL; -+ } - #endif - if (orig) { - XG(orig_pcntl_exec_func) = orig->internal_function.handler; |