Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix flaws in session module
This commit is contained in:
Julien Pauli 2015-03-16 16:01:12 +01:00
commit 2a50877428
2 changed files with 1 additions and 1 deletions

View file

@ -279,7 +279,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;

View file

@ -115,6 +115,7 @@ static inline void php_rshutdown_session_globals(TSRMLS_D) /* {{{ */
}
if (PS(id)) {
efree(PS(id));
PS(id) = NULL;
}
}
/* }}} */