You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ga...@apache.org on 2016/03/24 18:35:57 UTC
[1/2] fauxton commit: updated refs/heads/master to 87487ec
Repository: couchdb-fauxton
Updated Branches:
refs/heads/master 8699e98ab -> 87487ec89
remove console.log
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/620184b6
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/620184b6
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/620184b6
Branch: refs/heads/master
Commit: 620184b65bf7b751102c09ce86e4d01e72654d86
Parents: 8699e98
Author: Garren Smith <ga...@gmail.com>
Authored: Wed Mar 23 14:56:54 2016 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Wed Mar 23 14:56:54 2016 +0200
----------------------------------------------------------------------
devserver.js | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/620184b6/devserver.js
----------------------------------------------------------------------
diff --git a/devserver.js b/devserver.js
index ba540b2..a871b3f 100644
--- a/devserver.js
+++ b/devserver.js
@@ -76,7 +76,6 @@ var setCSP = function (res) {
var headerValue = settings.contentSecurityPolicyHeader || defaultHeaderValue;
- console.log('seeting', headerValue);
res.set('Content-Security-Policy', headerValue);
};
[2/2] fauxton commit: updated refs/heads/master to 87487ec
Posted by ga...@apache.org.
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 <ga...@gmail.com>
Authored: Wed Mar 23 18:53:51 2016 +0200
Committer: Garren Smith <ga...@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
});