Version 4.2.0

system/Session/Session.php

@@ -1,12 +1,11 @@
 <?php
 /**
  * @brief		Session Handler
- * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Community Suite
+ * @author		<a href='https://www.invisioncommunity.com'>Invision Power Services, Inc.</a>
+ * @copyright	(c) Invision Power Services, Inc.
+ * @license		https://www.invisioncommunity.com/legal/standards/
+ * @package		Invision Community
  * @since		11 Mar 2013
- * @version		SVN_VERSION_NUMBER
  */
 
 namespace IPS;
@@ -154,6 +153,13 @@ abstract class _Session
 	 */
 	public function setMember( $member )
 	{
+		/* PHP 7.0.2 had a bug reported where session_regenerate_id() does not close opened sessions properly and in some situations can cause PHP to hang or crash.
+		 * This issue is fixed in PHP 7.1.0 - https://bugs.php.net/bug.php?id=71394 */
+		if ( version_compare( PHP_VERSION, '7.1.0' ) >= 0 )
+		{
+			session_regenerate_id();
+		}
+		
 		$_SESSION['forcedWrite'] = time();
 		$this->member = $member;
 	}
@@ -169,7 +175,7 @@ abstract class _Session
 		$this->id = session_id();
 
 		/* Crate csrf key */
-		$this->csrfKey = md5( "{$this->member->email}&{$this->member->member_login_key}& " . ( $this->member->member_id ? $this->member->joined->getTimestamp() : 0 ) . '&' . $this->id );
+		$this->csrfKey = md5( "{$this->member->email}& " . ( $this->member->member_id ? $this->member->joined->getTimestamp() : 0 ) . '&' . $this->id );
 
 		/* Update member */
 		if ( $this->member->member_id )