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 2014/06/11 11:22:33 UTC
[1/2] couchdb commit: updated refs/heads/master to 672cacb
Repository: couchdb
Updated Branches:
refs/heads/master 8194ddb0a -> 672cacb80
Fauxton: Content Security Policy optional for dev
This just makes the content security policy optional for
development.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/672cacb8
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/672cacb8
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/672cacb8
Branch: refs/heads/master
Commit: 672cacb8060e9fdbe0d08e0b5aa36fbc7b898cc6
Parents: aca4bc7
Author: Garren Smith <ga...@gmail.com>
Authored: Tue Jun 10 15:19:32 2014 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Wed Jun 11 11:21:34 2014 +0200
----------------------------------------------------------------------
src/fauxton/tasks/couchserver.js | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/672cacb8/src/fauxton/tasks/couchserver.js
----------------------------------------------------------------------
diff --git a/src/fauxton/tasks/couchserver.js b/src/fauxton/tasks/couchserver.js
index 3a17ab6..8e95c5c 100644
--- a/src/fauxton/tasks/couchserver.js
+++ b/src/fauxton/tasks/couchserver.js
@@ -25,7 +25,8 @@ module.exports = function (grunt) {
// Options
var dist_dir = options.dist || './dist/debug/',
app_dir = './app',
- port = options.port || 8000;
+ port = options.port || 8000,
+ setContentSecurityPolicy = _.isUndefined(options.contentSecurityPolicy) ? true : options.contentSecurityPolicy;
// Proxy options with default localhost
var proxy_settings = options.proxy || {
@@ -47,9 +48,11 @@ module.exports = function (grunt) {
accept = req.headers.accept.split(','),
filePath;
- var headerValue = "default-src 'self'; img-src 'self'; font-src 'self'; " +
- "script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline';";
- res.setHeader('Content-Security-Policy', headerValue);
+ if (setContentSecurityPolicy) {
+ var headerValue = "default-src 'self'; img-src 'self'; font-src 'self'; " +
+ "script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline';";
+ res.setHeader('Content-Security-Policy', headerValue);
+ }
if (!!url.match(/^\/addons\/.*\/assets\/js/)) {
filePath = path.join(app_dir, url.replace('/_utils/fauxton/',''));
[2/2] couchdb commit: updated refs/heads/master to 672cacb
Posted by ga...@apache.org.
Fauxton: Fix font awesome url to work for release
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/aca4bc79
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/aca4bc79
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/aca4bc79
Branch: refs/heads/master
Commit: aca4bc797cadddce89c7c90530da30df98c51f51
Parents: 8194ddb
Author: Garren Smith <ga...@gmail.com>
Authored: Tue Jun 10 14:51:12 2014 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Wed Jun 11 11:21:34 2014 +0200
----------------------------------------------------------------------
src/fauxton/assets/less/bootstrap/font-awesome/variables.less | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/aca4bc79/src/fauxton/assets/less/bootstrap/font-awesome/variables.less
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/less/bootstrap/font-awesome/variables.less b/src/fauxton/assets/less/bootstrap/font-awesome/variables.less
index 5d93614..0715887 100644
--- a/src/fauxton/assets/less/bootstrap/font-awesome/variables.less
+++ b/src/fauxton/assets/less/bootstrap/font-awesome/variables.less
@@ -1,7 +1,7 @@
// Variables
// --------------------------
-@FontAwesomePath: "../../img";
+@FontAwesomePath: "../img";
//@FontAwesomePath: "//netdna.bootstrapcdn.com/font-awesome/3.2.1/font"; // for referencing Bootstrap CDN font files directly
@FontAwesomeVersion: "3.2.1";
@borderColor: #eee;