com php-src: Merge branch 'phpng' into call-frame: Zend/zend_ API.c
| From: | Dmitry Stogov | Date: | Wed, 25 Jun 2014 07:12:32 +0000 |
| Subject: | com php-src: Merge branch 'phpng' into call-frame: Zend/zend_ API.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79287@lists.php.net to get a copy of this message | ||
Commit: 0f9d5baba23209bec2c1881941c3765d43c2b2ce
Author: Dmitry Stogov <dmitry@zend.com> Wed, 25 Jun 2014 11:12:32 +0400
Parents: 43477bc7a2da3077abf290b13571f532979db57a 58fc40d5256db71c708e8d1242f94634d9652a47
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0f9d5baba23209bec2c1881941c3765d43c2b2ce
Log:
Merge branch 'phpng' into call-frame
* phpng:
Remove temp file committed by accident
Don't use zend_string for other fields (only name here is enough)
Fixed _zend_get_parameters_array
Fixed use of uninitialized value
Cleanup (refactoring is finish)
We don't need extra 1 byte anymore
Conflicts:
Zend/zend_API.c
Changed paths:
MM Zend/zend_API.c
Diff: