diff options
| author | Rasmus Lerdorf <rasmus@lerdorf.com> | 2018-10-31 10:59:31 -0700 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@lerdorf.com> | 2018-10-31 10:59:31 -0700 |
| commit | 46b25ee2a97ac12a9acf8fba11eaee1289b8ec11 (patch) | |
| tree | ec7a9ef7738fc46fccfb4d00ac103fd7d030f3d9 | |
| parent | fcb2e1da09fe49888cf8d0ff10f410a7082c55c0 (diff) | |
| parent | 4e8195769ddcc791c83e37b00019ef761b679412 (diff) | |
| download | php-git-46b25ee2a97ac12a9acf8fba11eaee1289b8ec11.tar.gz | |
Merge branch 'PHP-7.3'
* PHP-7.3:
Fix session tests that fail if error_log is set
| -rw-r--r-- | ext/session/tests/bug60860.phpt | 1 | ||||
| -rw-r--r-- | ext/session/tests/bug66481.phpt | 1 | ||||
| -rw-r--r-- | ext/session/tests/session_set_save_handler_class_014.phpt | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/ext/session/tests/bug60860.phpt b/ext/session/tests/bug60860.phpt index 57156753fb..e49b27b725 100644 --- a/ext/session/tests/bug60860.phpt +++ b/ext/session/tests/bug60860.phpt @@ -7,6 +7,7 @@ include('skipif.inc'); --INI-- session.save_handler=user display_errors=off +error_log= --FILE-- <?php diff --git a/ext/session/tests/bug66481.phpt b/ext/session/tests/bug66481.phpt index 3ceb3e299e..fc789d238a 100644 --- a/ext/session/tests/bug66481.phpt +++ b/ext/session/tests/bug66481.phpt @@ -2,6 +2,7 @@ Bug #66481: Calls to session_name() segfault when session.name is null. --INI-- session.name= +error_log= --SKIPIF-- <?php include('skipif.inc'); ?> --FILE-- diff --git a/ext/session/tests/session_set_save_handler_class_014.phpt b/ext/session/tests/session_set_save_handler_class_014.phpt index 0b647bcc59..c0b3b9f273 100644 --- a/ext/session/tests/session_set_save_handler_class_014.phpt +++ b/ext/session/tests/session_set_save_handler_class_014.phpt @@ -4,6 +4,7 @@ Test session_set_save_handler() : calling default handler when save_handler=user session.save_handler=user session.name=PHPSESSID display_errors=off +error_log= --SKIPIF-- <?php include('skipif.inc'); |