diff options
| author | Stanislav Malyshev <stas@php.net> | 2018-11-28 15:47:07 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2018-11-28 15:47:07 -0800 |
| commit | 3f165e8ca3dd8914e50dfebdd48a75a4027f0058 (patch) | |
| tree | 9d680bd3bde9c5804f481f46ed190b06ed66b285 /ext/imap/php_imap.c | |
| parent | dd48f0899dccf61c62313fbe8d1fb4d49d2b44f2 (diff) | |
| parent | 4ac764e8bbe86706fe7c144bf7f410416cd4f120 (diff) | |
| download | php-git-3f165e8ca3dd8914e50dfebdd48a75a4027f0058.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
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/imap/php_imap.c')
| -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 cd3cee322e..9e626a4cfa 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -1152,6 +1152,8 @@ PHP_MINFO_FUNCTION(imap) php_info_print_table_row(2, "Kerberos Support", "enabled"); #endif php_info_print_table_end(); + + DISPLAY_INI_ENTRIES(); } /* }}} */ |