diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-01-07 07:10:46 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-01-07 07:10:46 +0000 |
| commit | f60ebd13b3886b75d5f75d87753e1111057b9a95 (patch) | |
| tree | fd381a25dd8653bde009258e832d27344f93c032 /ext/session | |
| parent | 22ed374c9ab1130acf1f457045d657bd768d420b (diff) | |
| parent | 41c1d0291c4e11ac8e3d793639075576077cbeea (diff) | |
| download | php-git-f60ebd13b3886b75d5f75d87753e1111057b9a95.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixes for session and fpm tests in PHP7.0 branch
Diffstat (limited to 'ext/session')
| -rw-r--r-- | ext/session/tests/save_handler.inc | 2 | ||||
| -rw-r--r-- | ext/session/tests/session_set_save_handler_basic.phpt | 1 |
2 files changed, 2 insertions, 1 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-- |