[PR #4505] PROXY Protocol support (rd 2) #3888

Open
opened 2026-02-26 08:32:20 +03:00 by kerem · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/NginxProxyManager/nginx-proxy-manager/pull/4505
Author: @adrum
Created: 4/25/2025
Status: 🔄 Open

Base: developHead: develop


📝 Commits (10+)

  • b687548 Merge pull request 'Fork syncthing' (#1) from GitHub/nginx-proxy-manager:develop into develop
  • ecb2752 PROXY Protocol support implementation
  • 9eabfb9 Merge branch 'NginxProxyManager:develop' into develop
  • 6c5f198 Merge branch 'develop' into develop
  • 54864f4 Merge branch 'NginxProxyManager:develop' into develop
  • cc6d249 Merge branch 'NginxProxyManager:develop' into develop
  • 1eb6a57 Merge branch 'NginxProxyManager:develop' into develop
  • fe8f853 Merge branch 'develop' of ssh://github.com/NginxProxyManager/nginx-proxy-manager into develop
  • 5e73361 bump build
  • cf4965c Update proxy_host.js

📊 Changes

15 files changed (+130 additions, -7 deletions)

View changed files

📝 backend/internal/nginx.js (+2 -1)
backend/migrations/20220209144645_proxy_protocol.js (+35 -0)
📝 backend/models/proxy_host.js (+1 -0)
📝 backend/schema/components/proxy-host-object.json (+12 -0)
📝 backend/schema/paths/nginx/proxy-hosts/get.json (+2 -0)
📝 backend/schema/paths/nginx/proxy-hosts/hostID/get.json (+2 -0)
📝 backend/schema/paths/nginx/proxy-hosts/hostID/put.json (+8 -0)
📝 backend/schema/paths/nginx/proxy-hosts/post.json (+8 -0)
📝 backend/templates/_listen.conf (+18 -2)
backend/templates/_proxy_protocol.conf (+6 -0)
📝 backend/templates/proxy_host.conf (+1 -0)
📝 frontend/js/app/nginx/proxy/form.ejs (+16 -1)
📝 frontend/js/app/nginx/proxy/form.js (+13 -1)
📝 frontend/js/i18n/messages.json (+4 -2)
📝 frontend/js/models/proxy-host.js (+2 -0)

📄 Description

This is essentially https://github.com/NginxProxyManager/nginx-proxy-manager/pull/1882 with the merge conflicts resolved.

I first tried submitting a PR to the source branch, but it's not yet been merged. https://github.com/SBado/nginx-proxy-manager/pull/1

I thought I might have better luck here 😄


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/NginxProxyManager/nginx-proxy-manager/pull/4505 **Author:** [@adrum](https://github.com/adrum) **Created:** 4/25/2025 **Status:** 🔄 Open **Base:** `develop` ← **Head:** `develop` --- ### 📝 Commits (10+) - [`b687548`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/b6875487fd69f4c096ee32d3eb3e7ce4edb282c4) Merge pull request 'Fork syncthing' (#1) from GitHub/nginx-proxy-manager:develop into develop - [`ecb2752`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/ecb27521b411339d7cf9e9652d37b3e8174ed26c) PROXY Protocol support implementation - [`9eabfb9`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/9eabfb9a535741ca0559633751bbb212e9cbde11) Merge branch 'NginxProxyManager:develop' into develop - [`6c5f198`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/6c5f1988f06126da89fae0ec25c046b479adebfb) Merge branch 'develop' into develop - [`54864f4`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/54864f48516b34991862497391aaac85af319ba5) Merge branch 'NginxProxyManager:develop' into develop - [`cc6d249`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/cc6d249bb7380cc2efe3890636950a81826c11ac) Merge branch 'NginxProxyManager:develop' into develop - [`1eb6a57`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/1eb6a577402c57efefb5ef541cbbac78177bef5a) Merge branch 'NginxProxyManager:develop' into develop - [`fe8f853`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/fe8f8531864b7c980b338debb22fcd1cdc84e836) Merge branch 'develop' of ssh://github.com/NginxProxyManager/nginx-proxy-manager into develop - [`5e73361`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/5e733614da09af39479eb30a711da22d748ebc8a) bump build - [`cf4965c`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/cf4965c03e0146cfa26cc02c987046291ae9593f) Update proxy_host.js ### 📊 Changes **15 files changed** (+130 additions, -7 deletions) <details> <summary>View changed files</summary> 📝 `backend/internal/nginx.js` (+2 -1) ➕ `backend/migrations/20220209144645_proxy_protocol.js` (+35 -0) 📝 `backend/models/proxy_host.js` (+1 -0) 📝 `backend/schema/components/proxy-host-object.json` (+12 -0) 📝 `backend/schema/paths/nginx/proxy-hosts/get.json` (+2 -0) 📝 `backend/schema/paths/nginx/proxy-hosts/hostID/get.json` (+2 -0) 📝 `backend/schema/paths/nginx/proxy-hosts/hostID/put.json` (+8 -0) 📝 `backend/schema/paths/nginx/proxy-hosts/post.json` (+8 -0) 📝 `backend/templates/_listen.conf` (+18 -2) ➕ `backend/templates/_proxy_protocol.conf` (+6 -0) 📝 `backend/templates/proxy_host.conf` (+1 -0) 📝 `frontend/js/app/nginx/proxy/form.ejs` (+16 -1) 📝 `frontend/js/app/nginx/proxy/form.js` (+13 -1) 📝 `frontend/js/i18n/messages.json` (+4 -2) 📝 `frontend/js/models/proxy-host.js` (+2 -0) </details> ### 📄 Description This is essentially https://github.com/NginxProxyManager/nginx-proxy-manager/pull/1882 with the merge conflicts resolved. I first tried submitting a PR to the source branch, but it's not yet been merged. https://github.com/SBado/nginx-proxy-manager/pull/1 I thought I might have better luck here 😄 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
Sign in to join this conversation.
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
starred/nginx-proxy-manager-NginxProxyManager#3888
No description provided.