summaryrefslogtreecommitdiff
path: root/ext/standard/basic_functions.c
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2016-02-01 19:16:34 -0800
committerStanislav Malyshev <stas@php.net>2016-02-01 19:16:34 -0800
commit41be90d95b24c511c87dcffcaec461f4f9f3b3c3 (patch)
treea01f7724d45b3adbc09133136eee610fdb0763bd /ext/standard/basic_functions.c
parenta01fd45d15b543cdaf686202bc415099f2729474 (diff)
parent24167095a5fbc4ba6cd14ce5aa85ba000d9d4980 (diff)
downloadphp-git-41be90d95b24c511c87dcffcaec461f4f9f3b3c3.tar.gz
Merge branch 'PHP-5.6.18' into PHP-5.6
* PHP-5.6.18: fix tests fix NEWS Update NEWS update NEWS 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() prepare 5.6.18RC1 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() Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream() Fix bug #71335: Type Confusion in WDDX Packet Deserialization Fix bug #71354 - remove UMR when size is 0 Conflicts: configure.in main/php_version.h
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)