summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2020-10-22 14:22:16 +0200
committerNikita Popov <nikita.ppv@gmail.com>2020-10-22 14:22:16 +0200
commit9a92676828c89718ad824d65cb858bb4d03e6e55 (patch)
tree27d2cc11c18a9b408f1c4bbdf6c06291804dfdd7
parent8909d608b75e7ba4fb929c5d0d70316160118de3 (diff)
parentc23eefb1ad80deb08e66d78621e9fc221fb8b875 (diff)
downloadphp-git-9a92676828c89718ad824d65cb858bb4d03e6e55.tar.gz
Merge branch 'PHP-8.0'
* PHP-8.0: Don't leak pcntl last_error across requests
-rw-r--r--ext/pcntl/pcntl.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c
index 0df11aa388..f9a48b0406 100644
--- a/ext/pcntl/pcntl.c
+++ b/ext/pcntl/pcntl.c
@@ -428,6 +428,7 @@ PHP_RINIT_FUNCTION(pcntl)
zend_hash_init(&PCNTL_G(php_signal_table), 16, NULL, ZVAL_PTR_DTOR, 0);
PCNTL_G(head) = PCNTL_G(tail) = PCNTL_G(spares) = NULL;
PCNTL_G(async_signals) = 0;
+ PCNTL_G(last_error) = 0;
return SUCCESS;
}