helly Thu May 18 22:16:27 2006 UTC
Modified files: (Branch: PHP_4_4)
/php-src/ext/session session.c
/php-src NEWS
Log:
- MFH 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.336.2.53.2.5&r2=1.336.2.53.2.6&diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.336.2.53.2.5
php-src/ext/session/session.c:1.336.2.53.2.6
--- php-src/ext/session/session.c:1.336.2.53.2.5 Sun Jan 15 16:52:10 2006
+++ php-src/ext/session/session.c Thu May 18 22:16:27 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.336.2.53.2.5 2006/01/15 16:52:10 iliaa Exp $ */
+/* $Id: session.c,v 1.336.2.53.2.6 2006/05/18 22:16:27 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1351,6 +1351,10 @@
Update the current session id with a newly generated one. */
PHP_FUNCTION(session_regenerate_id)
{
+ 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)) efree(PS(id));
@@ -1780,6 +1784,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
*/
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.1247.2.920.2.128&r2=1.1247.2.920.2.129&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.128 php-src/NEWS:1.1247.2.920.2.129
--- php-src/NEWS:1.1247.2.920.2.128 Mon May 8 14:04:39 2006
+++ php-src/NEWS Thu May 18 22:16:27 2006
@@ -4,6 +4,8 @@
- Updated PCRE to version 6.6. (Andrei)
- Added overflow checks to wordwrap() function. (Ilia)
- Added a check for special characters in the session name. (Ilia)
+- Fixed bug #37510 session_regenerate_id changes session_id() even on failure).
+ (Hannes)
- Fixed bug #34360 (bad gif size) (Pierre)
- Fixed bug #37348 (make PEAR install ignore open_basedir). (Ilia)
- Fixed bug #37346 (invalid colormap format) (Pierre)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
