diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-05-07 00:38:32 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-05-07 00:38:32 +0200 |
| commit | 579898e3382ae975ab1cc03738676e4e6582bf89 (patch) | |
| tree | 5a61b96fb4f0fd325c308ee2ce3fd8671e6399ff | |
| parent | 58f4bf441a89bde7e91e3a8fdcd900cbc61df558 (diff) | |
| parent | f880013c4d0a65baa104c19cd8058a970295eb80 (diff) | |
| download | php-git-579898e3382ae975ab1cc03738676e4e6582bf89.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed tests (they might fail from time to time because of session GC)
Fix author name on the #63228 patch.
| -rw-r--r-- | ext/session/tests/session_set_save_handler_class_005.phpt | 1 | ||||
| -rw-r--r-- | ext/session/tests/session_set_save_handler_class_012.phpt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/ext/session/tests/session_set_save_handler_class_005.phpt b/ext/session/tests/session_set_save_handler_class_005.phpt index a996eb8d26..c74c81de1d 100644 --- a/ext/session/tests/session_set_save_handler_class_005.phpt +++ b/ext/session/tests/session_set_save_handler_class_005.phpt @@ -3,6 +3,7 @@ Test session_set_save_handler() : incomplete implementation --INI-- session.save_handler=files session.name=PHPSESSID +session.gc_probability=0 --SKIPIF-- <?php include('skipif.inc'); ?> --FILE-- diff --git a/ext/session/tests/session_set_save_handler_class_012.phpt b/ext/session/tests/session_set_save_handler_class_012.phpt index 706ef793ef..3899d28816 100644 --- a/ext/session/tests/session_set_save_handler_class_012.phpt +++ b/ext/session/tests/session_set_save_handler_class_012.phpt @@ -3,6 +3,7 @@ Test session_set_save_handler() : incorrect arguments for existing handler open --INI-- session.save_handler=files session.name=PHPSESSID +session.gc_probability=0 --SKIPIF-- <?php include('skipif.inc'); ?> --FILE-- |