com php-src: Merge branch 'PHP-5.3' into PHP-5.4: sapi/fpm/fpm/ fpm_main.c
| From: | Remi Collet | Date: | Thu, 02 May 2013 07:38:12 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.3' into PHP-5.4: sapi/fpm/fpm/ fpm_main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72082@lists.php.net to get a copy of this message | ||
Commit: be3f7ba4fbe2e4f9dec1da610facaef2dcbb10b3
Author: Remi Collet <remi@php.net> Thu, 2 May 2013 09:38:12 +0200
Parents: 3f2f534a5ca164772eb52625fcde635d9e636628 ab117573cd6fef9b7df50e00df0cf2078b740b5c
Branches: PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=be3f7ba4fbe2e4f9dec1da610facaef2dcbb10b3
Log:
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
fix possible null deref (detected by code coverity scan)
Changed paths:
MM sapi/fpm/fpm/fpm_main.c
Diff: