diff options
| author | Remi Collet <remi@php.net> | 2018-12-08 10:25:05 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2018-12-08 10:25:05 +0100 |
| commit | fd0077bf0621dc28962cfce13431f2fcbff5c504 (patch) | |
| tree | 0a22faf5d730c5c139f591b626126256669119d1 | |
| parent | 290671e7f21cd2dd10936eec291b57c136dda048 (diff) | |
| parent | 4288674651e18360e8e3988c528e9a8c66666ff0 (diff) | |
| download | php-git-fd0077bf0621dc28962cfce13431f2fcbff5c504.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
add imap.enable_insecure_rsh in php.ini
| -rw-r--r-- | php.ini-development | 7 | ||||
| -rw-r--r-- | php.ini-production | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/php.ini-development b/php.ini-development index 2c18ba41dc..60b9f70691 100644 --- a/php.ini-development +++ b/php.ini-development @@ -968,6 +968,13 @@ cli_server.color = On ; otherwise output encoding conversion cannot be performed. ;iconv.output_encoding = +[imap] +; rsh/ssh logins are disabled by default. Use this INI entry if you want to +; enable them. Note that the IMAP library does not filter mailbox names before +; passing them to rsh/ssh command, thus passing untrusted data to this function +; with rsh/ssh enabled is insecure. +;imap.enable_insecure_rsh=0 + [intl] ;intl.default_locale = ; This directive allows you to produce PHP errors when some error diff --git a/php.ini-production b/php.ini-production index b8f8449aff..1f4dfe2c6a 100644 --- a/php.ini-production +++ b/php.ini-production @@ -975,6 +975,13 @@ cli_server.color = On ; otherwise output encoding conversion cannot be performed. ;iconv.output_encoding = +[imap] +; rsh/ssh logins are disabled by default. Use this INI entry if you want to +; enable them. Note that the IMAP library does not filter mailbox names before +; passing them to rsh/ssh command, thus passing untrusted data to this function +; with rsh/ssh enabled is insecure. +;imap.enable_insecure_rsh=0 + [intl] ;intl.default_locale = ; This directive allows you to produce PHP errors when some error |