From 53205bfcd14dfd064ab4d6f7ebc7fee789c54a2f Mon Sep 17 00:00:00 2001
From: Mitar <mitar.github@tnode.com>
Date: Wed, 25 Nov 2015 22:13:09 -0800
Subject: [PATCH] Serve manifest.json file correctly for the main architecture.

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

diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js
index 65e7ea05b9..cb4fe2aaad 100644
--- a/packages/webapp/webapp_server.js
+++ b/packages/webapp/webapp_server.js
@@ -398,7 +398,7 @@ WebAppInternals.staticFilesMiddleware = function (staticFiles, req, res, next) {
   } else if (info.type === "json") {
     res.setHeader("Content-Type", "application/json; charset=UTF-8");
     // XXX if it is a manifest we are serving, set additional headers
-    if (/\/manifest.json$/.test(pathname)) {
+    if (/\/manifest\.json$/.test(pathname)) {
       res.setHeader("Access-Control-Allow-Origin", "*");
     }
   }
@@ -502,7 +502,7 @@ var runWebAppServer = function () {
 
         // Serve the program as a string at /foo/<arch>/manifest.json
         // XXX change manifest.json -> program.json
-        staticFiles[path.join(urlPrefix, 'manifest.json')] = {
+        staticFiles[path.join(urlPrefix, getItemPathname('/manifest.json'))] = {
           content: JSON.stringify(program),
           cacheable: true,
           type: "json"