Improve host handler, fix swlib#15.

zhouao · Nov 2, 2018 · 955a8d3 · 955a8d3
1 parent 89113e4
commit 955a8d3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/Request.php b/src/Request.php
@@ -112,13 +112,7 @@ private function getConnectionTarget(): array
     {
         $host = $this->uri->getHost();
         if (empty($host)) {
-            $host = explode('/', ($uri_string = (string)$this->uri))[0] ?? '';
-            if (empty($host) || !preg_match('/\.\w+$/', $host)) {
-                throw new \InvalidArgumentException('Host should not be empty!');
-            }
-            $uri_string = 'http://' . rtrim($uri_string, '/');
-            $this->uri = new Uri($uri_string);
-            $host = $this->uri->getHost();
+            throw new \InvalidArgumentException('Host should not be empty!');
         }
         $port = $this->uri->getRealPort();
         $ssl = $this->getSSL();

diff --git a/src/Saber.php b/src/Saber.php
@@ -368,13 +368,20 @@ public function setOptions(array $options = [], ?Request $request = null): self
             $request = $this->raw;
             $this->options += self::mergeOptions($options, $this->options);
         }
+
+        // special options
         $options += [
             'base_uri' => $this->options['base_uri'] ?? null,
             'uri' => $this->options['uri'] ?? null
         ];
+        if (empty($options['base_uri']) && !empty($options['uri'] && strpos($options['uri'], '://') === false)) {
+            // fix uri like localhost
+            $options['uri'] = "http://{$options['uri']}";
+        }
         if ($this->session) {
             $options['session'] = $this->raw->cookies;
         }
+
         self::transOptionsToRequest($options, $request);
 
         return $this;
@@ -452,8 +459,8 @@ private static function transOptionsToRequest(array $options, Request $request)
 
         if (isset($options['base_uri']) || isset($options['uri'])) {
             $request->withUri(
-                Uri::resolve($options['base_uri'] ?? null, $options['uri'] ?? null),
-                !!$request->getHeader('Host')
+                Uri::resolve($options['base_uri'], $options['uri']),
+                $request->hasHeader('Host')
             );
         }