]> granicus.if.org Git - php/commit
Merge branch 'phpng' of git.php.net:php-src into phpng
authorDmitry Stogov <dmitry@zend.com>
Thu, 15 May 2014 08:14:08 +0000 (12:14 +0400)
committerDmitry Stogov <dmitry@zend.com>
Thu, 15 May 2014 08:14:08 +0000 (12:14 +0400)
commit540070a999094bff64123bff365688699d6e5a18
tree5a2af0ebbc298bcc0d2a4714bae65109cbcce693
parentd1c539ce676386c9a6d7f92cd8c941ac59a61770
parent39f0b585beab7c30d52f21ab575bfdfe8c842565
Merge branch 'phpng' of git.php.net:php-src into phpng

* 'phpng' of git.php.net:php-src:
  fix invalid use of STR_FREE > efree
  RETURN_STRING takes the char* only now (always copied)
  RETURN_STRING takes the char* only now
  fix build