From 27f07974e05595a07e3e97ec8181f842033caf84 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Wed, 20 Aug 2014 11:57:15 +0800 Subject: [PATCH] Add --proxy-server and --no-proxy-server switches. --- docs/api/chrome-command-line-switches.md | 10 ++++++++++ vendor/brightray | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/docs/api/chrome-command-line-switches.md b/docs/api/chrome-command-line-switches.md index ad0549ddbc0..158e147d462 100644 --- a/docs/api/chrome-command-line-switches.md +++ b/docs/api/chrome-command-line-switches.md @@ -18,6 +18,16 @@ app.on('ready', function() { Enables remote debug over HTTP on the specified `port`. +## --proxy-server=`address:port` + +Uses a specified proxy server, overrides system settings. This switch only +affects HTTP and HTTPS requests. + +## --no-proxy-server + +Don't use a proxy server, always make direct connections. Overrides any other +proxy server flags that are passed. + ## --host-rules=`rules` Comma-separated list of `rules` that control how hostnames are mapped. diff --git a/vendor/brightray b/vendor/brightray index 41cb4ad3216..a3eba728efe 160000 --- a/vendor/brightray +++ b/vendor/brightray @@ -1 +1 @@ -Subproject commit 41cb4ad321634dd3474b24c18f161f303ee41dfc +Subproject commit a3eba728efe6e80a5e0717f6889131519ab2b2f5