helly Thu May 18 22:07:32 2006 UTC
Modified files:
/php-src/ext/session session.c
Log:
- Fix bug #37510 session_regenerate_id changes session_id() even on failure
http://cvs.php.net/viewcvs.cgi/php-src/ext/session/session.c?r1=1.433&r2=1.434&diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.433 php-src/ext/session/session.c:1.434
--- php-src/ext/session/session.c:1.433 Mon Apr 10 15:06:51 2006
+++ php-src/ext/session/session.c Thu May 18 22:07:31 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.433 2006/04/10 15:06:51 sniper Exp $ */
+/* $Id: session.c,v 1.434 2006/05/18 22:07:31 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1364,6 +1364,11 @@
WRONG_PARAM_COUNT;
}
+ if (SG(headers_sent)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot regenerate
session id - headers already sent");
+ RETURN_FALSE;
+ }
+
if (PS(session_status) == php_session_active) {
if (PS(id)) {
if (del_ses && PS(mod)->s_destroy(&PS(mod_data), PS(id)
TSRMLS_CC) == FAILURE) {
@@ -1720,6 +1725,6 @@
* tab-width: 4
* c-basic-offset: 4
* End:
- * vim600: sw=4 ts=4 fdm=marker
+ * vim600: noet sw=4 ts=4 fdm=marker
* vim<600: sw=4 ts=4
*/
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
