com php-src: Add new FPM test for IPv4/IPv6: sapi/fpm/tests/002.phpt sapi/fpm/tests/003.phpt sapi/fpm/tests/004.phpt
| From: | Remi Collet | Date: | Mon, 17 Nov 2014 14:22:04 +0000 |
| Subject: | com php-src: Add new FPM test for IPv4/IPv6: sapi/fpm/tests/002.phpt sapi/fpm/tests/003.phpt sapi/fpm/tests/004.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83124@lists.php.net to get a copy of this message | ||
Commit: d8868b654e9e6780468bc300d7e62df54ecf5a43
Author: Remi Collet <remi@php.net> Mon, 17 Nov 2014 15:22:04 +0100
Parents: c996a9899ed3fbabb2435257891f67c70797aec6
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d8868b654e9e6780468bc300d7e62df54ecf5a43
Log:
Add new FPM test for IPv4/IPv6
Use 9000+PHP_INT_SIZE as poprt
- to avoid using default 9000
- to allow multipole 32/64 bits simultaneous run
Changed paths:
M sapi/fpm/tests/002.phpt
M sapi/fpm/tests/003.phpt
A sapi/fpm/tests/004.phpt
Diff:
diff --git a/sapi/fpm/tests/002.phpt b/sapi/fpm/tests/002..phpt
index 2ef6ced..ce87866 100644
--- a/sapi/fpm/tests/002.phpt
+++ b/sapi/fpm/tests/002.phpt
@@ -8,12 +8,13 @@ FPM: Startup and connect
include "include.inc";
$logfile = dirname(__FILE__).'/php-fpm.log.tmp';
+$port = 9000+PHP_INT_SIZE;
$cfg = <<<EOT
[global]
error_log = $logfile
[unconfined]
-listen = 127.0.0.1:9000
+listen = 127.0.0.1:$port
pm = dynamic
pm.max_children = 5
pm.start_servers = 2
@@ -26,7 +27,7 @@ if (is_resource($fpm)) {
var_dump(fgets($tail));
var_dump(fgets($tail));
$i = 0;
- while (($i++ < 30) && !($fp = @fsockopen('127.0.0.1', 9000))) {
+ while (($i++ < 30) && !($fp = @fsockopen('127.0.0.1', $port))) {
usleep(10000);
}
if ($fp) {
diff --git a/sapi/fpm/tests/003..phpt b/sapi/fpm/tests/003.phpt
index 389cb24..0ce1bd2 100644
--- a/sapi/fpm/tests/003.phpt
+++ b/sapi/fpm/tests/003.phpt
@@ -8,12 +8,13 @@ FPM: Test IPv6 support
include "include.inc";
$logfile = dirname(__FILE__).'/php-fpm.log.tmp';
+$port = 9000+PHP_INT_SIZE;
$cfg = <<<EOT
[global]
error_log = $logfile
[unconfined]
-listen = [::1]:9000
+listen = [::1]:$port
pm = dynamic
pm.max_children = 5
pm.start_servers = 2
@@ -26,7 +27,7 @@ if (is_resource($fpm)) {
var_dump(fgets($tail));
var_dump(fgets($tail));
$i = 0;
- while (($i++ < 30) && !($fp = fsockopen('[::1]', 9000))) {
+ while (($i++ < 30) && !($fp = fsockopen('[::1]', $port))) {
usleep(10000);
}
if ($fp) {
diff --git a/sapi/fpm/tests/004.phpt b/sapi/fpm/tests/004.phpt
new file mode 100644
index 0000000..0d39b13
--- /dev/null
+++ b/sapi/fpm/tests/004.phpt
@@ -0,0 +1,62 @@
+--TEST--
+FPM: Test IPv4/IPv6 support
+--SKIPIF--
+<?php include "skipif.inc"; ?>
+--FILE--
+<?php
+
+include "include.inc";
+
+$logfile = dirname(__FILE__).'/php-fpm.log.tmp';
+$port = 9000+PHP_INT_SIZE;
+
+$cfg = <<<EOT
+[global]
+error_log = $logfile
+[unconfined]
+listen = [::]:$port
+pm = dynamic
+pm.max_children = 5
+pm.start_servers = 2
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+EOT;
+
+$fpm = run_fpm($cfg, $tail);
+if (is_resource($fpm)) {
+ var_dump(fgets($tail));
+ var_dump(fgets($tail));
+ $i = 0;
+ while (($i++ < 30) && !($fp = @fsockopen('127..0.0.1', $port))) {
+ usleep(10000);
+ }
+ if ($fp) {
+ echo "Done IPv4\n";
+ fclose($fp);
+ }
+ while (($i++ < 30) && !($fp = @fsockopen('[::1]', $port))) {
+ usleep(10000);
+ }
+ if ($fp) {
+ echo "Done IPv6\n";
+ fclose($fp);
+ }
+ proc_terminate($fpm);
+ stream_get_contents($tail);
+ fclose($tail);
+ proc_close($fpm);
+}
+
+?>
+--EXPECTF--
+string(%d) "[%d-%s-%d %d:%d:%d] NOTICE: fpm is running, pid %d
+"
+string(%d) "[%d-%s-%d %d:%d:%d] NOTICE: ready to handle connections
+"
+Done IPv4
+Done IPv6
+--CLEAN--
+<?php
+ $logfile = dirname(__FILE__).'/php-fpm.log.tmp';
+ @unlink($logfile);
+?>