]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorRemi Collet <remi@php.net>
Thu, 2 May 2013 07:38:12 +0000 (09:38 +0200)
committerRemi Collet <remi@php.net>
Thu, 2 May 2013 07:38:12 +0000 (09:38 +0200)
commitbe3f7ba4fbe2e4f9dec1da610facaef2dcbb10b3
tree101b6fb2582bbf7ae830af70384cf9d0aad2d033
parent3f2f534a5ca164772eb52625fcde635d9e636628
parentab117573cd6fef9b7df50e00df0cf2078b740b5c
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  fix possible null deref (detected by code coverity scan)
sapi/fpm/fpm/fpm_main.c