]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0b3cbd6 87bf84c)
Merge branch 'PHP-7.0' into PHP-7.1
authorStanislav Malyshev <stas@php.net>
Wed, 28 Nov 2018 23:46:53 +0000 (15:46 -0800)
committerStanislav Malyshev <stas@php.net>
Wed, 28 Nov 2018 23:46:53 +0000 (15:46 -0800)
commit223b8c15a871ba08b9661a66510f089749155922
tree0ec36b91f72be8cf5f9c64953e7c1d95b8941887tree | snapshot
parent0b3cbd665ee18f6ff462f4c188d4b82c5f68e477commit | diff
parent87bf84c8c7224ac85de77f7552068d4fce8b95c4commit | diff
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)
ext/imap/php_imap.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.