[PHP-CVS] cvs: php-src(PHP_5_1) /ext/session session.c

[Jani Taskinen]

sniper          Fri Sep 23 04:14:14 2005 EDT

  Modified files:              (Branch: PHP_5_1)
    /php-src/ext/session        session.c 
  Log:
  MFH: Improved the fix for #21306 a bit
  
http://cvs.php.net/diff.php/php-src/ext/session/session.c?r1=1.417.2.2&r2=1.417.2.3&ty=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.417.2.2 
php-src/ext/session/session.c:1.417.2.3
--- php-src/ext/session/session.c:1.417.2.2     Tue Sep 20 16:56:54 2005
+++ php-src/ext/session/session.c       Fri Sep 23 04:14:13 2005
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: session.c,v 1.417.2.2 2005/09/20 20:56:54 sniper Exp $ */
+/* $Id: session.c,v 1.417.2.3 2005/09/23 08:14:13 sniper Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1756,7 +1756,9 @@
 static void php_rshutdown_session_globals(TSRMLS_D)
 {
        if (PS(mod_data)) {
-               PS(mod)->s_close(&PS(mod_data) TSRMLS_CC);
+               zend_try {
+                       PS(mod)->s_close(&PS(mod_data) TSRMLS_CC);
+               } zend_end_try();
        }
        if (PS(id)) {
                efree(PS(id));
@@ -1792,9 +1794,11 @@
 
 static void php_session_flush(TSRMLS_D)
 {
-       if(PS(session_status)==php_session_active) {
-               php_session_save_current_state(TSRMLS_C);
-               PS(session_status)=php_session_none;
+       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();
        }
 }
 
@@ -1807,10 +1811,8 @@
 
 PHP_RSHUTDOWN_FUNCTION(session)
 {
-       zend_try {
-               php_session_flush(TSRMLS_C);
-               php_rshutdown_session_globals(TSRMLS_C);
-       } zend_end_try();
+       php_session_flush(TSRMLS_C);
+       php_rshutdown_session_globals(TSRMLS_C);
 
        return SUCCESS;
 }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php