Added response httpHeader support for http client

Author: andot

src/Hprose/Http/Client.php

@@ -40,6 +40,7 @@ class Client extends \Hprose\Client {
     private $curlVersionLittleThan720;
     private $results = array();
     private $curls = array();
+    private $contexts = array();
     public static function keepSession() {
         if (isset($_SESSION['HPROSE_COOKIE_MANAGER'])) {
             self::$cookieManager = $_SESSION['HPROSE_COOKIE_MANAGER'];
@@ -226,7 +227,7 @@ private function initCurl($curl, $request, $context) {
         But PHP 5.3 can't call private method in closure,
         so we comment the private keyword.
     */
-    /*private*/ function getContents($response) {
+    /*private*/ function getContents($response, $context) {
         do {
             list($response_headers, $response) = explode("\r\n\r\n", $response, 2);
             $http_response_header = explode("\r\n", $response_headers);
@@ -242,6 +243,24 @@ private function initCurl($curl, $request, $context) {
                 $response_status = "Unknown Error.";
             }
         } while (substr($response_code, 0, 1) == "1");
+        $header = array();
+        foreach ($http_response_header as $headerline) {
+            $pair = explode(':', $headerline, 2);
+            $name = trim($pair[0]);
+            $value = (count($pair) > 1) ? trim($pair[1]) : '';
+            if (array_key_exists($name, $header)) {
+                if (is_array($header[$name])) {
+                    $header[$name][] = $value;
+                }
+                else {
+                    $header[$name] = array($header[$name], $value);
+                }
+            }
+            else {
+                $header[$name] = $value;
+            }
+        }
+        $context->httpHeader = $header;
         if ($response_code != '200') {
             throw new Exception($response_code . ": " . $response_status . "\r\n\r\n" . $response);
         }
@@ -256,7 +275,7 @@ private function syncSendAndReceive($request, stdClass $context) {
         if ($errno) {
             throw new Exception($errno . ": " . curl_error($curl));
         }
-        $data = $this->getContents($data);
+        $data = $this->getContents($data, $context);
         curl_close($curl);
         return $data;
     }
@@ -266,6 +285,7 @@ private function asyncSendAndReceive($request, stdClass $context) {
         $this->initCurl($curl, $request, $context);
         $this->curls[] = $curl;
         $this->results[] = $result;
+        $this->contexts[] = $context;
         return $result;
     }
     protected function sendAndReceive($request, stdClass $context) {
@@ -291,6 +311,8 @@ public function loop() {
             $this->curls = array();
             $results = $this->results;
             $this->results = array();
+            $contexts = $this->contexts;
+            $this->contexts = array();
             foreach ($curls as $curl) {
                 curl_multi_add_handle($multicurl, $curl);
             }
@@ -304,9 +326,10 @@ public function loop() {
                     while ($info = curl_multi_info_read($multicurl, $msgs_in_queue)) {
                         $handle = $info['handle'];
                         $index = array_search($handle, $curls, true);
-                        $results[$index]->resolve(Future\sync(function() use ($self, $info, $handle) {
+                        $context = $contexts[$index];
+                        $results[$index]->resolve(Future\sync(function() use ($self, $info, $handle, $context) {
                             if ($info['result'] === CURLM_OK) {
-                                return $self->getContents(curl_multi_getcontent($handle));
+                                return $self->getContents(curl_multi_getcontent($handle), $context);
                             }
                             throw new Exception($info['result'] . ": " . curl_error($handle));
                         }));