helly Thu May 18 22:12:26 2006 UTC
Modified files: (Branch: PHP_5_2)
/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.417.2.8&r2=1.417.2.8.2.1&diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.417.2.8
php-src/ext/session/session.c:1.417.2.8.2.1
--- php-src/ext/session/session.c:1.417.2.8 Fri Feb 10 07:39:13 2006
+++ php-src/ext/session/session.c Thu May 18 22:12:26 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.417.2.8 2006/02/10 07:39:13 rasmus Exp $ */
+/* $Id: session.c,v 1.417.2.8.2.1 2006/05/18 22:12:26 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1475,6 +1475,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) {
@@ -1930,6 +1935,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.2027.2.547.2.33&r2=1.2027.2.547.2.34&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.33 php-src/NEWS:1.2027.2.547.2.34
--- php-src/NEWS:1.2027.2.547.2.33 Thu May 18 21:45:38 2006
+++ php-src/NEWS Thu May 18 22:12:26 2006
@@ -39,6 +39,8 @@
- Added pg_field_table() function. (Edin)
- Added implementation of curl_multi_info_read(). (Brian)
- Added RFC2397 (data: stream) support. (Marcus)
+- Fixed bug #37510 (session_regenerate_id changes session_id() even on
+ failure). (Hannes)
- Fixed bug #37487 (oci_fetch_array() array-type should always default to
OCI_BOTH). (Tony)
- Fixed bug #37395 (recursive mkdir() fails to create nonexistent directories
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
