You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2017/07/01 12:16:12 UTC
svn commit: r1800492 - /httpd/test/framework/trunk/t/modules/proxy_fcgi.t
Author: jim
Date: Sat Jul 1 12:16:11 2017
New Revision: 1800492
URL: http://svn.apache.org/viewvc?rev=1800492&view=rev
Log:
comment on the kills and make daemon mode for fpm explicit
(it IS the default, but make sure anyway)
Modified:
httpd/test/framework/trunk/t/modules/proxy_fcgi.t
Modified: httpd/test/framework/trunk/t/modules/proxy_fcgi.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/modules/proxy_fcgi.t?rev=1800492&r1=1800491&r2=1800492&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/modules/proxy_fcgi.t (original)
+++ httpd/test/framework/trunk/t/modules/proxy_fcgi.t Sat Jul 1 12:16:11 2017
@@ -236,7 +236,7 @@ if (have_module('actions')) {
exit;
}
if ($pid == 0) {
- system "php-fpm -n -g $pid_file -p $servroot/php-fpm";
+ system "php-fpm -n -D -g $pid_file -p $servroot/php-fpm";
exit;
}
# Wait for php-fpm to start-up
@@ -271,8 +271,8 @@ if (have_module('actions')) {
# TODO: Add more tests here
# Clean up php-fpm process(es)
- kill 'TERM', $pid;
- kill 'TERM', `cat $pid_file`;
+ kill 'TERM', $pid; # Kill child process
+ kill 'TERM', `cat $pid_file`; # Kill php-fpm daemon
waitpid($pid, 0);
}