Merge pull request #675 from fmount/forward-proto

[httpd] Set X-Forwarded-Proto only if empty

Author: openshift-merge-bot[bot]

templates/common/config/10-glance-httpd.conf

@@ -11,7 +11,11 @@
 
   ## 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 }}
 
   TimeOut {{ $vhost.TimeOut }}