From 8dbd41719ad406e1167bc098b3940c0d9a2f0f4e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 22 Nov 2017 17:13:40 -0500
Subject: [PATCH] End HTTP response when stream ends.

---
 packages/webapp/webapp_server.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js
index 29da50fb95..bc50e37059 100644
--- a/packages/webapp/webapp_server.js
+++ b/packages/webapp/webapp_server.js
@@ -778,12 +778,18 @@ function runWebAppServer() {
         if (!statusCode) {
           statusCode = res.statusCode ? res.statusCode : 200;
         }
+
         if (newHeaders) {
-          headers = {...headers, ...newHeaders };
+          Object.assign(headers, newHeaders);
         }
 
         res.writeHead(statusCode, headers);
-        stream.pipe(res)
+
+        stream.pipe(res, {
+          // End the response when the stream ends.
+          end: true,
+        });
+
       }).catch(error => {
         Log.error("Error running template: " + error.stack);
         res.writeHead(500, headers);