Merge branch 'master' into remove-multi-domain

diff --cc com.woltlab.wcf/option.xml
index d7ba28442bc1df1f897a27a1e3aed1603b95768e,9266c0a6dfd93745325b7af88d4a23b79b287c8f..74a735f593ab1ed88a5b4894b89739e185850d73
--- 1/com.woltlab.wcf/option.xml
--- 2/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@@ -1661,6 -1660,6 +1654,7 @@@ DESC:wcf.global.sortOrder.descending</s
                </options>
        </import>
        <delete>
 +              <option name="desktop_notification_package_id"/>
+               <option name="http_send_x_frame_options"/>
        </delete>
  </data>

diff --cc constants.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/WCF.class.php
index 1db4ae6f2059754e927f73790cf1924a586628b5,5ad42d7ee4f0a241a02c81f11d4ca6470eb2693a..e57b72c010f1a87ebe1466676a43787c03c9c347
--- 1/wcfsetup/install/files/lib/system/WCF.class.php
--- 2/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@@ -496,8 -482,8 +482,11 @@@ class WC
          // The captcha option related to the removed SearchForm was removed in 5.5.
          \define('SEARCH_USE_CAPTCHA', 0);
  
 +        // Multi-domain setups were removed in 5.6.
 +        \define('DESKTOP_NOTIFICATION_PACKAGE_ID', 1);
++
+         // Disabling X-Frame-Options is no longer possible since 5.6.
+         \define('HTTP_SEND_X_FRAME_OPTIONS', 1);
      }
  
      /**

diff --cc wcfsetup/install/files/lib/system/request/RequestHandler.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/session/SessionHandler.class.php
index 13142222c9a63f34145827b4c87d46c9b566fbb0,4a5e23f38cea823d0ae1ebfbe05972c9035e2334..dbb15360e7d2685f031bbd335d2fa381fc976d45
--- 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
@@@ -488,15 -489,21 +488,11 @@@ 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';
  
-             if (!HTTP_SEND_X_FRAME_OPTIONS) {
-                 $sameSite = '; SameSite=none';
-             }
- 
              \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
              );
          }

diff --cc wcfsetup/install/lang/de.xml
index d539a96fdeb1dd01f2dc8390da9345e82fd081f8,03285fef02805ea1b39cfdc87b4ca0d5b4533b47..56505df1bfb6630deb4c55b2fec2bde499930d10
--- 1/wcfsetup/install/lang/de.xml
--- 2/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@@ -5555,8 -5564,11 +5554,14 @@@ Benachrichtigungen auf <a href="{link i
        </category>
  </import>
  <delete>
 +      <item name="wcf.acp.option.desktop_notification_package_id"/>
 +      <item name="wcf.acp.option.desktop_notification_package_id.description"/>
 +      <item name="wcf.acp.application.multiDomain"/>
+       <item name="wcf.acp.pluginStore.api.noSSL"/>
+       <item name="wcf.acp.index.system.php.sslSupport"/>
+       <item name="wcf.acp.index.system.php.sslSupport.available"/>
+       <item name="wcf.acp.index.system.php.sslSupport.notAvailable"/>
+       <item name="wcf.acp.option.http_send_x_frame_options"/>
+       <item name="wcf.acp.option.http_send_x_frame_options.description"/>
  </delete>
  </language>

diff --cc wcfsetup/install/lang/en.xml
index 6795efaed8bf656918ee8ce56650403aa28157ff,f616ec27c350ab0aee87daf3196d542828df995f..77eef39b50978b3e2b9888d64d45a9040cd88a4f
--- 1/wcfsetup/install/lang/en.xml
--- 2/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@@ -5557,8 -5566,11 +5556,14 @@@ your notifications on <a href="{link is
        </category>
  </import>
  <delete>
 +      <item name="wcf.acp.option.desktop_notification_package_id"/>
 +      <item name="wcf.acp.option.desktop_notification_package_id.description"/>
 +      <item name="wcf.acp.application.multiDomain"/>
+       <item name="wcf.acp.pluginStore.api.noSSL"/>
+       <item name="wcf.acp.index.system.php.sslSupport"/>
+       <item name="wcf.acp.index.system.php.sslSupport.available"/>
+       <item name="wcf.acp.index.system.php.sslSupport.notAvailable"/>
+       <item name="wcf.acp.option.http_send_x_frame_options"/>
+       <item name="wcf.acp.option.http_send_x_frame_options.description"/>
  </delete>
  </language>