Merge branch '5.5'

diff --cc wcfsetup/install/files/lib/system/email/Mailbox.class.php
index 4782626e6a826836029a90845e53fc937f26ab77,c7cb2e908ca7d925f1b40f00553b00d42331b3c1..0b9ffbc333a865711e24ae7591c414cc959ed03a
--- 1/wcfsetup/install/files/lib/system/email/Mailbox.class.php
--- 2/wcfsetup/install/files/lib/system/email/Mailbox.class.php
+++ b/wcfsetup/install/files/lib/system/email/Mailbox.class.php
@@@ -2,10 -2,11 +2,11 @@@
  
  namespace wcf\system\email;
  
 -use TrueBV\Exception\OutOfBoundsException;
 -use TrueBV\Punycode;
 +use GuzzleHttp\Psr7\Uri;
 +use GuzzleHttp\Utils;
  use wcf\data\language\Language;
  use wcf\system\language\LanguageFactory;
+ use wcf\util\StringUtil;
  
  /**
   * Represents a RFC 5322 mailbox.
@@@ -35,15 -40,15 +36,15 @@@ class Mailbo
      /**
       * Creates a new Mailbox.
       *
 -     * @param string $address email address of this mailbox
 -     * @param string $name human readable name of this mailbox (or null)
 -     * @param Language $language Language to use for localization (or null for the default language)
 -     * @throws  \DomainException
 +     * @param $address email address of this mailbox
 +     * @param $name human readable name of this mailbox (or null)
 +     * @param $language Language to use for localization (or null for the default language)
 +     * @throws \DomainException
       */
 -    public function __construct($address, $name = null, ?Language $language = null)
 +    public function __construct(string $address, ?string $name = null, ?Language $language = null)
      {
          $this->address = self::filterAddress($address);
-         $this->name = $name;
+         $this->name = $name !== null ? StringUtil::trim($name) : null;
          if ($language === null) {
              $this->languageID = LanguageFactory::getInstance()->getDefaultLanguageID();
          } else {
@@@ -128,10 -135,16 +129,14 @@@
  
      /**
       * Returns a string representation for use in a RFC 5322 message.
 -     *
 -     * @return  string
       */
 -    public function __toString()
 +    public function __toString(): string
      {
-         if ($this->name === null || $this->name === $this->address) {
+         if (
+             $this->name === null
+             || $this->name === ''
+             || $this->name === $this->address
+         ) {
              return $this->address;
          }
  

diff --cc wcfsetup/install/files/lib/system/session/SessionHandler.class.php
index ad6b51e49608ff5cb18d02ebc2dccdc7a939730e,33f9f77ce51a7bf20364abbda2ad9045f1241a4d..1d0577f000e773cc0597d423a8148893a13e19d8
--- 1/wcfsetup/install/files/lib/system/session/SessionHandler.class.php
--- 2/wcfsetup/install/files/lib/system/session/SessionHandler.class.php
+++ b/wcfsetup/install/files/lib/system/session/SessionHandler.class.php
@@@ -429,11 -493,29 +429,15 @@@ final class SessionHandler extends Sing
              //    and it is supported by default in common JavaScript frameworks.
              // 2) We want to set the SameSite=lax parameter.
              // 3) We don't want the HttpOnly parameter.
 -            $sameSite = $cookieDomain = '';
  
 -            if (ApplicationHandler::getInstance()->isMultiDomainSetup()) {
 -                // We need to specify the cookieDomain in a multi domain set-up, because
 -                // otherwise no cookies are sent to subdomains.
 -                $cookieDomain = HeaderUtil::getCookieDomain();
 -                $cookieDomain = ($cookieDomain !== null ? '; domain=' . $cookieDomain : '');
 -            } else {
 -                // SameSite=lax is not supported in a multi domain set-up, because
 -                // it breaks cross-application requests.
 -                $sameSite = '; SameSite=lax';
 +            $sameSite = '; SameSite=lax';
  
 -                // Workaround for WebKit Bug #255524.
 -                // https://bugs.webkit.org/show_bug.cgi?id=255524
 -                $sameSite = '';
 -            }
 -
 -            if (!HTTP_SEND_X_FRAME_OPTIONS) {
 -                $sameSite = '; SameSite=none';
 -            }
++            // Workaround for WebKit Bug #255524.
++            // https://bugs.webkit.org/show_bug.cgi?id=255524
++            $sameSite = '';
+ 
              \header(
 -                'set-cookie: XSRF-TOKEN=' . \rawurlencode($xsrfToken) . '; path=/' . $cookieDomain . (RouteHandler::secureConnection() ? '; secure' : '') . $sameSite,
 +                'set-cookie: XSRF-TOKEN=' . \rawurlencode($xsrfToken) . '; path=/' . (RouteHandler::secureConnection() ? '; secure' : '') . $sameSite,
                  false
              );
          }