Added httpHeader support for http client

Author: andot

src/Hprose/Http/Client.php

@@ -179,7 +179,8 @@ protected function setUri($uri) {
         $this->keepAlive = true;
         $this->keepAliveTimeout = 300;
     }
-    private function initCurl($curl, $request, $timeout) {
+    private function initCurl($curl, $request, $context) {
+        $timeout = $context->timeout;
         foreach ($this->options as $name => $value) {
             curl_setopt($curl, $name, $value);
         }
@@ -202,6 +203,13 @@ private function initCurl($curl, $request, $timeout) {
         foreach ($this->header as $name => $value) {
             $headers_array[] = $name . ": " . $value;
         }
+        if (isset($context->httpHeader)) {
+            $header = $context->httpHeader;
+            foreach ($header as $name => $value) {
+                $headers_array[] = $name . ": " .
+                    (is_array($value) ? join(", ", $value) : $value);
+            }
+        }
         curl_setopt($curl, CURLOPT_HTTPHEADER, $headers_array);
         if ($this->proxy) {
             curl_setopt($curl, CURLOPT_PROXY, $this->proxy);
@@ -242,7 +250,7 @@ private function initCurl($curl, $request, $timeout) {
     }
     private function syncSendAndReceive($request, stdClass $context) {
         $curl = curl_init();
-        $this->initCurl($curl, $request, $context->timeout);
+        $this->initCurl($curl, $request, $context);
         $data = curl_exec($curl);
         $errno = curl_errno($curl);
         if ($errno) {
@@ -255,7 +263,7 @@ private function syncSendAndReceive($request, stdClass $context) {
     private function asyncSendAndReceive($request, stdClass $context) {
         $result = new Future();
         $curl = curl_init();
-        $this->initCurl($curl, $request, $context->timeout);
+        $this->initCurl($curl, $request, $context);
         $this->curls[] = $curl;
         $this->results[] = $result;
         return $result;