fix header size

Author: hhxsv5

src/Curl.php

@@ -119,7 +119,8 @@ public function exec()
         $errstr = curl_error($this->handle);//Fix: curl_errno() always return 0 when fail
         $url = curl_getinfo($this->handle, CURLINFO_EFFECTIVE_URL);
         $code = curl_getinfo($this->handle, CURLINFO_HTTP_CODE);
-        $this->response = Response::make($url, $code, $responseStr, $errno, $errstr);
+        $headerSize = curl_getinfo($this->handle, CURLINFO_HEADER_SIZE);
+        $this->response = Response::make($url, $code, $responseStr, $headerSize, [$errno, $errstr]);
         return $this->response;
     }
 

src/Response.php

@@ -65,29 +65,32 @@ public function __toString()
         return $this->body;
     }
 
-    public static function parse($str)
+    public static function parse($responseStr, $headerSize)
     {
-        $headers = [];
-        list($header, $body) = explode("\r\n\r\n", $str, 2);
-        $data = explode("\n", $header);
-        array_shift($data);//Remove status
+        $header = substr($responseStr, 0, $headerSize);
+        $body = substr($responseStr, $headerSize);
+        $lines = explode("\n", $header);
+        array_shift($lines);//Remove status
 
-        foreach ($data as $part) {
+        $headers = [];
+        foreach ($lines as $part) {
             $middle = explode(':', $part);
-            $headers[trim($middle[0])] = trim($middle[1]);
+            $key = trim($middle[0]);
+            if ($key === '') {
+                continue;
+            }
+            $headers[$key] = isset($middle[1]) ? trim($middle[1]) : '';
         }
         return [$headers, $body];
     }
 
-    public static function make($url, $code, $responseStr, $errno, $errstr)
+    public static function make($url, $code, $responseStr, $headerSize, array $error)
     {
-        $error = [];
-        if ($errno || $errstr) {
+        if (!empty($error[0]) || !empty($error[1])) {
             $headers = [];
             $body = '';
-            $error = [$errno, $errstr];
         } else {
-            list($headers, $body) = static::parse($responseStr);
+            list($headers, $body) = static::parse($responseStr, $headerSize);
         }
         return new static($url, $code, $body, $headers, $error);
     }