diff options
| author | Remi Collet <remi@remirepo.net> | 2017-05-01 10:15:20 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2017-05-01 10:15:20 +0200 |
| commit | 328d35f38185daa126f8ef5a9197cf9d53e25b8a (patch) | |
| tree | a5606ca1183f37d375ff090942a5a7ea7fcfbde7 /2d9cebd20b8e2eeac8c0116876b5ba76bd4d24ee.patch | |
| parent | 99f106b36f29bcc0c9d952a863679430f1b3fd40 (diff) | |
add upstream patch for https://bugs.xdebug.org/view.php?id=1424
Diffstat (limited to '2d9cebd20b8e2eeac8c0116876b5ba76bd4d24ee.patch')
| -rw-r--r-- | 2d9cebd20b8e2eeac8c0116876b5ba76bd4d24ee.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/2d9cebd20b8e2eeac8c0116876b5ba76bd4d24ee.patch b/2d9cebd20b8e2eeac8c0116876b5ba76bd4d24ee.patch new file mode 100644 index 0000000..13fe7ad --- /dev/null +++ b/2d9cebd20b8e2eeac8c0116876b5ba76bd4d24ee.patch @@ -0,0 +1,25 @@ +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; |