]> granicus.if.org Git - php/commit
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)
commit1229b2be265c3378c46c90489fc0e1057ec1e6c0
tree4768bdb7e52ecfec8a9c056fca44b8daa2f78791
parentf9a80a0a2922a585e8d11e36a318128050121bcd
parent8be94d46f836a886d85b9a813b241a7f26649020
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix more size_t/int implicit conversions
  Fix int/size_t confusion in isValidPharFilename (bug #73580)