iliaa Tue Aug 8 14:57:33 2006 UTC
Modified files:
/php-src/ext/session mod_files.c
/php-src/ext/session/tests bug38377.phpt
Log:
MFB: Fixed bug #38377 (session_destroy() gives warning after
session_regenerate_id()).
http://cvs.php.net/viewvc.cgi/php-src/ext/session/mod_files.c?r1=1.104&r2=1.105&diff_format=u
Index: php-src/ext/session/mod_files.c
diff -u php-src/ext/session/mod_files.c:1.104
php-src/ext/session/mod_files.c:1.105
--- php-src/ext/session/mod_files.c:1.104 Thu Jul 27 15:36:43 2006
+++ php-src/ext/session/mod_files.c Tue Aug 8 14:57:33 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mod_files.c,v 1.104 2006/07/27 15:36:43 iliaa Exp $ */
+/* $Id: mod_files.c,v 1.105 2006/08/08 14:57:33 iliaa Exp $ */
#include "php.h"
@@ -402,7 +402,12 @@
ps_files_close(data);
if (VCWD_UNLINK(buf) == -1) {
- return FAILURE;
+ /* This is a little safety check for instances when we
are dealing with a regenerated session
+ * that was not yet written to disk
+ */
+ if (!VCWD_ACCESS(buf, F_OK)) {
+ return FAILURE;
+ }
}
}
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/bug38377.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/session/tests/bug38377.phpt
diff -u /dev/null php-src/ext/session/tests/bug38377.phpt:1.2
--- /dev/null Tue Aug 8 14:57:33 2006
+++ php-src/ext/session/tests/bug38377.phpt Tue Aug 8 14:57:33 2006
@@ -0,0 +1,13 @@
+--TEST--
+bug #38377 (session_destroy() gives warning after session_regenerate_id())
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+--FILE--
+<?php
+session_start();
+session_regenerate_id();
+session_destroy();
+echo "Done\n";
+?>
+--EXPECT--
+Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
