]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3f2f534 ab11757)
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)
* PHP-5.3:
  fix possible null deref (detected by code coverity scan)

1  2 
sapi/fpm/fpm/fpm_main.c patch | diff1 | diff2 | blob | history

diff --cc sapi/fpm/fpm/fpm_main.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.