Merge pull request #4347 from NginxProxyManager/develop

v2.12.3

backend/templates/_location.conf

@@ -2,8 +2,8 @@
     {{ advanced_config }}
 
     proxy_set_header Host $host;
-    proxy_set_header X-Forwarded-Scheme $resolved_proto;
-    proxy_set_header X-Forwarded-Proto  $resolved_proto;
+    proxy_set_header X-Forwarded-Scheme $scheme;
+    proxy_set_header X-Forwarded-Proto  $scheme;
     proxy_set_header X-Forwarded-For    $remote_addr;
     proxy_set_header X-Real-IP		$remote_addr;
 

backend/templates/proxy_host.conf

@@ -4,8 +4,6 @@
 
 {% include "_hsts_map.conf" %}
 
-include conf.d/include/resolved_proto_map.conf;
-
 server {
   set $forward_scheme {{ forward_scheme }};
   set $server         "{{ forward_host }}";

docker/rootfs/etc/nginx/conf.d/include/proxy.conf

@@ -1,7 +1,8 @@
 add_header       X-Served-By $host;
 proxy_set_header Host $host;
-proxy_set_header X-Forwarded-Scheme $resolved_proto;
-proxy_set_header X-Forwarded-Proto  $resolved_proto;
+proxy_set_header X-Forwarded-Scheme $scheme;
+proxy_set_header X-Forwarded-Proto  $scheme;
 proxy_set_header X-Forwarded-For    $proxy_add_x_forwarded_for;
 proxy_set_header X-Real-IP          $remote_addr;
 proxy_pass       $forward_scheme://$server:$port$request_uri;
+

docker/rootfs/etc/nginx/conf.d/include/resolved_proto_map.conf

@@ -1,7 +0,0 @@
-# Resolve the effective protocol: use X-Forwarded-Proto if set
-# (e.g., from proxies like Cloudflare or AWS)
-# otherwise fall back to the current scheme.
-map $http_x_forwarded_proto $resolved_proto {
-    default $scheme;
-    ~.+ $http_x_forwarded_proto;
-}