diff options
| author | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-03 00:30:50 +0000 |
|---|---|---|
| committer | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-03 00:30:50 +0000 |
| commit | 3ce7df0f4d45cf53692d3b393984b9153db1682c (patch) | |
| tree | 27aa699c434c356c1180870fb86dfd0fd7dc44e9 /chrome | |
| parent | 918efd45e6af4dfadbea8e3d862e79032be3d014 (diff) | |
| download | chromium_src-3ce7df0f4d45cf53692d3b393984b9153db1682c.zip chromium_src-3ce7df0f4d45cf53692d3b393984b9153db1682c.tar.gz chromium_src-3ce7df0f4d45cf53692d3b393984b9153db1682c.tar.bz2 | |
Don't ignore certificate errors with SPDY.
For benchmarking and testing, we still want to be able to ignore the
certificate errors, so I added a flag to the use-spdy option to do so:
--ignore-certificate-errors
BUG=32020
TEST=none
Review URL: http://codereview.chromium.org/661375
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40465 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/browser_main.cc | 4 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.cc | 3 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 8c218b0..4d9803c 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -65,6 +65,7 @@ #include "net/base/cookie_monster.h" #include "net/base/net_module.h" #include "net/http/http_network_session.h" +#include "net/http/http_network_transaction.h" #include "net/socket/client_socket_pool_base.h" #if defined(OS_POSIX) @@ -670,6 +671,9 @@ int BrowserMain(const MainFunctionParams& parameters) { parsed_command_line.GetSwitchValueASCII(switches::kFixedHttpsPort))); } + if (parsed_command_line.HasSwitch(switches::kIgnoreCertificateErrors)) + net::HttpNetworkTransaction::IgnoreCertificateErrors(true); + // Initialize histogram statistics gathering system. StatisticsRecorder statistics; diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index feb90fb..5787e1c 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -693,6 +693,9 @@ const char kUseSpdy[] = "use-spdy"; const char kFixedHttpPort[] = "testing-fixed-http-port"; const char kFixedHttpsPort[] = "testing-fixed-https-port"; +// Ignore certificate related errors. +const char kIgnoreCertificateErrors[] = "ignore-certificate-errors"; + // Use the low fragmentation heap for the CRT. const char kUseLowFragHeapCrt[] = "use-lf-heap"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 9d8e28f..afebf87 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -196,6 +196,7 @@ extern const char kUninstall[]; extern const char kUseSpdy[]; extern const char kFixedHttpPort[]; extern const char kFixedHttpsPort[]; +extern const char kIgnoreCertificateErrors[]; extern const char kUseLowFragHeapCrt[]; extern const char kUserAgent[]; extern const char kUserDataDir[]; |