ant Wed Apr 30 15:20:16 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/session/tests session_save_path_variation5.phpt
session_id_variation2.phpt
session_set_save_handler_variation4.phpt
session_id_variation1.phpt
session_save_path_variation4.phpt
Log:
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.
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/session_save_path_variation5.phpt?r1=1.2.2.3&r2=1.2.2.4&diff_format=u
Index: php-src/ext/session/tests/session_save_path_variation5.phpt
diff -u php-src/ext/session/tests/session_save_path_variation5.phpt:1.2.2.3
php-src/ext/session/tests/session_save_path_variation5.phpt:1.2.2.4
--- php-src/ext/session/tests/session_save_path_variation5.phpt:1.2.2.3 Tue Apr
29 09:24:17 2008
+++ php-src/ext/session/tests/session_save_path_variation5.phpt Wed Apr 30
15:20:16 2008
@@ -8,6 +8,8 @@
--INI--
open_basedir=.
session.save_handler=files
+session.save_path=
+session.name=PHPSESSID
--FILE--
<?php
@@ -25,6 +27,11 @@
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);
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/session_id_variation2.phpt?r1=1.2.2.2&r2=1.2.2.3&diff_format=u
Index: php-src/ext/session/tests/session_id_variation2.phpt
diff -u php-src/ext/session/tests/session_id_variation2.phpt:1.2.2.2
php-src/ext/session/tests/session_id_variation2.phpt:1.2.2.3
--- php-src/ext/session/tests/session_id_variation2.phpt:1.2.2.2 Tue Apr
29 08:57:12 2008
+++ php-src/ext/session/tests/session_id_variation2.phpt Wed Apr 30
15:20:16 2008
@@ -45,12 +45,12 @@
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
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/session_set_save_handler_variation4.phpt?r1=1.2.2.2&r2=1.2.2.3&diff_format=u
Index: php-src/ext/session/tests/session_set_save_handler_variation4.phpt
diff -u
php-src/ext/session/tests/session_set_save_handler_variation4.phpt:1.2.2.2
php-src/ext/session/tests/session_set_save_handler_variation4.phpt:1.2.2.3
--- php-src/ext/session/tests/session_set_save_handler_variation4.phpt:1.2.2.2
Tue Apr 29 08:57:12 2008
+++ php-src/ext/session/tests/session_set_save_handler_variation4.phpt Wed Apr
30 15:20:16 2008
@@ -6,6 +6,8 @@
session.gc_probability=1
session.gc_divisor=1
session.gc_maxlifetime=0
+session.save_path=
+session.name=PHPSESSID
--FILE--
<?php
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/session_id_variation1.phpt?r1=1.2.2.2&r2=1.2.2.3&diff_format=u
Index: php-src/ext/session/tests/session_id_variation1.phpt
diff -u php-src/ext/session/tests/session_id_variation1.phpt:1.2.2.2
php-src/ext/session/tests/session_id_variation1.phpt:1.2.2.3
--- php-src/ext/session/tests/session_id_variation1.phpt:1.2.2.2 Tue Apr
29 08:57:12 2008
+++ php-src/ext/session/tests/session_id_variation1.phpt Wed Apr 30
15:20:16 2008
@@ -35,12 +35,12 @@
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
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/session_save_path_variation4.phpt?r1=1.2.2.3&r2=1.2.2.4&diff_format=u
Index: php-src/ext/session/tests/session_save_path_variation4.phpt
diff -u php-src/ext/session/tests/session_save_path_variation4.phpt:1.2.2.3
php-src/ext/session/tests/session_save_path_variation4.phpt:1.2.2.4
--- php-src/ext/session/tests/session_save_path_variation4.phpt:1.2.2.3 Tue Apr
29 09:24:17 2008
+++ php-src/ext/session/tests/session_save_path_variation4.phpt Wed Apr 30
15:20:16 2008
@@ -8,6 +8,8 @@
--INI--
open_basedir=.
session.save_handler=files
+session.save_path=
+session.name=PHPSESSID
--FILE--
<?php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
