Curl 使用完连接后执行 curl_reset

Yurunsoft · Mar 31, 2022 · 2061f97 · 2061f97
1 parent 701517d
commit 2061f97
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 5 deletions.
diff --git a/src/YurunHttp/Handler/Curl.php b/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;
+                }
             }
         }
     }

diff --git a/src/YurunHttp/Traits/THandler.php b/src/YurunHttp/Traits/THandler.php
@@ -33,7 +33,7 @@ public function parseRedirectLocation($location, $currentUri)
             {
                 $uri = $currentUri;
                 $path = $currentUri->getPath();
-                if('/' !== substr($path, -1, 1))
+                if ('/' !== substr($path, -1, 1))
                 {
                     $path = $path . '/';
                 }

diff --git a/tests/unit/HttpRequestTest/HttpRequestTest.php b/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());
+        });
+    }
 }