]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a3f2871 223b8c1)
Merge branch 'PHP-7.1' into PHP-7.2
authorStanislav Malyshev <stas@php.net>
Wed, 28 Nov 2018 23:47:00 +0000 (15:47 -0800)
committerStanislav Malyshev <stas@php.net>
Wed, 28 Nov 2018 23:47:00 +0000 (15:47 -0800)
* 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)

1  2 
ext/imap/php_imap.c patch | diff1 | diff2 | blob | history

diff --cc ext/imap/php_imap.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.