com php-src: Merge branch 'PHP-7.1' into PHP-7.2: ext/session/t ests/session_module_name_variation4.phpt ext/sessio
n/tests/session_set_save_handler_variation2.phpt ext/session/tests/session_set_save_handler_variation3 .phpt
ext/session/tests/session_set_save_handler_va riation4.phpt ext/session/tests/session_set_save_ha ndler_variation5.phpt
| From: | Peter Kokot | Date: | Sun, 14 Oct 2018 11:41:09 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.1' into PHP-7.2: ext/session/t ests/session_module_name_variation4.phpt ext/sessio n/tests/session_set_save_handler_variation2.phpt ext/session/tests/session_set_save_handler_variation3 .phpt ext/session/tests/session_set_save_handler_va riation4.phpt ext/session/tests/session_set_save_ha ndler_variation5.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-103462@lists.php.net to get a copy of this message | ||
Commit: 2707932241604581d7d8d0a30a4a66d8ab9ce754
Author: Peter Kokot <peterkokot@gmail.com> Sun, 14 Oct 2018 13:41:09 +0200
Parents: 60a69daec60f1886e166e8060556777819c66f98 afd534f1634e9a5d631afac39a9c9b09b1ba8b33
Branches: PHP-7.2 PHP-7.3 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2707932241604581d7d8d0a30a4a66d8ab9ce754
Log:
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix failing ext/session/tests due to final newlines
Changed paths:
MM ext/session/tests/session_module_name_variation4.phpt
MM ext/session/tests/session_set_save_handler_variation2.phpt
MM ext/session/tests/session_set_save_handler_variation3.phpt
MM ext/session/tests/session_set_save_handler_variation4.phpt
MM ext/session/tests/session_set_save_handler_variation5.phpt
Diff:
diff --cc ext/session/tests/session_set_save_handler_variation2.phpt
index 71f533d,4be68c7..976d796
--- a/ext/session/tests/session_set_save_handler_variation2.phpt
+++ b/ext/session/tests/session_set_save_handler_variation2.phpt
@@@ -26,10 -26,7 +26,9 @@@ ob_end_flush()
?>
--EXPECTF--
*** Testing session_set_save_handler() : variation ***
-
bool(true)
+
+Warning: session_set_save_handler(): Cannot change save handler when session is active in %s on
line 17
bool(false)
bool(true)
diff --cc ext/session/tests/session_set_save_handler_variation3.phpt
index 7ac9834,b8e8fe5...6afa753
--- a/ext/session/tests/session_set_save_handler_variation3.phpt
+++ b/ext/session/tests/session_set_save_handler_variation3.phpt
@@@ -28,11 -27,6 +28,10 @@@ ob_end_flush()
?>
--EXPECTF--
*** Testing session_set_save_handler() : variation ***
-
+int(2)
+
+Warning: session_save_path(): Cannot change save path when session is active in %s on line 16
+
+Warning: session_set_save_handler(): Cannot change save handler when session is active in %s on
line 17
bool(false)
bool(true)
-