Skip to content

Commit 5dd7f6b

Browse files
Merge branch '4.4' into 5.0
* 4.4: [DependencyInjection] Fix binding tagged services to containers [ProxyManager] fix generating proxies for root-namespaced classes [DI] skip looking for config class when the extension class is anonymous Fix typo Docs - Update debug section of UPGRADE guides for 4.4 and 5.0 versions. [Dotenv] FIX missing getenv [HttpFoundation] fix pdo session handler for sqlsrv [HttpClient][Psr18Client] Remove Psr18ExceptionTrait [HttpKernel] ignore failuresgenerated by opcache.restrict_api
2 parents eca0c6a + fcae1cf commit 5dd7f6b

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

Session/Storage/Handler/PdoSessionHandler.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -869,10 +869,10 @@ private function getMergeStatement(string $sessionId, string $data, int $maxlife
869869
$mergeStmt->bindParam(2, $sessionId, \PDO::PARAM_STR);
870870
$mergeStmt->bindParam(3, $data, \PDO::PARAM_LOB);
871871
$mergeStmt->bindValue(4, time() + $maxlifetime, \PDO::PARAM_INT);
872-
$mergeStmt->bindValue(4, time(), \PDO::PARAM_INT);
873-
$mergeStmt->bindParam(5, $data, \PDO::PARAM_LOB);
874-
$mergeStmt->bindValue(6, time() + $maxlifetime, \PDO::PARAM_INT);
875-
$mergeStmt->bindValue(6, time(), \PDO::PARAM_INT);
872+
$mergeStmt->bindValue(5, time(), \PDO::PARAM_INT);
873+
$mergeStmt->bindParam(6, $data, \PDO::PARAM_LOB);
874+
$mergeStmt->bindValue(7, time() + $maxlifetime, \PDO::PARAM_INT);
875+
$mergeStmt->bindValue(8, time(), \PDO::PARAM_INT);
876876
} else {
877877
$mergeStmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
878878
$mergeStmt->bindParam(':data', $data, \PDO::PARAM_LOB);

Session/Storage/NativeSessionStorage.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -401,13 +401,11 @@ public function setOptions(array $options)
401401
* ini_set('session.save_path', '/tmp');
402402
*
403403
* or pass in a \SessionHandler instance which configures session.save_handler in the
404-
* constructor, for a template see NativeFileSessionHandler or use handlers in
405-
* composer package drak/native-session
404+
* constructor, for a template see NativeFileSessionHandler.
406405
*
407406
* @see https://php.net/session-set-save-handler
408407
* @see https://php.net/sessionhandlerinterface
409408
* @see https://php.net/sessionhandler
410-
* @see https://github.com/zikula/NativeSession
411409
*
412410
* @param AbstractProxy|\SessionHandlerInterface|null $saveHandler
413411
*

0 commit comments

Comments
 (0)