]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorStanislav Malyshev <stas@php.net>
Sat, 26 Nov 2016 02:57:06 +0000 (18:57 -0800)
committerStanislav Malyshev <stas@php.net>
Sat, 26 Nov 2016 02:57:06 +0000 (18:57 -0800)
* PHP-7.0:
  Fix more size_t/int implicit conversions
  Fix int/size_t confusion in isValidPharFilename (bug #73580)


Trivial merge