Fix php-curl-class#31: Combine multiple header fields into a comma-separated list

Author: zachborboa

src/Curl.class.php

@@ -246,7 +246,8 @@ private function parseHeaders($raw_headers)
             list($key, $value) = explode(':', $raw_headers[$i], 2);
             $key = trim($key);
             $value = trim($value);
-            if (array_key_exists($key, $http_headers)) {
+            // Use isset() as array_key_exists() and ArrayAccess are not compatible.
+            if (isset($http_headers[$key])) {
                 $http_headers[$key] .= ',' . $value;
             } else {
                 $http_headers[$key] = $value;

tests/PHPCurlClass/PHPCurlClassTest.php

@@ -277,6 +277,12 @@ public function testCookieJar() {
         $this->assertFalse(file_exists($cookie_file));
     }
 
+    public function testMultipleCookieResponse() {
+        $test = new Test();
+        $test->server('multiple_cookie', 'GET');
+        $this->assertEquals($test->curl->response_headers['Set-Cookie'], 'cookie1=scrumptious,cookie2=mouthwatering');
+    }
+
     public function testError() {
         $test = new Test();
         $test->curl->setOpt(CURLOPT_CONNECTTIMEOUT_MS, 2000);

tests/PHPCurlClass/server.php

@@ -80,6 +80,11 @@
     setcookie('mycookie', 'yum');
     exit;
 }
+else if ($test === 'multiple_cookie') {
+    setcookie('cookie1', 'scrumptious');
+    setcookie('cookie2', 'mouthwatering');
+    exit;
+}
 else if ($test === 'response_header') {
     header('Content-Type: application/json');
     header('ETag: ' . md5('worldpeace'));