diff options
| -rw-r--r-- | ext/session/tests/save_handler.inc | 2 | ||||
| -rw-r--r-- | ext/session/tests/session_set_save_handler_basic.phpt | 1 | ||||
| -rw-r--r-- | sapi/fpm/tests/002.phpt | 4 | ||||
| -rw-r--r-- | sapi/fpm/tests/003.phpt | 4 | ||||
| -rw-r--r-- | sapi/fpm/tests/004.phpt | 8 | ||||
| -rw-r--r-- | sapi/fpm/tests/013.phpt | 6 | ||||
| -rw-r--r-- | sapi/fpm/tests/014.phpt | 6 | ||||
| -rw-r--r-- | sapi/fpm/tests/015.phpt | 6 |
8 files changed, 19 insertions, 18 deletions
diff --git a/ext/session/tests/save_handler.inc b/ext/session/tests/save_handler.inc index 79ebaaabb0..231109c13c 100644 --- a/ext/session/tests/save_handler.inc +++ b/ext/session/tests/save_handler.inc @@ -53,7 +53,7 @@ function gc($maxlifetime) { while (($file = readdir($directory)) !== FALSE) { $qualified = ($session_save_path."/".$file); if (is_file($qualified) === TRUE) { - if (substr($file, 0, $length) === SESSION_FILE_PREFIX) { + if (substr($file, 0, $length) === SESSION_FILE_PREFIX && (filemtime($qualified) + $maxlifetime <= time() )) { unlink($qualified); } } diff --git a/ext/session/tests/session_set_save_handler_basic.phpt b/ext/session/tests/session_set_save_handler_basic.phpt index 5342acc92d..6b99e8d37d 100644 --- a/ext/session/tests/session_set_save_handler_basic.phpt +++ b/ext/session/tests/session_set_save_handler_basic.phpt @@ -3,6 +3,7 @@ Test session_set_save_handler() function : basic functionality --INI-- session.save_path= session.name=PHPSESSID +session.gc_probability=0 --SKIPIF-- <?php include('skipif.inc'); ?> --FILE-- diff --git a/sapi/fpm/tests/002.phpt b/sapi/fpm/tests/002.phpt index 89e431849a..77e89afad3 100644 --- a/sapi/fpm/tests/002.phpt +++ b/sapi/fpm/tests/002.phpt @@ -26,8 +26,8 @@ $fpm = run_fpm($cfg, $tail); if (is_resource($fpm)) { fpm_display_log($tail, 2); $i = 0; - while (($i++ < 30) && !($fp = @fsockopen('127.0.0.1', $port))) { - usleep(10000); + while (($i++ < 60) && !($fp = @fsockopen('127.0.0.1', $port))) { + usleep(25000); } if ($fp) { echo "Done\n"; diff --git a/sapi/fpm/tests/003.phpt b/sapi/fpm/tests/003.phpt index a4c04ae9ce..8b5265c7f1 100644 --- a/sapi/fpm/tests/003.phpt +++ b/sapi/fpm/tests/003.phpt @@ -29,8 +29,8 @@ $fpm = run_fpm($cfg, $tail); if (is_resource($fpm)) { fpm_display_log($tail, 2); $i = 0; - while (($i++ < 30) && !($fp = fsockopen('[::1]', $port))) { - usleep(10000); + while (($i++ < 60) && !($fp = fsockopen('[::1]', $port))) { + usleep(25000); } if ($fp) { echo "Done\n"; diff --git a/sapi/fpm/tests/004.phpt b/sapi/fpm/tests/004.phpt index 565819aed4..0b58a6d360 100644 --- a/sapi/fpm/tests/004.phpt +++ b/sapi/fpm/tests/004.phpt @@ -29,15 +29,15 @@ $fpm = run_fpm($cfg, $tail); if (is_resource($fpm)) { fpm_display_log($tail, 2); $i = 0; - while (($i++ < 30) && !($fp = @fsockopen('127.0.0.1', $port))) { - usleep(10000); + while (($i++ < 60) && !($fp = @fsockopen('127.0.0.1', $port))) { + usleep(25000); } if ($fp) { echo "Done IPv4\n"; fclose($fp); } - while (($i++ < 30) && !($fp = @fsockopen('[::1]', $port))) { - usleep(10000); + while (($i++ < 60) && !($fp = @fsockopen('[::1]', $port))) { + usleep(25000); } if ($fp) { echo "Done IPv6\n"; diff --git a/sapi/fpm/tests/013.phpt b/sapi/fpm/tests/013.phpt index 8d6a9d1d85..aa84c276a3 100644 --- a/sapi/fpm/tests/013.phpt +++ b/sapi/fpm/tests/013.phpt @@ -27,8 +27,8 @@ EOT; $fpm = run_fpm($cfg, $tail); if (is_resource($fpm)) { $i = 0; - while (($i++ < 30) && !($fp = @fsockopen('127.0.0.1', $port))) { - usleep(10000); + while (($i++ < 60) && !($fp = @fsockopen('127.0.0.1', $port))) { + usleep(25000); } if ($fp) { echo "Started\n"; @@ -51,4 +51,4 @@ Done <?php $logfile = dirname(__FILE__).'/php-fpm.log.tmp'; @unlink($logfile); -?>
\ No newline at end of file +?> diff --git a/sapi/fpm/tests/014.phpt b/sapi/fpm/tests/014.phpt index ee0e549cc5..8c0d5bf29e 100644 --- a/sapi/fpm/tests/014.phpt +++ b/sapi/fpm/tests/014.phpt @@ -27,8 +27,8 @@ EOT; $fpm = run_fpm($cfg, $tail); if (is_resource($fpm)) { $i = 0; - while (($i++ < 30) && !($fp = @fsockopen('127.0.0.1', $port))) { - usleep(10000); + while (($i++ < 60) && !($fp = @fsockopen('127.0.0.1', $port))) { + usleep(25000); } if ($fp) { echo "Started\n"; @@ -51,4 +51,4 @@ Done <?php $logfile = dirname(__FILE__).'/php-fpm.log.tmp'; @unlink($logfile); -?>
\ No newline at end of file +?> diff --git a/sapi/fpm/tests/015.phpt b/sapi/fpm/tests/015.phpt index c7af5f7572..6c092e371a 100644 --- a/sapi/fpm/tests/015.phpt +++ b/sapi/fpm/tests/015.phpt @@ -42,8 +42,8 @@ EOT; $fpm = run_fpm($cfg, $tail); if (is_resource($fpm)) { $i = 0; - while (($i++ < 30) && !($fp = @fsockopen('127.0.0.1', $port1))) { - usleep(10000); + while (($i++ < 60) && !($fp = @fsockopen('127.0.0.1', $port1))) { + usleep(25000); } if ($fp) { echo "Started\n"; @@ -88,4 +88,4 @@ Done <?php $logfile = dirname(__FILE__).'/php-fpm.log.tmp'; @unlink($logfile); -?>
\ No newline at end of file +?> |