]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Tue, 22 Apr 2014 23:57:17 +0000 (16:57 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 22 Apr 2014 23:57:17 +0000 (16:57 -0700)
commitaca526a13b8fa9b3444906a18c3e20a7d2672d94
tree202248786d719b7b3eb962e5ec62feffb7eecd48
parentdafb2af705d0e6c4c747ecf4b3f7cf8e25454dd0
parent61499bf28252f7bea040395721178bb1a41365b9
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix accepting ill-formed UTF-8 characters

Conflicts:
ext/phar/phar_path_check.c
ext/phar/phar_path_check.c