From 59afaf9f0362e4422cb52e2fa078785a8c79a9c0 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sun, 18 Aug 2019 11:22:00 +0700 Subject: [PATCH 1/2] reduce getHeaders() call in Request::setServer() --- src/PhpEnvironment/Request.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/PhpEnvironment/Request.php b/src/PhpEnvironment/Request.php index 03d9e7af3a..3e8d41144c 100644 --- a/src/PhpEnvironment/Request.php +++ b/src/PhpEnvironment/Request.php @@ -233,7 +233,7 @@ public function setServer(ParametersInterface $server) } } - $this->getHeaders()->addHeaders($headers); + $headers = $this->getHeaders()->addHeaders($headers); // set method if (isset($this->serverParams['REQUEST_METHOD'])) { @@ -266,8 +266,8 @@ public function setServer(ParametersInterface $server) $port = null; // Set the host - if ($this->getHeaders()->get('host')) { - $host = $this->getHeaders()->get('host')->getFieldValue(); + if ($headers->get('host')) { + $host = $headers->get('host')->getFieldValue(); // works for regname, IPv4 & IPv6 if (preg_match('|\:(\d+)$|', $host, $matches)) { From ac77601548ff0e983a96459773ad4c614819304f Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Thu, 22 Aug 2019 15:13:08 +0700 Subject: [PATCH 2/2] apply assignment getHeaders()->get(host) --- src/PhpEnvironment/Request.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/PhpEnvironment/Request.php b/src/PhpEnvironment/Request.php index 3e8d41144c..6aa733a122 100644 --- a/src/PhpEnvironment/Request.php +++ b/src/PhpEnvironment/Request.php @@ -233,7 +233,7 @@ public function setServer(ParametersInterface $server) } } - $headers = $this->getHeaders()->addHeaders($headers); + $this->getHeaders()->addHeaders($headers); // set method if (isset($this->serverParams['REQUEST_METHOD'])) { @@ -266,8 +266,9 @@ public function setServer(ParametersInterface $server) $port = null; // Set the host - if ($headers->get('host')) { - $host = $headers->get('host')->getFieldValue(); + $headerHost = $this->getHeaders()->get('host'); + if ($headerHost) { + $host = $headerHost->getFieldValue(); // works for regname, IPv4 & IPv6 if (preg_match('|\:(\d+)$|', $host, $matches)) {