iliaa Tue Aug 8 14:54:49 2006 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/session/tests bug38377.phpt
Modified files:
/php-src/ext/session mod_files.c
/php-src NEWS
Log:
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.100.2.3.2.1&r2=1.100.2.3.2.2&diff_format=u
Index: php-src/ext/session/mod_files.c
diff -u php-src/ext/session/mod_files.c:1.100.2.3.2.1
php-src/ext/session/mod_files.c:1.100.2.3.2.2
--- php-src/ext/session/mod_files.c:1.100.2.3.2.1 Thu Jul 27 15:33:16 2006
+++ php-src/ext/session/mod_files.c Tue Aug 8 14:54:49 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mod_files.c,v 1.100.2.3.2.1 2006/07/27 15:33:16 iliaa Exp $ */
+/* $Id: mod_files.c,v 1.100.2.3.2.2 2006/08/08 14:54:49 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/NEWS?r1=1.2027.2.547.2.189&r2=1.2027.2.547.2.190&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.189 php-src/NEWS:1.2027.2.547.2.190
--- php-src/NEWS:1.2027.2.547.2.189 Tue Aug 8 13:49:27 2006
+++ php-src/NEWS Tue Aug 8 14:54:49 2006
@@ -30,6 +30,8 @@
- Fixed phpinfo() cutoff of variables at \0. (Ilia)
- Fixed a bug in the filter extension that prevented magic_quotes_gpc from
being applied when RAW filter is used. (Ilia)
+- Fixed bug #38377 (session_destroy() gives warning after
+ session_regenerate_id()). (Ilia)
- Fixed bug #38354 (Unwanted reformatting of XML when using AsXML). (Christian)
- Fixed bug #38347 (Segmentation fault when using foreach with an
unknown/empty
SimpleXMLElement). (Tony)
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/bug38377.phpt?view=markup&rev=1.1
Index: php-src/ext/session/tests/bug38377.phpt
+++ php-src/ext/session/tests/bug38377.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
