Fixing tests

Author: Mikhail Galanin

main/fastcgi.c

@@ -1423,9 +1423,13 @@ int fcgi_accept_request(fcgi_request *req)
 					return -1;
 				}
 
+#ifdef F_SETFD
+# ifdef FD_CLOEXEC
 				if (0 > fcntl(req->fd, F_SETFD, fcntl(req->fd, F_GETFD) | FD_CLOEXEC)) {
 					fcgi_log(FCGI_WARNING, "failed to change attribute of error_log");
 				}
+# endif
+#endif
 
 #ifdef _WIN32
 				break;

sapi/fpm/tests/listen-socket-closed-on-exec.phpt

@@ -31,14 +31,14 @@ $code = <<<'EOT'
 echo "My sockets (expect to see 2 of them):\n";
 
 $mypid = getmypid();
-$ph = popen("lsof -Pn -p$mypid 2>&1 | grep TCP", 'r');
+$ph = popen("/bin/sh -c 'lsof -Pn -p$mypid' 2>&1 | grep TCP", 'r');
 echo stream_get_contents($ph);
 pclose($ph);
 
 echo "\n\n";
 
 echo "Sockets after exec(), expected to be empty:\n";
-$ph = popen("lsof -Pn -p\$\$ 2>&1 | grep TCP", 'r');
+$ph = popen("/bin/sh -c 'lsof -Pn -p\$\$' 2>&1 | grep TCP", 'r');
 var_dump(stream_get_contents($ph));
 pclose($ph);