svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/session/session.c branches/PHP_5_4/NEWS branches/PHP_5_4/ext/session/session.c
trunk/ext/session/session.c
| From: | Ilia Alshanetsky | Date: | Thu, 08 Mar 2012 03:31:46 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/session/session.c branches/PHP_5_4/NEWS branches/PHP_5_4/ext/session/session.c trunk/ext/session/session.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-67879@lists.php.net to get a copy of this message | ||
iliaa Thu, 08 Mar 2012 03:31:46 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=324009
Log:
Fixed bug #60634 (Segmentation fault when trying to die() in SessionHandler::write())
Bug: https://bugs.php.net/60634 (Assigned) Segmentation
fault when trying to die() in SessionHandler::write()
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/session/session.c
U php/php-src/branches/PHP_5_4/NEWS
U php/php-src/branches/PHP_5_4/ext/session/session.c
U php/php-src/trunk/ext/session/session.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2012-03-07 19:47:18 UTC (rev 324008)
+++ php/php-src/branches/PHP_5_3/NEWS 2012-03-08 03:31:46 UTC (rev 324009)
@@ -52,6 +52,7 @@
. Fixed bug #60811 (php-fpm compilation problem). (rasmus)
- SOAP
+ . Fixed basic HTTP authentication for WSDL sub requests. (Dmitry)
. Fixed bug #60887 (SoapClient ignores user_agent option and sends no
User-Agent header). (carloschilazo at gmail dot com)
@@ -61,9 +62,6 @@
- PDO_Sqlite extension:
. Add createCollation support. (Damien)
-- SOAP:
- . Fixed basic HTTP authentication for WSDL sub requests. (Dmitry)
-
- Reflection:
. Fixed bug #60968 (Late static binding doesn't work with
ReflectionMethod::invokeArgs()). (Laruence)
@@ -71,6 +69,8 @@
- Session:
. Fixed bug #60860 (session.save_handler=user without defined function core
dumps). (Felipe)
+ . Fixed bug #60634 (Segmentation fault when trying to die() in
+ SessionHandler::write()). (Ilia)
- Streams:
. Fixed bug #61115 (stream related segfault on fatal error in
Modified: php/php-src/branches/PHP_5_3/ext/session/session.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/session/session.c 2012-03-07 19:47:18 UTC (rev 324008)
+++ php/php-src/branches/PHP_5_3/ext/session/session.c 2012-03-08 03:31:46 UTC (rev 324009)
@@ -1512,9 +1512,7 @@
{
if (PS(session_status) == php_session_active) {
PS(session_status) = php_session_none;
- zend_try {
- php_session_save_current_state(TSRMLS_C);
- } zend_end_try();
+ php_session_save_current_state(TSRMLS_C);
}
}
/* }}} */
@@ -2167,7 +2165,9 @@
{
int i;
- php_session_flush(TSRMLS_C);
+ zend_try {
+ php_session_flush(TSRMLS_C);
+ } zend_end_try();
php_rshutdown_session_globals(TSRMLS_C);
/* this should NOT be done in php_rshutdown_session_globals() */
Modified: php/php-src/branches/PHP_5_4/NEWS
===================================================================
--- php/php-src/branches/PHP_5_4/NEWS 2012-03-07 19:47:18 UTC (rev 324008)
+++ php/php-src/branches/PHP_5_4/NEWS 2012-03-08 03:31:46 UTC (rev 324009)
@@ -44,6 +44,10 @@
. Fixed bug #60948 (mysqlnd FTBFS when -Wformat-security is enabled).
(Johannes)
+- Session
+ . Fixed bug #60634 (Segmentation fault when trying to die() in
+ SessionHandler::write()). (Ilia)
+
- SOAP
. Fixed bug #60887 (SoapClient ignores user_agent option and sends no
User-Agent header). (carloschilazo at gmail dot com)
Modified: php/php-src/branches/PHP_5_4/ext/session/session.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/session/session.c 2012-03-07 19:47:18 UTC (rev 324008)
+++ php/php-src/branches/PHP_5_4/ext/session/session.c 2012-03-08 03:31:46 UTC (rev 324009)
@@ -1450,9 +1450,7 @@
{
if (PS(session_status) == php_session_active) {
PS(session_status) = php_session_none;
- zend_try {
- php_session_save_current_state(TSRMLS_C);
- } zend_end_try();
+ php_session_save_current_state(TSRMLS_C);
}
}
/* }}} */
@@ -2142,7 +2140,9 @@
{
int i;
- php_session_flush(TSRMLS_C);
+ zend_try {
+ php_session_flush(TSRMLS_C);
+ } zend_end_try();
php_rshutdown_session_globals(TSRMLS_C);
/* this should NOT be done in php_rshutdown_session_globals() */
Modified: php/php-src/trunk/ext/session/session.c
===================================================================
--- php/php-src/trunk/ext/session/session.c 2012-03-07 19:47:18 UTC (rev 324008)
+++ php/php-src/trunk/ext/session/session.c 2012-03-08 03:31:46 UTC (rev 324009)
@@ -1450,9 +1450,7 @@
{
if (PS(session_status) == php_session_active) {
PS(session_status) = php_session_none;
- zend_try {
- php_session_save_current_state(TSRMLS_C);
- } zend_end_try();
+ php_session_save_current_state(TSRMLS_C);
}
}
/* }}} */
@@ -2142,7 +2140,9 @@
{
int i;
- php_session_flush(TSRMLS_C);
+ zend_try {
+ php_session_flush(TSRMLS_C);
+ } zend_end_try();
php_rshutdown_session_globals(TSRMLS_C);
/* this should NOT be done in php_rshutdown_session_globals() */