]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' into PHP-7.2
authorAnatol Belski <ab@php.net>
Mon, 24 Jul 2017 14:38:05 +0000 (16:38 +0200)
committerAnatol Belski <ab@php.net>
Mon, 24 Jul 2017 14:38:05 +0000 (16:38 +0200)
* PHP-7.1:
  Followup on 0ec147d3 for another place
  Ensure binary mode for OpenSSL I/O


Trivial merge