Merge branch 'develop'

singularo · singularo · commit f4ea99beecd0 · 2022-09-19T15:23:22.000+09:30
diff --git a/fixtures/php/settings.php.txt b/fixtures/php/settings.php.txt
@@ -59,6 +59,10 @@ if (getenv('SHEPHERD_SECRET_PATH')) {
   }
 }
 if (getenv('SHEPHERD_REVERSE_PROXY')) {
+  if ($_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https, http') {
+    $_SERVER['HTTP_X_FORWARDED_PROTO'] = 'https';
+  }
+
   $settings['reverse_proxy'] = TRUE;
   $settings['reverse_proxy_header'] = getenv('SHEPHERD_REVERSE_PROXY_HEADER') ?: 'X_CLUSTER_CLIENT_IP';
   $settings['reverse_proxy_addresses'] = !empty(getenv('SHEPHERD_REVERSE_PROXY_ADDRESSES')) ? explode(',', getenv('SHEPHERD_REVERSE_PROXY_ADDRESSES')) : [];

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,10 @@ if (getenv('SHEPHERD_SECRET_PATH')) {`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`	`if (getenv('SHEPHERD_REVERSE_PROXY')) {`
	`62`	`+ if ($_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https, http') {`
	`63`	`+ $_SERVER['HTTP_X_FORWARDED_PROTO'] = 'https';`
	`64`	`+ }`
	`65`	`+`
`62`	`66`	`$settings['reverse_proxy'] = TRUE;`
`63`	`67`	`$settings['reverse_proxy_header'] = getenv('SHEPHERD_REVERSE_PROXY_HEADER') ?: 'X_CLUSTER_CLIENT_IP';`
`64`	`68`	`$settings['reverse_proxy_addresses'] = !empty(getenv('SHEPHERD_REVERSE_PROXY_ADDRESSES')) ? explode(',', getenv('SHEPHERD_REVERSE_PROXY_ADDRESSES')) : [];`