]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorStanislav Malyshev <stas@php.net>
Fri, 25 Nov 2016 21:43:59 +0000 (13:43 -0800)
committerStanislav Malyshev <stas@php.net>
Fri, 25 Nov 2016 21:43:59 +0000 (13:43 -0800)
* PHP-7.0:
  Fix int/size_t confusion in isValidPharFilename (bug #73580)

1  2 
ext/phar/phar_object.c

Simple merge