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

1  2 
ext/mcrypt/mcrypt_filter.c

Simple merge