com php-src: fix typos and free memory before exiting*: sapi/fpm/fpm/fpm_unix.c

Commit: edbfc32742686f888a7220b49cd34644745398b9 Author: Antony Dovgal <tony2001@php.net> Tue, 17 Dec 2013 18:03:12 +0400 Parents: 4051b0683ffe6dd4f6b69966c58f11c7aa421612 Branches: badoo-5.5_mysqlnd Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=edbfc32742686f888a7220b49cd34644745398b9 Log: fix typos and free memory before exiting* * just to make valgrind log less cluttered Changed paths: M sapi/fpm/fpm/fpm_unix.c Diff: diff --git a/sapi/fpm/fpm/fpm_unix.c b/sapi/fpm/fpm/fpm_unix.c index 48249e8..3de9cac 100644 --- a/sapi/fpm/fpm/fpm_unix.c +++ b/sapi/fpm/fpm/fpm_unix.c @@ -24,6 +24,7 @@ #include "fpm_stdio.h" #include "fpm_unix.h" #include "fpm_signals.h" +#include "fastcgi.h" #include "zlog.h" size_t fpm_pagesize; @@ -321,8 +322,8 @@ int fpm_unix_init_main() /* {{{ */ exit(FPM_EXIT_SOFTWARE); } else { if (readval == 1) { - zlog(ZLOG_DEBUG, "I received a valid acknoledge from the master process, I can exit without error"); - fpm_cleanups_run(FPM_CLEANUP_PARENT_EXIT); + zlog(ZLOG_DEBUG, "I received a valid acknowledge from the master process, I can exit without error"); + fcgi_shutdown(); exit(FPM_EXIT_OK); } else { zlog(ZLOG_DEBUG, "The master process returned an error !"); @@ -331,7 +332,7 @@ int fpm_unix_init_main() /* {{{ */ } } else { /* no date sent ! */ zlog(ZLOG_ERROR, "the master process didn't send back its status (via the pipe to the calling process)"); - exit(FPM_EXIT_SOFTWARE); + exit(FPM_EXIT_SOFTWARE); } exit(FPM_EXIT_SOFTWARE); }