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

diff --git a/sapi/fpm/tests/002.phpt b/sapi/fpm/tests/002.phpt
index 2ef6cedc3856ac42c03635f66a634d302fa49bc6..ce878661eaf54e8ee66f2fd9fd5d08a2a7d2933a 100644 (file)
--- 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 389cb2401ef2de7403c993193ac8451f318ca232..0ce1bd2828ad4560d07c41075fdef644190b623d 100644 (file)
--- 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 (file)
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);
+?>