summaryrefslogtreecommitdiff
path: root/ext/standard/basic_functions.c
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2016-02-01 18:32:31 -0800
committerStanislav Malyshev <stas@php.net>2016-02-01 18:32:31 -0800
commit309ead112f64249594cccfa4b0303706d4097a0f (patch)
tree46775099a2d2e7784fad87aa12c72c60fddd47ff /ext/standard/basic_functions.c
parent2f1ce4f209925a81a07797e48238db711b10b695 (diff)
parentb5ef8ed168a7b84ca6e66676c28a290368b8777d (diff)
downloadphp-git-309ead112f64249594cccfa4b0303706d4097a0f.tar.gz
Merge branch 'PHP-5.5.32' into PHP-5.6.18
* PHP-5.5.32: Fixed bug #71488: Stack overflow when decompressing tar archives update NEWS add missing headers for SIZE_MAX backport the escapeshell* functions hardening branch add tests Fix bug #71459 - Integer overflow in iptcembed() Fixed bug #71323 - Output of stream_get_meta_data can be falsified by its input Fix bug #71391: NULL Pointer Dereference in phar_tar_setupmetadata() Fix bug #71335: Type Confusion in WDDX Packet Deserialization Fix bug #71354 - remove UMR when size is 0
Diffstat (limited to 'ext/standard/basic_functions.c')
-rw-r--r--ext/standard/basic_functions.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index a7d065872a..57de98b15d 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -3647,6 +3647,7 @@ PHP_MINIT_FUNCTION(basic) /* {{{ */
#ifdef PHP_CAN_SUPPORT_PROC_OPEN
BASIC_MINIT_SUBMODULE(proc_open)
#endif
+ BASIC_MINIT_SUBMODULE(exec)
BASIC_MINIT_SUBMODULE(user_streams)
BASIC_MINIT_SUBMODULE(imagetypes)