]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 43477bc 58fc40d)
Merge branch 'phpng' into call-frame
authorDmitry Stogov <dmitry@zend.com>
Wed, 25 Jun 2014 07:12:32 +0000 (11:12 +0400)
committerDmitry Stogov <dmitry@zend.com>
Wed, 25 Jun 2014 07:12:32 +0000 (11:12 +0400)
* 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

1  2 
Zend/zend_API.c patch | diff1 | diff2 | blob | history

diff --cc Zend/zend_API.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.