Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve #636

Browse source
This commit is contained in:
the-djmaze 2022-11-07 11:45:01 +01:00
parent 92d967f1e6
commit 07e80dd36e
1 changed files with 33 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

37
snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php
View file

@ -144,6 +144,28 @@ class Utils
if (\strlen($sValue)) { if (\strlen($sValue)) {
$_COOKIE[$sName] = $sValue; $_COOKIE[$sName] = $sValue;
} }
// Cookie "$sName" has been rejected because it is already expired.
// Happens when \setcookie() sends multiple with the same name (and one is deleted)
// So when previously set, we must delete all 'Set-Cookie' headers and start over
$cookies = [];
$cookie_remove = false;
foreach (\headers_list() as $header) {
if (\preg_match("/Set-Cookie:([^=]+)=/i", $header, $match)) {
if (\trim($match[1]) == $sName) {
$cookie_remove = true;
} else {
$cookies[] = $header;
}
}
}
if ($cookie_remove) {
\header_remove('Set-Cookie');
foreach ($cookies as $cookie) {
\header($cookie);
}
}
\setcookie($sName, $sValue, array( \setcookie($sName, $sValue, array(
'expires' => $iExpire, 'expires' => $iExpire,
'path' => $sPath, 'path' => $sPath,
@ -154,7 +176,11 @@ class Utils
)); ));
} }
public static function SetCookie(string $sName, string $sValue = '', int $iExpire = 0) /**
* Firefox: Cookie "$sName" has been rejected because it is already expired.
* \header_remove("set-cookie: {$sName}");
*/
public static function SetCookie(string $sName, string $sValue, int $iExpire = 0)
{ {
$sPath = static::$CookieDefaultPath; $sPath = static::$CookieDefaultPath;
$sPath = $sPath && \strlen($sPath) ? $sPath : '/'; $sPath = $sPath && \strlen($sPath) ? $sPath : '/';
@ -166,12 +192,15 @@ class Utils
throw new \Exception("Cookie '{$sName}' value too long"); throw new \Exception("Cookie '{$sName}' value too long");
} }
*/ */
// Clear 4K split cookie first // Set the new 4K split cookie
static::ClearCookie($sName);
// Now set the new 4K split cookie
foreach (\str_split($sValue, $iMaxSize) as $i => $sPart) { foreach (\str_split($sValue, $iMaxSize) as $i => $sPart) {
static::_SetCookie($i ? "{$sName}~{$i}" : $sName, $sPart, $iExpire); static::_SetCookie($i ? "{$sName}~{$i}" : $sName, $sPart, $iExpire);
} }
// Delete unused old 4K split cookie parts
while (($sCookieName = "{$sName}~" . ++$i) && isset($_COOKIE[$sCookieName])) {
unset($_COOKIE[$sCookieName]);
static::_SetCookie($sCookieName, '', \time() - 3600 * 24 * 30);
}
} }
public static function ClearCookie(string $sName) public static function ClearCookie(string $sName)