Fix flaws in session module

diff --git a/ext/session/php_session.h b/ext/session/php_session.h
index b40d44f56a76c8d76b2df345d99e9050870d5dc0..94a26a319d06aaf023c303e829df4fc5083234d2 100644 (file)
--- a/ext/session/php_session.h
+++ b/ext/session/php_session.h
@@ -278,7 +278,6 @@ PHPAPI void php_session_reset_id(TSRMLS_D);
 PHPAPI ZEND_EXTERN_MODULE_GLOBALS(ps)
 
 void php_session_auto_start(void *data);
-void php_session_shutdown(void *data);
 
 #define PS_CLASS_NAME "SessionHandler"
 extern zend_class_entry *php_session_class_entry;

diff --git a/ext/session/session.c b/ext/session/session.c
index 9b609308ed121cfe655ee3ef605507336efb3983..a173fcad0f5ab9fec1dca623f4bed6a90bcc2353 100644 (file)
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -115,6 +115,7 @@ static inline void php_rshutdown_session_globals(TSRMLS_D) /* {{{ */
        }
        if (PS(id)) {
                efree(PS(id));
+               PS(id) = NULL;
        }
 }
 /* }}} */