Merge pull request #20 from Yurunsoft/fix-19

修复 bug #19

Author: Yurunsoft

src/YurunHttp/Handler/Curl.php

@@ -104,6 +104,7 @@ public function close()
         {
             if ($this->poolIsEnabled)
             {
+                curl_reset($this->handler);
                 CurlHttpConnectionManager::getInstance()->release($this->poolKey, $this->handler);
             }
             else
@@ -229,11 +230,15 @@ public function send(&$request)
         }
         finally
         {
-            if ($poolIsEnabled && $this->handler)
+            if ($this->handler)
             {
-                // @phpstan-ignore-next-line
-                $httpConnectionManager->release($this->poolKey, $this->handler);
-                $this->handler = null;
+                curl_reset($this->handler);
+                if ($poolIsEnabled)
+                {
+                    // @phpstan-ignore-next-line
+                    $httpConnectionManager->release($this->poolKey, $this->handler);
+                    $this->handler = null;
+                }
             }
         }
     }

src/YurunHttp/Traits/THandler.php

@@ -31,13 +31,16 @@ public function parseRedirectLocation($location, $currentUri)
             }
             else
             {
-                $path = \dirname($currentUri);
-                if ('\\' === \DIRECTORY_SEPARATOR && false !== strpos($path, \DIRECTORY_SEPARATOR))
+                $uri = $currentUri;
+                $path = $currentUri->getPath();
+                if ('/' !== substr($path, -1, 1))
                 {
-                    $path = str_replace(\DIRECTORY_SEPARATOR, '/', $path);
+                    $path = $path . '/';
                 }
-                $uri = new Uri($path . '/' . $location);
+                $path .= $location;
+                $uri = $uri->withPath($path);
             }
+            $uri = $uri->withHost($currentUri->getHost())->withPort($currentUri->getPort());
         }
         else
         {

tests/unit/HttpRequestTest/HttpRequestTest.php

@@ -663,4 +663,21 @@ public function testHead()
             $this->assertResponse($response);
         });
     }
+
+    /**
+     * @see https://github.com/Yurunsoft/YurunHttp/issues/19
+     *
+     * @return void
+     */
+    public function testBug19()
+    {
+        $this->call(function () {
+            $http = new HttpRequest();
+            $response = $http->head('https://www.baidu.com');
+            $this->assertResponse($response);
+            $response = $http->get('https://www.baidu.com');
+            $this->assertResponse($response);
+            $this->assertTrue('' != $response->body());
+        });
+    }
 }