diff options
| author | Stanislav Malyshev <stas@php.net> | 2018-11-28 15:47:00 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2018-11-28 15:47:00 -0800 |
| commit | 4ac764e8bbe86706fe7c144bf7f410416cd4f120 (patch) | |
| tree | d78094a243a6a5b571c6b19dc6dfd8a4c51b1835 /ext | |
| parent | a3f2871b8ee6975e70685bca803d5499e540b803 (diff) | |
| parent | 223b8c15a871ba08b9661a66510f089749155922 (diff) | |
| download | php-git-4ac764e8bbe86706fe7c144bf7f410416cd4f120.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Add DISPLAY_INI_ENTRIES for imap
Disable rsh/ssh functionality in imap by default (bug #77153)
Disable rsh/ssh functionality in imap by default (bug #77153)
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/imap/php_imap.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index 42e7d8611c..87fa447bc6 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -1153,6 +1153,8 @@ PHP_MINFO_FUNCTION(imap) php_info_print_table_row(2, "Kerberos Support", "enabled"); #endif php_info_print_table_end(); + + DISPLAY_INI_ENTRIES(); } /* }}} */ |