]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit4ac764e8bbe86706fe7c144bf7f410416cd4f120
treed78094a243a6a5b571c6b19dc6dfd8a4c51b1835tree | snapshot
parenta3f2871b8ee6975e70685bca803d5499e540b803commit | diff
parent223b8c15a871ba08b9661a66510f089749155922commit | diff
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)
ext/imap/php_imap.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.