diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2015-03-30 03:21:14 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2015-03-30 03:21:14 +0800 |
| commit | 24fc1f073dd5ec0302937fb51729991dd9a40ba3 (patch) | |
| tree | a510ed7d938300b6d52fdf19edca01671c682b45 | |
| parent | e1c6c01b4d598f9b7f7ee31326d25903084fc292 (diff) | |
| download | dexon-24fc1f073dd5ec0302937fb51729991dd9a40ba3.tar dexon-24fc1f073dd5ec0302937fb51729991dd9a40ba3.tar.gz dexon-24fc1f073dd5ec0302937fb51729991dd9a40ba3.tar.bz2 dexon-24fc1f073dd5ec0302937fb51729991dd9a40ba3.tar.lz dexon-24fc1f073dd5ec0302937fb51729991dd9a40ba3.tar.xz dexon-24fc1f073dd5ec0302937fb51729991dd9a40ba3.tar.zst dexon-24fc1f073dd5ec0302937fb51729991dd9a40ba3.zip | |
Add flag to control CORS header #394
* Disabled on CLI
* http://localhost on Mist
| -rw-r--r-- | cmd/geth/main.go | 1 | ||||
| -rw-r--r-- | cmd/mist/main.go | 7 | ||||
| -rw-r--r-- | cmd/utils/flags.go | 6 |
3 files changed, 13 insertions, 1 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 05e2e4ae6..62e30ac9a 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -233,6 +233,7 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso utils.VMDebugFlag, utils.ProtocolVersionFlag, utils.NetworkIdFlag, + utils.RPCCORSDomainFlag, } // missing: diff --git a/cmd/mist/main.go b/cmd/mist/main.go index fab651b22..6780cfb3a 100644 --- a/cmd/mist/main.go +++ b/cmd/mist/main.go @@ -47,12 +47,19 @@ var ( Usage: "absolute path to GUI assets directory", Value: common.DefaultAssetPath(), } + rpcCorsFlag = utils.RPCCORSDomainFlag ) func init() { + // Mist-specific default + if len(rpcCorsFlag.Value) == 0 { + rpcCorsFlag.Value = "http://localhost" + } + app.Action = run app.Flags = []cli.Flag{ assetPathFlag, + rpcCorsFlag, utils.BootnodesFlag, utils.DataDirFlag, diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 2a3e2f447..131f8a5c0 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -148,7 +148,11 @@ var ( Usage: "Port on which the JSON-RPC server should listen", Value: 8545, } - + RPCCORSDomainFlag = cli.StringFlag{ + Name: "rpccorsdomain", + Usage: "Domain on which to send Access-Control-Allow-Origin header", + Value: "", + } // Network Settings MaxPeersFlag = cli.IntFlag{ Name: "maxpeers", |