fix #13

w7corp · May 5, 2015 · b5de842 · b5de842
1 parent be1a951
commit b5de842
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/src/Wechat/Utils/Http.php b/src/Wechat/Utils/Http.php
@@ -179,15 +179,16 @@ protected function request($url, $method = self::GET, $params = array(), $option
         $response = $this->doCurl();
 
         // Separate headers and body
-        $responseSplit = preg_split('/((?:\\r?\\n){2})/', $response['response']);
-        $responseCount = count($responseSplit);
+        $headerSize = $response['curl_info']['header_size'];
+        $header     = substr($response['response'], 0, $headerSize);
+        $body       = substr($response['response'], $headerSize);
 
         $results = array(
             'curl_info'    => $response['curl_info'],
             'content_type' => $response['curl_info']['content_type'],
             'status'       => $response['curl_info']['http_code'],
-            'headers'      => count($responseSplit) > 2 ? $this->splitHeaders($responseSplit[$responseCount - 2]) : '' ,
-            'data'         => count($responseSplit) > 1 ? $responseSplit[$responseCount - 1] : '',
+            'headers'      => $this->splitHeaders($header),
+            'data'         => $body,
         );
 
         return $results;
@@ -218,14 +219,16 @@ protected function createCurlFile($filename)
      */
     protected function splitHeaders($rawHeaders)
     {
-        $headers = array();
+        $headers = [];
 
-        $headerLines     = explode("\n", $rawHeaders);
         $headers['HTTP'] = array_shift($headerLines);
 
-        foreach ($headerLines as $line) {
-            $header = explode(':', $line, 2);
-            $headers[trim($header[0])] = trim($header[1]);
+        foreach (explode("\n", trim($rawHeaders)) as $i => $h) {
+            $h = explode(':', $h, 2);
+
+            if (isset($h[1])) {
+                $headers[$h[0]] = trim($h[1]);
+            }
         }
 
         return $headers;