com php-src: Merge branch 'PHP-5.5' into PHP-5.6: Zend/zend_e xecute_API.c
| From: | Dmitry Stogov | Date: | Fri, 29 Nov 2013 08:55:11 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: Zend/zend_e xecute_API.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74156@lists.php.net to get a copy of this message | ||
Commit: 2cb0e1e4c13ec9e392bfc566f59a22de1013d571
Author: Dmitry Stogov <dmitry@zend.com> Fri, 29 Nov 2013 12:55:11 +0400
Parents: f54f308f71edb6c0db679e1d6755af5e9cac2d56 967abd61537a2c7d0beebac9039aa068d518e4eb
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2cb0e1e4c13ec9e392bfc566f59a22de1013d571
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Added validation of class names in the autoload process
Conflicts:
NEWS
Changed paths:
MM Zend/zend_execute_API.c
Diff: