Merge branch 'master' into hotfix/json-renderer-merge-unnamed-children

zendframework · Mar 9, 2012 · bfed36c · bfed36c
commit bfed36c
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/Reader/Reader.php b/src/Reader/Reader.php
@@ -243,11 +243,11 @@ public static function import($uri, $etag = null, $lastModified = null)
             } else {
                 $responseXml = $response->getBody();
                 $cache->setItem($cacheId, $responseXml);
-                if ($response->getHeader('ETag')) {
-                    $cache->setItem($cacheId . '_etag', $response->getHeader('ETag'));
+                if ($response->headers()->get('ETag')) {
+                    $cache->setItem($cacheId . '_etag', $response->headers()->get('ETag')->getFieldValue());
                 }
-                if ($response->getHeader('Last-Modified')) {
-                    $cache->setItem($cacheId . '_lastmodified', $response->getHeader('Last-Modified'));
+                if ($response->headers()->get('Last-Modified')) {
+                    $cache->setItem($cacheId . '_lastmodified', $response->headers()->get('Last-Modified')->getFieldValue());
                 }
             }
             return self::importString($responseXml);