From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Mon, 20 Sep 2021 14:07:04 +0000 (+0200)
Subject: Merge branch '5.4'
X-Git-Tag: 5.5.0_Alpha_1~443
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3607dde61724c01841354a7af896da31d580c245;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '5.4'
---

3607dde61724c01841354a7af896da31d580c245
diff --cc wcfsetup/install/files/options.inc.php
index 87e1f5ea2f,edfa6df091..1110de5f7b
--- a/wcfsetup/install/files/options.inc.php
+++ b/wcfsetup/install/files/options.inc.php
@@@ -22,10 -22,14 +22,10 @@@ if (\file_exists(WCF_DIR . 'cookiePrefi
  \define('COOKIE_PATH', '');
  \define('COOKIE_DOMAIN', '');
  
- \define('HTTP_SEND_X_FRAME_OPTIONS', 0);
+ \define('HTTP_SEND_X_FRAME_OPTIONS', 1);
  
 -\define('BLACKLIST_IP_ADDRESSES', '');
 -\define('BLACKLIST_USER_AGENTS', '');
 -
  \define('CACHE_SOURCE_TYPE', 'disk');
  \define('IMAGE_ADAPTER_TYPE', 'gd');
 -\define('MODULE_MASTER_PASSWORD', 0);
  \define('TIMEZONE', 'Europe/Berlin');
  
  \define('ENABLE_DEBUG_MODE', 1);