diff options
-rw-r--r-- | chrome/browser/browser_main.cc | 3 | ||||
-rw-r--r-- | net/base/ssl_client_socket.cc | 2 | ||||
-rw-r--r-- | net/http/http_network_layer.cc | 2 | ||||
-rw-r--r-- | webkit/tools/test_shell/test_shell_main.cc | 3 |
4 files changed, 9 insertions, 1 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 590e3ff..cb79033 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -257,10 +257,13 @@ int BrowserMain(CommandLine &parsed_command_line, int show_command, main_message_loop.set_thread_name(thread_name); bool already_running = CreateUniqueChromeEvent(); +#if defined(OS_WIN) // Make the selection of network stacks early on before any consumers try to // issue HTTP requests. + net::HttpNetworkLayer::UseWinHttp(true); if (parsed_command_line.HasSwitch(switches::kUseNewHttp)) net::HttpNetworkLayer::UseWinHttp(false); +#endif std::wstring user_data_dir; PathService::Get(chrome::DIR_USER_DATA, &user_data_dir); diff --git a/net/base/ssl_client_socket.cc b/net/base/ssl_client_socket.cc index 3d576af..6341db1 100644 --- a/net/base/ssl_client_socket.cc +++ b/net/base/ssl_client_socket.cc @@ -32,6 +32,8 @@ static int MapSecurityError(SECURITY_STATUS err) { case SEC_E_CERT_EXPIRED: // Schannel case CERT_E_EXPIRED: // CryptoAPI return ERR_CERT_DATE_INVALID; + case CRYPT_E_NO_REVOCATION_CHECK: + return ERR_CERT_NO_REVOCATION_MECHANISM; case CRYPT_E_REVOKED: // Schannel and CryptoAPI return ERR_CERT_REVOKED; case SEC_E_CERT_UNKNOWN: diff --git a/net/http/http_network_layer.cc b/net/http/http_network_layer.cc index 9b2c468..8c504fc 100644 --- a/net/http/http_network_layer.cc +++ b/net/http/http_network_layer.cc @@ -20,7 +20,7 @@ namespace net { #if defined(OS_WIN) // static -bool HttpNetworkLayer::use_winhttp_ = true; +bool HttpNetworkLayer::use_winhttp_ = false; #endif // static diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc index 96bca74..2415170 100644 --- a/webkit/tools/test_shell/test_shell_main.cc +++ b/webkit/tools/test_shell/test_shell_main.cc @@ -146,10 +146,13 @@ int main(int argc, char* argv[]) { if (parsed_command_line.HasSwitch(test_shell::kEnableTracing)) base::TraceLog::StartTracing(); +#if defined(OS_WIN) // Make the selection of network stacks early on before any consumers try to // issue HTTP requests. + net::HttpNetworkLayer::UseWinHttp(true); if (parsed_command_line.HasSwitch(test_shell::kUseNewHttp)) net::HttpNetworkLayer::UseWinHttp(false); +#endif bool layout_test_mode = parsed_command_line.HasSwitch(test_shell::kLayoutTests); |