]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Thu, 2 May 2013 11:31:22 +0000 (13:31 +0200)
committerRemi Collet <remi@php.net>
Thu, 2 May 2013 11:31:22 +0000 (13:31 +0200)
commita3e177b9fd9d26a985d79fcacad2e78241fc89e9
treed2e5f95ae1f0c54384f5e1f4819e74bff49637fd
parenteb53035a800d78c7ad46806328b4847305ea62f1
parent08b72ac9f12890793bc67446e4999892607bbf7b
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  From code coverity scan - fix some memory leak - fix some resources leak (fd) - create fpm_worker_pool_free (shared use) - possible null dref (wp->user and wp->home can be null)