Merge pull request #454 from openshift-cherrypick-robot/cherry-pick-4…

…53-to-18.0-fr1 [18.0-fr1] [httpd] Set X-Forwarded-Proto only if empty
openstack-k8s-operators · Dec 12, 2024 · 2c7e017 · 2c7e017
2 parents 6163f2d + 8c6b7b8
commit 2c7e017
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/templates/neutronapi/httpd/10-neutron-httpd.conf b/templates/neutronapi/httpd/10-neutron-httpd.conf
@@ -13,9 +13,9 @@
   ## Request header rules
   ## as per http://httpd.apache.org/docs/2.2/mod/mod_headers.html#requestheader
 {{- if $vhost.TLS }}
-  RequestHeader set X-Forwarded-Proto "https"
+  RequestHeader setIfEmpty X-Forwarded-Proto "https"
 {{- else }}
-  RequestHeader set X-Forwarded-Proto "http"
+  RequestHeader setIfEmpty X-Forwarded-Proto "http"
 {{- end }}
 
   ## Proxy rules