diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2020-02-10 10:05:42 +0100 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-02-10 10:05:42 +0100 |
commit | 2ff79942ccea1233e5a2c1aa937a41358174dfdf (patch) | |
tree | df060fcf176a486edffe7545165df3433e56718c | |
parent | 421a7342fe5a10de38cad88e30c0f0ccdab1292b (diff) | |
parent | 038ca4bb07abc87f5030c0257fe81876799e22b4 (diff) | |
download | php-git-2ff79942ccea1233e5a2c1aa937a41358174dfdf.tar.gz |
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove hint to security purpose of disable_functions
-rw-r--r-- | php.ini-development | 4 | ||||
-rw-r--r-- | php.ini-production | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/php.ini-development b/php.ini-development index f69f06aa3d..db6800b934 100644 --- a/php.ini-development +++ b/php.ini-development @@ -306,12 +306,12 @@ serialize_precision = -1 ; http://php.net/open-basedir ;open_basedir = -; This directive allows you to disable certain functions for security reasons. +; This directive allows you to disable certain functions. ; It receives a comma-delimited list of function names. ; http://php.net/disable-functions disable_functions = -; This directive allows you to disable certain classes for security reasons. +; This directive allows you to disable certain classes. ; It receives a comma-delimited list of class names. ; http://php.net/disable-classes disable_classes = diff --git a/php.ini-production b/php.ini-production index 306d0aefa0..c53dabd841 100644 --- a/php.ini-production +++ b/php.ini-production @@ -306,12 +306,12 @@ serialize_precision = -1 ; http://php.net/open-basedir ;open_basedir = -; This directive allows you to disable certain functions for security reasons. +; This directive allows you to disable certain functions. ; It receives a comma-delimited list of function names. ; http://php.net/disable-functions disable_functions = -; This directive allows you to disable certain classes for security reasons. +; This directive allows you to disable certain classes. ; It receives a comma-delimited list of class names. ; http://php.net/disable-classes disable_classes = |