netbird/plugins
0
0
Fork 0
mirror of https://github.com/netbirdio/plugins.git synced 2026-05-22 18:44:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

www/nginx: fix isEmpty() use #4342

Browse Source
This commit is contained in:
Franco Fichtner
2024-11-09 12:44:44 +01:00
parent bb69d46537
commit 1e23572053
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
www/nginx/Makefile
+1 -1
View File
@@ -1,6 +1,6 @@
PLUGIN_NAME= nginx
PLUGIN_VERSION= 1.34
PLUGIN_REVISION= 2
PLUGIN_REVISION= 3
PLUGIN_COMMENT= Nginx HTTP server and reverse proxy
PLUGIN_DEPENDS= nginx
PLUGIN_MAINTAINER= franz.fabian.94@gmail.com
www/nginx/src/opnsense/mvc/app/models/OPNsense/Base/Constraints/NgxBusyBufferConstraint.php
+5 -4
View File
@@ -43,24 +43,25 @@ class NgxBusyBufferConstraint extends BaseConstraint
$node = $this->getOption('node');
if ($node) {
$parentNode = $node->getParentNode();
if (!$this->isEmpty($node)) {
if (!$node->isEmpty()) {
$proxy_buffer_size_node = $parentNode->proxy_buffer_size;
$proxy_buffers_count_node = $parentNode->proxy_buffers_count;
$proxy_buffers_size_node = $parentNode->proxy_buffers_size;
$proxy_busy_buffers_size_node = $parentNode->proxy_busy_buffers_size;
if (!$this->isEmpty($proxy_buffers_count_node) && !$this->isEmpty($proxy_buffers_size_node)) {
if (!is_null($proxy_buffers_count_node) && !$proxy_buffers_count_node->isEmpty() &&
!is_null($proxy_buffers_size_node) && !$proxy_buffers_size_node->isEmpty()) {
$proxy_buffers_count_int = intval((string) $proxy_buffers_count_node);
$proxy_buffers_size_int = intval((string) $proxy_buffers_size_node);
$proxy_buffers_total_minus1_size = ($proxy_buffers_count_int - 1) * $proxy_buffers_size_int;
}
if (!$this->isEmpty($proxy_busy_buffers_size_node)) {
if (!is_null($proxy_busy_buffers_size_node) && !$proxy_busy_buffers_size_node->isEmpty()) {
$proxy_busy_buffers_size = intval((string) $proxy_busy_buffers_size_node);
}
if (!$this->isEmpty($proxy_buffer_size_node)) {
if (!is_null($proxy_buffer_size_node) && !$proxy_buffer_size_node->isEmpty()) {
$proxy_buffer_size_int = intval((string) $proxy_buffer_size_node);
}
www/nginx/src/opnsense/mvc/app/models/OPNsense/Base/Constraints/NgxUniqueDefaultServerConstraint.php
+2 -2
View File
@@ -45,7 +45,7 @@ class NgxUniqueDefaultServerConstraint extends BaseConstraint
if ($node) {
$httpServerNode = $node->getParentNode();
$defaultServerNode = $httpServerNode->getChild("default_server");
if (!$this->isEmpty($defaultServerNode)) {
if (!$defaultServerNode->isEmpty()) {
$myUUID = $httpServerNode->getAttribute("uuid");
$myListenHTTPAddress = $httpServerNode->getChild("listen_http_address");
@@ -58,7 +58,7 @@ class NgxUniqueDefaultServerConstraint extends BaseConstraint
$uuid = $httpServer->getAttribute("uuid");
if ($uuid != $myUUID) {
$defaultServerNode = $httpServer->getChild("default_server");
if (!$this->isEmpty($defaultServerNode)) {
if (!$defaultServerNode->isEmpty()) {
$listenHTTPAddressNode = $httpServer->getChild("listen_http_address");
if ($this->compareListenAddresses($myListenHTTPAddress, $listenHTTPAddressNode, $msg)) {
$validator->appendMessage(new Message(