Merge pull request #180 from City-of-Helsinki/UHF-9113-drupal-10

UHF-9113: Drupal 10 support
City-of-Helsinki · Oct 27, 2023 · 6d4667e · 6d4667e
2 parents 2c4bea6 + fa76448
commit 6d4667e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -9,7 +9,7 @@
     "require": {
         "composer/installers": "^2.0",
         "cweagans/composer-patches": "^1.6.7",
-        "drupal/core-composer-scaffold": "^9.5",
+        "drupal/core-composer-scaffold": "^9.5 || ^10",
         "drupal/hdbt": "^5.0",
         "drupal/hdbt_admin": "^2.0",
         "drupal/helfi_azure_fs": "^1.0",
@@ -20,7 +20,7 @@
     "require-dev": {
         "donatj/mock-webserver": "^2.4",
         "drupal/coder": "^8.3",
-        "drupal/core-dev": "^9.5",
+        "drupal/core-dev": "^9.5 || ^10",
         "jangregor/phpstan-prophecy": "^1.0",
         "mglaman/phpstan-drupal": "^1.2",
         "phpspec/prophecy-phpunit": "^2",

diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php
@@ -121,7 +121,7 @@ function drupal_get_env(string|array $variables) : mixed {
   }
   $settings['reverse_proxy'] = TRUE;
   $settings['reverse_proxy_addresses'] = $reverse_proxy_address;
-  $settings['reverse_proxy_trusted_headers'] = Request::HEADER_X_FORWARDED_ALL;
+  $settings['reverse_proxy_trusted_headers'] = Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO;
   $settings['reverse_proxy_host_header'] = 'X_FORWARDED_HOST';
 }