Merge branch '2.1' of github.com:sulu/skeleton into 2.2

sulu · Jan 29, 2021 · 1e5bd4b · 1e5bd4b
2 parents f3463f9 + 594963d
commit 1e5bd4b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml
@@ -6,10 +6,12 @@ on:
         branches:
             - '[0-9]+.x'
             - '[0-9]+.[0-9]+'
+    schedule:
+        - cron: "0 0 * * *"
 
 jobs:
     test:
-        name: "Test and build with php ${{ matrix.php-version }} and Node.js ${{ matrix.node-version }}"
+        name: "PHP ${{ matrix.php-version }} and Node.js ${{ matrix.node-version }}"
         runs-on: ubuntu-latest
 
         strategy:
@@ -144,6 +146,11 @@ jobs:
               env: ${{ matrix.env }}
               working-directory: ${{ matrix.working-directory }}
 
+            - name: Test download-language script
+              run: bin/adminconsole sulu:admin:download-language nl
+              env: ${{ matrix.env }}
+              working-directory: ${{ matrix.working-directory }}
+
             - name: Install and configure Node
               uses: actions/setup-node@v1
               with:

diff --git a/public/index.php b/public/index.php
@@ -36,11 +36,11 @@
     Debug::enable();
 }
 
-if ($trustedProxies = $_SERVER['TRUSTED_PROXIES'] ?? $_ENV['TRUSTED_PROXIES'] ?? false) {
-    Request::setTrustedProxies(\explode(',', $trustedProxies), Request::HEADER_X_FORWARDED_ALL ^ Request::HEADER_X_FORWARDED_HOST);
+if ($trustedProxies = $_SERVER['TRUSTED_PROXIES'] ?? false) {
+    Request::setTrustedProxies(explode(',', $trustedProxies), Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO);
 }
 
-if ($trustedHosts = $_SERVER['TRUSTED_HOSTS'] ?? $_ENV['TRUSTED_HOSTS'] ?? false) {
+if ($trustedHosts = $_SERVER['TRUSTED_HOSTS'] ?? false) {
     Request::setTrustedHosts([$trustedHosts]);
 }