]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' into PHP-7.2
authorAnatol Belski <ab@php.net>
Tue, 24 Oct 2017 12:07:32 +0000 (14:07 +0200)
committerAnatol Belski <ab@php.net>
Tue, 24 Oct 2017 12:07:32 +0000 (14:07 +0200)
* PHP-7.1:
  Fixed bug #72535 arcfour encryption stream filter crashes php


Trivial merge