com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/phar/phar _path_check.c
| From: | Stanislav Malyshev | Date: | Tue, 22 Apr 2014 23:57:17 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/phar/phar _path_check.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77120@lists.php.net to get a copy of this message | ||
Commit: aca526a13b8fa9b3444906a18c3e20a7d2672d94
Author: Stanislav Malyshev <stas@php.net> Tue, 22 Apr 2014 16:57:17 -0700
Parents: dafb2af705d0e6c4c747ecf4b3f7cf8e25454dd0 61499bf28252f7bea040395721178bb1a41365b9
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=aca526a13b8fa9b3444906a18c3e20a7d2672d94
Log:
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
Changed paths:
MM ext/phar/phar_path_check.c
Diff: