couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gar...@apache.org
Subject [2/2] fauxton commit: updated refs/heads/master to 87487ec
Date Thu, 24 Mar 2016 17:35:58 GMT
webpack server fixes for travis


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/87487ec8
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/87487ec8
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/87487ec8

Branch: refs/heads/master
Commit: 87487ec891aa9cf8bd908b1692fe47a267b09bee
Parents: 620184b
Author: Garren Smith <garren.smith@gmail.com>
Authored: Wed Mar 23 18:53:51 2016 +0200
Committer: Garren Smith <garren.smith@gmail.com>
Committed: Wed Mar 23 18:53:51 2016 +0200

----------------------------------------------------------------------
 devserver.js | 4 ++++
 index.js     | 2 ++
 2 files changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/87487ec8/devserver.js
----------------------------------------------------------------------
diff --git a/devserver.js b/devserver.js
index a871b3f..234b1ab 100644
--- a/devserver.js
+++ b/devserver.js
@@ -121,6 +121,10 @@ var runWebpackServer = function () {
     }
   });
 
+  proxy.on('error', function (e) {
+    // don't explode on cancelled requests
+  });
+
   server.app.all('*', function (req, res, next) {
     setCSP(res);
     proxy.web(req, res);

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/87487ec8/index.js
----------------------------------------------------------------------
diff --git a/index.js b/index.js
index 204eba3..958a97e 100644
--- a/index.js
+++ b/index.js
@@ -36,6 +36,8 @@ module.exports = function (options) {
 
   // create proxy to couch for all couch requests
   var proxy = httpProxy.createServer({
+    secure: false,
+    changeOrigin: true,
     target: proxyUrl
   });
 


Mime
View raw message