diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/proxy/proxy_service.cc | 4 | ||||
| -rw-r--r-- | net/proxy/proxy_service_unittest.cc | 16 |
2 files changed, 18 insertions, 2 deletions
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc index ec4fdd6..af53ff8 100644 --- a/net/proxy/proxy_service.cc +++ b/net/proxy/proxy_service.cc @@ -450,7 +450,7 @@ bool ProxyService::ShouldBypassProxyForURL(const GURL& url) { url_domain += "://"; url_domain += url.host(); - StringToLowerASCII(url_domain); + StringToLowerASCII(&url_domain); StringTokenizer proxy_server_bypass_list(config_.proxy_bypass, ";"); while (proxy_server_bypass_list.GetNext()) { @@ -474,7 +474,7 @@ bool ProxyService::ShouldBypassProxyForURL(const GURL& url) { bypass_url_domain = bypass_url_domain_with_scheme; } - StringToLowerASCII(bypass_url_domain); + StringToLowerASCII(&bypass_url_domain); if (MatchPattern(url_domain, bypass_url_domain)) return true; diff --git a/net/proxy/proxy_service_unittest.cc b/net/proxy/proxy_service_unittest.cc index 5731955..d33ac6d 100644 --- a/net/proxy/proxy_service_unittest.cc +++ b/net/proxy/proxy_service_unittest.cc @@ -341,6 +341,22 @@ TEST(ProxyServiceTest, ProxyBypassList) { rv = service4.ResolveProxy(test_url4, &info4, NULL, NULL); EXPECT_EQ(rv, net::OK); EXPECT_FALSE(info4.is_direct()); + + resolver.config->proxy_bypass = "<local>;*.MSN.COM;"; + net::ProxyService service5(&resolver); + GURL test_url5("http://www.msnbc.msn.com"); + net::ProxyInfo info5; + rv = service5.ResolveProxy(test_url5, &info5, NULL, NULL); + EXPECT_EQ(rv, net::OK); + EXPECT_TRUE(info5.is_direct()); + + resolver.config->proxy_bypass = "<local>;*.msn.com;"; + net::ProxyService service6(&resolver); + GURL test_url6("HTTP://WWW.MSNBC.MSN.COM"); + net::ProxyInfo info6; + rv = service6.ResolveProxy(test_url6, &info6, NULL, NULL); + EXPECT_EQ(rv, net::OK); + EXPECT_TRUE(info6.is_direct()); } TEST(ProxyServiceTest, PerProtocolProxyTests) { |