]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dafb2af 61499bf)
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)
* PHP-5.4:
  Fix accepting ill-formed UTF-8 characters

Conflicts:
ext/phar/phar_path_check.c

1  2 
ext/phar/phar_path_check.c patch | diff1 | diff2 | blob | history

diff --cc ext/phar/phar_path_check.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.