From 55991f93c2fae9a31f0a43b4d6a078ffb9cef5e1 Mon Sep 17 00:00:00 2001
From: Pavel Kryl <pavel@kryl.eu>
Date: Thu, 13 Jan 2022 18:51:24 +0100
Subject: fixing bug #6914: Config Param 'overwritecondaddr' not working
- just ignoring/removing extra parameter 'protocol' as suggested by
blizzz
Signed-off-by: Pavel Kryl <pavel@kryl.eu>
---
lib/private/AppFramework/Http/Request.php | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
(limited to 'lib')
diff --git a/lib/private/AppFramework/Http/Request.php b/lib/private/AppFramework/Http/Request.php
index fdc475bd165..db568717b39 100644
--- a/lib/private/AppFramework/Http/Request.php
+++ b/lib/private/AppFramework/Http/Request.php
@@ -298,7 +298,7 @@ class Request implements \ArrayAccess, \Countable, IRequest {
* @return string
*/
public function getHeader(string $name): string {
- $name = strtoupper(str_replace('-', '_', $name));
+ $name = strtoupper(str_replace('-', '_',$name));
if (isset($this->server['HTTP_' . $name])) {
return $this->server['HTTP_' . $name];
}
@@ -626,14 +626,12 @@ class Request implements \ArrayAccess, \Countable, IRequest {
/**
* Check overwrite condition
- * @param string $type
* @return bool
*/
- private function isOverwriteCondition(string $type = ''): bool {
+ private function isOverwriteCondition(): bool {
$regex = '/' . $this->config->getSystemValueString('overwritecondaddr', '') . '/';
$remoteAddr = isset($this->server['REMOTE_ADDR']) ? $this->server['REMOTE_ADDR'] : '';
- return $regex === '//' || preg_match($regex, $remoteAddr) === 1
- || $type !== 'protocol';
+ return $regex === '//' || preg_match($regex, $remoteAddr) === 1;
}
/**
@@ -643,7 +641,7 @@ class Request implements \ArrayAccess, \Countable, IRequest {
*/
public function getServerProtocol(): string {
if ($this->config->getSystemValueString('overwriteprotocol') !== ''
- && $this->isOverwriteCondition('protocol')) {
+ && $this->isOverwriteCondition()) {
return $this->config->getSystemValueString('overwriteprotocol');
}
--
cgit v1.2.3
From 6c9f968888344cef11681a3b2ebf087f89680849 Mon Sep 17 00:00:00 2001
From: Pavel Kryl <pavel@kryl.eu>
Date: Thu, 13 Jan 2022 20:44:59 +0100
Subject: code style: ommited space, reverted [code review]
---
lib/private/AppFramework/Http/Request.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'lib')
diff --git a/lib/private/AppFramework/Http/Request.php b/lib/private/AppFramework/Http/Request.php
index db568717b39..69847fb49fe 100644
--- a/lib/private/AppFramework/Http/Request.php
+++ b/lib/private/AppFramework/Http/Request.php
@@ -298,7 +298,7 @@ class Request implements \ArrayAccess, \Countable, IRequest {
* @return string
*/
public function getHeader(string $name): string {
- $name = strtoupper(str_replace('-', '_',$name));
+ $name = strtoupper(str_replace('-', '_', $name));
if (isset($this->server['HTTP_' . $name])) {
return $this->server['HTTP_' . $name];
}
--
cgit v1.2.3