protect payload stream from replay. Closes hapijs#1252

jmonster · Dec 21, 2013 · b1e5d27 · b1e5d27
1 parent 2c301d0
commit b1e5d27
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/lib/response/file.js b/lib/response/file.js
@@ -52,8 +52,8 @@ internals.File.prototype._prepare = function (request, callback) {
 
         var fileName = Path.basename(filePath);
 
+        self.bytes(stat.size);
         self._headers['content-type'] = Mime.lookup(filePath) || 'application/octet-stream';
-        self._headers['content-length'] = stat.size;
         self._headers['last-modified'] = stat.mtime;
 
         // Use stat info for an LRU cache key.

diff --git a/lib/response/payload.js b/lib/response/payload.js
@@ -14,16 +14,22 @@ exports = module.exports = internals.Payload = function (payload) {
     this._prefix = null;
     this._suffix = null;
     this._sizeOffset = 0;
+    this._played = false;
 };
 
 Utils.inherits(internals.Payload, Stream.Readable);
 
 
 internals.Payload.prototype._read = function (size) {
 
-    this._prefix && this.push(this._prefix);
-    this.push(this._data);
-    this._suffix && this.push(this._suffix);
+    if (!this._played) {
+        this._played = true;
+
+        this._prefix && this.push(this._prefix);
+        this.push(this._data);
+        this._suffix && this.push(this._suffix);
+    }
+
     this.push(null);
 };