Skip to content
Snippets Groups Projects
Commit 89da3aa9 authored by Tim van Dijen's avatar Tim van Dijen
Browse files

Fix build: merged two changes in the wrong way

parent f97b2f11
No related branches found
No related tags found
No related merge requests found
...@@ -164,19 +164,24 @@ class SessionHandlerPHP extends SessionHandler ...@@ -164,19 +164,24 @@ class SessionHandlerPHP extends SessionHandler
*/ */
public function newSessionId() public function newSessionId()
{ {
$sessionId = false;
// generate new (secure) session id // generate new (secure) session id
$sid_length = (int) ini_get('session.sid_length'); if (function_exists('session_create_id')) {
$sid_bits_per_char = (int) ini_get('session.sid_bits_per_character'); $sid_length = (int) ini_get('session.sid_length');
$sid_bits_per_char = (int) ini_get('session.sid_bits_per_character');
if (($sid_length * $sid_bits_per_char) < 128) { if (($sid_length * $sid_bits_per_char) < 128) {
Logger::warning("Unsafe defaults used for sessionId generation!"); Logger::warning("Unsafe defaults used for sessionId generation!");
}
$sessionId = session_create_id();
} }
$sessionId = session_create_id();
if (!$sessionId) { if (!$sessionId) {
Logger::warning("Secure session ID generation failed, falling back to custom ID generation."); Logger::warning("Secure session ID generation failed, falling back to custom ID generation.");
$sessionId = bin2hex(openssl_random_pseudo_bytes(16)); $sessionId = bin2hex(openssl_random_pseudo_bytes(16));
} }
Session::createSession($sessionId); Session::createSession($sessionId);
return $sessionId; return $sessionId;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment