]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorDmitry Stogov <dmitry@zend.com>
Tue, 14 Apr 2015 12:48:20 +0000 (15:48 +0300)
committerDmitry Stogov <dmitry@zend.com>
Tue, 14 Apr 2015 12:48:20 +0000 (15:48 +0300)
commite1821090efe8eeabed392ae6bbbcddbc24b2a2b3
tree91f30caf5cfdfe7fbbf8ca0ad6f9937aa0129e94
parent5fc635548e30fe16b0f112e26db3a4a2dc69522c
parentdfffa0ba5b7a42ffa77355c59c4054f5eaa3f1c5
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed recently introduced memory leak
ext/phar/phar.c