From fa5f136581e3b5d25f01c9d662632095c865be72 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 4 Mar 2020 09:42:16 +0100
Subject: [PATCH] Update nginx_plugin.inc.php (add port check for proxy)
---
server/plugins-available/nginx_plugin.inc.php | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index ef9300e5dc..ca14daf791 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -1522,9 +1522,13 @@ class nginx_plugin {
//proxy protocol settings
if($web_config['vhost_proxy_protocol_enabled'] == "y"){
- $vhost_data['use_proxy_protocol'] = $data['new']['proxy_protocol'];
- $vhost_data['proxy_protocol_http'] = (int)$web_config['vhost_proxy_protocol_http_port'];
- $vhost_data['proxy_protocol_https'] = (int)$web_config['vhost_proxy_protocol_https_port'];
+ if((int)$web_config['vhost_proxy_protocol_https_port'] > 0) {
+ $vhost_data['use_proxy_protocol'] = $data['new']['proxy_protocol'];
+ $vhost_data['proxy_protocol_http'] = (int)$web_config['vhost_proxy_protocol_http_port'];
+ $vhost_data['proxy_protocol_https'] = (int)$web_config['vhost_proxy_protocol_https_port'];
+ } else {
+ $vhost_data['use_proxy_protocol'] = "n";
+ }
}else{
$vhost_data['use_proxy_protocol'] = "n";
}
--
GitLab