diff options
author | Stanislav Malyshev <stas@php.net> | 2018-11-28 15:46:53 -0800 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2018-11-28 15:46:53 -0800 |
commit | 223b8c15a871ba08b9661a66510f089749155922 (patch) | |
tree | 0ec36b91f72be8cf5f9c64953e7c1d95b8941887 /ext/pcre/php_pcre.c | |
parent | 0b3cbd665ee18f6ff462f4c188d4b82c5f68e477 (diff) | |
parent | 87bf84c8c7224ac85de77f7552068d4fce8b95c4 (diff) | |
download | php-git-223b8c15a871ba08b9661a66510f089749155922.tar.gz |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
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/pcre/php_pcre.c')
0 files changed, 0 insertions, 0 deletions