Преглед изворни кода

[ZF-8425] Inconsistent line ending style

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@19324 44c647ce-9c0f-0410-b52a-842ac1e357ba
yoshida@zend.co.jp пре 16 година
родитељ
комит
c96edafa05
1 измењених фајлова са 53 додато и 54 уклоњено
  1. 53 54
      library/Zend/Http/Response/Stream.php

+ 53 - 54
library/Zend/Http/Response/Stream.php

@@ -39,23 +39,23 @@ class Zend_Http_Response_Stream extends Zend_Http_Response
      * @var resource
      */
     protected $stream;
-    
+
     /**
      * The name of the file containing the stream
-     * 
+     *
      * Will be empty if stream is not file-based.
-     * 
+     *
      * @var string
      */
     protected $stream_name;
 
-    /* *
+    /**
      * Should we clean up the stream file when this response is closed?
-     * 
+     *
      * @var boolean
      */
     protected $_cleanup;
-    
+
     /**
      * Get the response as stream
      *
@@ -65,7 +65,7 @@ class Zend_Http_Response_Stream extends Zend_Http_Response
     {
         return $this->stream;
     }
-    
+
     /**
      * Set the response stream
      *
@@ -78,45 +78,45 @@ class Zend_Http_Response_Stream extends Zend_Http_Response
         return $this;
     }
 
-	/**
-	 * Get the cleanup trigger
-	 * 
-	 * @return boolean
-	 */
-	public function getCleanup() {
-		return $this->_cleanup;
-	}
-
-	/**
-	 * Set the cleanup trigger
-	 * 
-	 * @param $cleanup Set cleanup trigger
-	 */
-	public function setCleanup($cleanup = true) {
-		$this->_cleanup = $cleanup;
-	}
+    /**
+     * Get the cleanup trigger
+     *
+     * @return boolean
+     */
+    public function getCleanup() {
+        return $this->_cleanup;
+    }
+
+    /**
+     * Set the cleanup trigger
+     *
+     * @param $cleanup Set cleanup trigger
+     */
+    public function setCleanup($cleanup = true) {
+        $this->_cleanup = $cleanup;
+    }
 
     /**
      * Get file name associated with the stream
-     * 
-	 * @return string
-	 */
-	public function getStreamName() {
-		return $this->stream_name;
-	}
-
-	/**
-	 * Set file name associated with the stream
-	 * 
-	 * @param string $stream_name Name to set
-	 * @return Zend_Http_Response_Stream
-	 */
-	public function setStreamName($stream_name) {
-		$this->stream_name = $stream_name;
-		return $this;
-	}
-    
-    
+     *
+     * @return string
+     */
+    public function getStreamName() {
+        return $this->stream_name;
+    }
+
+    /**
+     * Set file name associated with the stream
+     *
+     * @param string $stream_name Name to set
+     * @return Zend_Http_Response_Stream
+     */
+    public function setStreamName($stream_name) {
+        $this->stream_name = $stream_name;
+        return $this;
+    }
+
+
     /**
      * HTTP response constructor
      *
@@ -136,17 +136,16 @@ class Zend_Http_Response_Stream extends Zend_Http_Response
      * @param string $message Response code as text
      * @throws Zend_Http_Exception
      */
-
-	public function __construct($code, $headers, $body = null, $version = '1.1', $message = null)
+    public function __construct($code, $headers, $body = null, $version = '1.1', $message = null)
     {
-        
+
         if(is_resource($body)) {
             $this->setStream($body);
             $body = '';
         }
         parent::__construct($code, $headers, $body, $version, $message);
     }
-    
+
     /**
      * Create a new Zend_Http_Response_Stream object from a string
      *
@@ -163,7 +162,7 @@ class Zend_Http_Response_Stream extends Zend_Http_Response
 
         return new self($code, $headers, $stream, $version, $message);
     }
-    
+
     /**
      * Get the response body as string
      *
@@ -183,7 +182,7 @@ class Zend_Http_Response_Stream extends Zend_Http_Response
         }
         return parent::getBody();
     }
-    
+
     /**
      * Get the raw response body (as transfered "on wire") as string
      *
@@ -199,12 +198,12 @@ class Zend_Http_Response_Stream extends Zend_Http_Response
         }
         return $this->body;
     }
-    
+
     /**
      * Read stream content and return it as string
-     * 
+     *
      * Function reads the remainder of the body from the stream and closes the stream.
-     * 
+     *
      * @return string
      */
     protected function readStream()
@@ -221,7 +220,7 @@ class Zend_Http_Response_Stream extends Zend_Http_Response
         fclose($this->stream);
         $this->stream = null;
     }
- 
+
     public function __destruct()
     {
         if(is_resource($this->stream)) {
@@ -232,5 +231,5 @@ class Zend_Http_Response_Stream extends Zend_Http_Response
             @unlink($this->stream_name);
         }
     }
-    
+
 }