← All changes
|
vendor_prefixed/guzzlehttp/psr7/src/ServerRequest.php
+3
-3
28.1
→
trunk
View file →
| @@ -128,9 +128,9 @@ | ||
| 128 | 128 | * $_SERVER |
| 129 | 129 | */ |
| 130 | 130 | public static function fromGlobals() : \YoastSEO_Vendor\Psr\Http\Message\ServerRequestInterface |
| 131 | 131 | { |
| 132 | - $method = \strtoupper(self::getServerParam('REQUEST_METHOD') ?? 'GET'); | |
| 132 | + $method = \YoastSEO_Vendor\GuzzleHttp\Psr7\Utils::asciiToUpper(self::getServerParam('REQUEST_METHOD') ?? 'GET'); | |
| 133 | 133 | $headers = self::removeInvalidHostHeader(self::getAllHeaders()); |
| 134 | 134 | $uri = self::getUriFromGlobals(); |
| 135 | 135 | $body = new \YoastSEO_Vendor\GuzzleHttp\Psr7\CachingStream(new \YoastSEO_Vendor\GuzzleHttp\Psr7\LazyOpenStream('php://input', 'r+')); |
| 136 | 136 | $serverProtocol = self::getServerParam('SERVER_PROTOCOL'); |
| @@ -171,9 +171,9 @@ | ||
| 171 | 171 | */ |
| 172 | 172 | private static function removeInvalidHostHeader(array $headers) : array |
| 173 | 173 | { |
| 174 | 174 | foreach ($headers as $name => $value) { |
| 175 | - if (\strtolower((string) $name) !== 'host') { | |
| 175 | + if (\YoastSEO_Vendor\GuzzleHttp\Psr7\Utils::asciiToLower((string) $name) !== 'host') { | |
| 176 | 176 | continue; |
| 177 | 177 | } |
| 178 | 178 | if (\YoastSEO_Vendor\GuzzleHttp\Psr7\Rfc7230::parseHostHeader($value) === null) { |
| 179 | 179 | unset($headers[$name]); |
| @@ -212,9 +212,9 @@ | ||
| 212 | 212 | } elseif (($serverAddr = self::getServerParam('SERVER_ADDR')) !== null) { |
| 213 | 213 | $uri = $uri->withHost($serverAddr); |
| 214 | 214 | } |
| 215 | 215 | $serverPort = self::getServerParam('SERVER_PORT'); |
| 216 | - if (!$hasPort && $serverPort !== null && \preg_match('/^[+-]?\\d+$/', $serverPort) === 1) { | |
| 216 | + if (!$hasPort && $serverPort !== null && \preg_match('/^[+-]?\\d+$/D', $serverPort) === 1) { | |
| 217 | 217 | $uri = $uri->withPort((int) $serverPort); |
| 218 | 218 | } |
| 219 | 219 | $hasQuery = \false; |
| 220 | 220 | $requestUri = self::getServerParam('REQUEST_URI'); |