Merge pull request #307 from openshift-cherrypick-robot/cherry-pick-3…

…06-to-18.0-fr1 [18.0-fr1] [httpd] Set X-Forwarded-Proto only if empty
openstack-k8s-operators · Dec 19, 2024 · 694a0a6 · 694a0a6
2 parents e71e207 + 4b9ceed
commit 694a0a6
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/templates/swiftproxy/config/httpd.conf b/templates/swiftproxy/config/httpd.conf
@@ -34,7 +34,11 @@ CustomLog /dev/stdout proxy env=forwarded
 
   ## Request header rules
   ## as per http://httpd.apache.org/docs/2.2/mod/mod_headers.html#requestheader
-  RequestHeader set X-Forwarded-Proto "https"
+{{- if $vhost.TLS }}
+  RequestHeader setIfEmpty X-Forwarded-Proto "https"
+{{- else }}
+  RequestHeader setIfEmpty X-Forwarded-Proto "http"
+{{- end }}
 
   LimitRequestBody 5368709122
   LimitRequestFields 200