[Http] Adding a fix for parsing the Cache-Control directives of a mes…

…sage that has multiple Cache-Control headers. Closes #2.
guzzle · Apr 21, 2011 · 88bcaa8 · 88bcaa8
1 parent a1baf54
commit 88bcaa8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/Guzzle/Http/Message/AbstractMessage.php b/src/Guzzle/Http/Message/AbstractMessage.php
@@ -239,6 +239,9 @@ protected function parseCacheControlDirective()
         $this->cacheControl = array();
         $cacheControl = $this->getHeader('Cache-Control');
         if ($cacheControl) {
+            if (is_array($cacheControl)) {
+                $cacheControl = implode(',', $cacheControl);
+            }
             foreach (explode(',', $cacheControl) as $pieces) {
                 $parts = array_map('trim', explode('=', $pieces));
                 $this->cacheControl[$parts[0]] = isset($parts[1]) ? $parts[1] : true;

diff --git a/tests/Guzzle/Tests/Http/Message/AbstractMessageTest.php b/tests/Guzzle/Tests/Http/Message/AbstractMessageTest.php
@@ -133,5 +133,15 @@ public function testHoldsCacheControlDirectives()
         $this->assertFalse($r->hasCacheControlDirective('max-age'));
         $r->addCacheControlDirective('must-revalidate');
         $this->assertTrue($r->hasCacheControlDirective('must-revalidate'));
+
+        // Make sure that it works with multiple Cache-Control headers
+        $r->setHeader('Cache-Control', 'must-revalidate, max-age=100');
+        $r->addHeaders(array(
+            'Cache-Control' => 'no-cache'
+        ));
+
+        $this->assertEquals(true, $r->getCacheControlDirective('no-cache'));
+        $this->assertEquals(true, $r->getCacheControlDirective('must-revalidate'));
+        $this->assertEquals(100, $r->getCacheControlDirective('max-age'));
     }
 }