Fix session test failures as reported by Antony Dovgal.

These were caused by the tests assuming default values for some session
configuration settings, in particular session.save_path and session.name.
The tests now explicitly set these settings in the --INI-- section.

diff --git a/ext/session/tests/session_id_variation1.phpt b/ext/session/tests/session_id_variation1.phpt
index 282c31b6c4593e03b40bbebb420aa5e3a817baa1..777751e054dbfa17845ad76af3de8df406d77e52 100644 (file)
--- a/ext/session/tests/session_id_variation1.phpt
+++ b/ext/session/tests/session_id_variation1.phpt
@@ -35,12 +35,12 @@ ob_end_flush();
 string(1) "0"
 string(0) ""
 bool(true)
-string(32) "%s"
+string(%d) "%s"
 bool(true)
 string(1) "0"
 string(0) ""
 bool(true)
-string(40) "%s"
+string(%d) "%s"
 bool(true)
 Done
 --UEXPECTF--
@@ -48,12 +48,12 @@ Done
 unicode(1) "0"
 string(0) ""
 bool(true)
-string(32) "%s"
+string(%d) "%s"
 bool(true)
 unicode(1) "0"
 string(0) ""
 bool(true)
-string(40) "%s"
+string(%d) "%s"
 bool(true)
 Done
 

diff --git a/ext/session/tests/session_id_variation2.phpt b/ext/session/tests/session_id_variation2.phpt
index 38d2542473236c6e51a3ee9d0d14f6724d2c0d45..f1ea34e7e1d52beb6a71290805e38380336874e4 100644 (file)
--- a/ext/session/tests/session_id_variation2.phpt
+++ b/ext/session/tests/session_id_variation2.phpt
@@ -45,12 +45,12 @@ string(1) "0"
 string(1) "0"
 string(0) ""
 bool(true)
-string(32) "%s"
+string(%d) "%s"
 bool(true)
 string(1) "0"
 string(0) ""
 bool(true)
-string(40) "%s"
+string(%d) "%s"
 bool(true)
 bool(true)
 Done
@@ -62,12 +62,12 @@ unicode(1) "0"
 unicode(1) "0"
 string(0) ""
 bool(true)
-string(32) "%s"
+string(%d) "%s"
 bool(true)
 unicode(1) "0"
 string(0) ""
 bool(true)
-string(40) "%s"
+string(%d) "%s"
 bool(true)
 bool(true)
 Done

diff --git a/ext/session/tests/session_save_path_variation4.phpt b/ext/session/tests/session_save_path_variation4.phpt
index 793369d1d6d56b21d8f35520342fcf61b24b1eac..4d5398dde622e1c247abcb082f5c7b6d58e8b9ce 100644 (file)
--- a/ext/session/tests/session_save_path_variation4.phpt
+++ b/ext/session/tests/session_save_path_variation4.phpt
@@ -8,6 +8,8 @@ if(substr(PHP_OS, 0, 3) != "WIN")
 --INI--
 open_basedir=.
 session.save_handler=files
+session.save_path=
+session.name=PHPSESSID
 --FILE--
 <?php
 

diff --git a/ext/session/tests/session_save_path_variation5.phpt b/ext/session/tests/session_save_path_variation5.phpt
index bbc353e022d38e28c58ee1244e387a80b1b0b8c9..bff2e14f77c50ad2af4414e602665023ec5a708a 100644 (file)
--- a/ext/session/tests/session_save_path_variation5.phpt
+++ b/ext/session/tests/session_save_path_variation5.phpt
@@ -8,6 +8,8 @@ if(substr(PHP_OS, 0, 3) == "WIN")
 --INI--
 open_basedir=.
 session.save_handler=files
+session.save_path=
+session.name=PHPSESSID
 --FILE--
 <?php
 
@@ -25,6 +27,11 @@ $sessions = ($directory."/sessions");
 
 chdir($directory);
 
+// Delete the existing directory
+if (file_exists($sessions) === TRUE) {
+       @rmdir($sessions);
+}
+
 var_dump(mkdir($sessions));
 var_dump(chdir($sessions));
 ini_set("session.save_path", $directory);
@@ -69,3 +76,4 @@ unicode(0) ""
 bool(true)
 Done
 
+

diff --git a/ext/session/tests/session_set_save_handler_variation4.phpt b/ext/session/tests/session_set_save_handler_variation4.phpt
index 9885aa9fdd44a61a456d75f0a091e07990ddd55d..e4c5eee9ac7d9007b8b2d0e276c38874ada9103b 100644 (file)
--- a/ext/session/tests/session_set_save_handler_variation4.phpt
+++ b/ext/session/tests/session_set_save_handler_variation4.phpt
@@ -6,6 +6,8 @@ Test session_set_save_handler() function : variation
 session.gc_probability=1
 session.gc_divisor=1
 session.gc_maxlifetime=0
+session.save_path=
+session.name=PHPSESSID
 --FILE--
 <?php