Merge branch 'master' into no

zendframework · Feb 23, 2012 · c88dfd5 · c88dfd5
2 parents 721f88b + d2f65cb
commit c88dfd5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/src/Header/SetCookie.php b/src/Header/SetCookie.php
@@ -175,21 +175,30 @@ public function getFieldValue()
             throw new Exception\RuntimeException('A cookie name is required to generate a field value for this cookie');
         }
         $fieldValue = $this->getName() . '=' . urlencode($this->getValue());
-        if (($expires = $this->getExpires())) {
+
+        $expires = $this->getExpires();
+        if ($expires) {
             $fieldValue .= '; Expires=' . $expires;
         }
-        if (($domain = $this->getDomain())) {
+
+        $domain = $this->getDomain();
+        if ($domain) {
             $fieldValue .= '; Domain=' . $domain;
         }
-        if (($path = $this->getPath())) {
+
+        $path = $this->getPath();
+        if ($path) {
             $fieldValue .= '; Path=' . $path;
         }
+
         if ($this->isSecure()) {
             $fieldValue .= '; Secure';
         }
+
         if ($this->isHttponly()) {
             $fieldValue .= '; HttpOnly';
         }
+
         return $fieldValue;
     }
 
@@ -362,15 +371,15 @@ public function isValidForRequest($requestDomain, $path, $isSecure = false)
         if ($this->getDomain() && (strrpos($requestDomain, $this->getDomain()) !== false)) {
             return false;
         }
-        
+
         if ($this->getPath() && (strpos($path, $this->getPath()) !== 0)) {
             return false;
         }
-        
+
         if ($this->secure && $this->isSecure()!==$isSecure) {
             return false;
         }
-        
+
         return true;
 
     }

diff --git a/src/Response/Stream.php b/src/Response/Stream.php
@@ -132,12 +132,12 @@ public function setStreamName($stream_name) {
     public static function fromStream($response_str, $stream)
     {
         $response= new static();
-        
+
         $response::fromString($response_str);
         if (is_resource($stream)) {
             $response->setStream($stream);
         }
-        
+
         return $response;
     }
 
@@ -190,11 +190,7 @@ protected function readStream()
             return '';
         }
 
-        if(isset($headers['content-length'])) {
-            $this->body = stream_get_contents($this->stream, $headers['content-length']);
-        } else {
-            $this->body = stream_get_contents($this->stream);
-        }
+        $this->body = stream_get_contents($this->stream);
         fclose($this->stream);
         $this->stream = null;
     }