diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-17 00:07:04 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-17 00:07:04 +0000 |
| commit | 1ca2b45a6e0b6490d0ab1ff940e2d7769660682b (patch) | |
| tree | f6740d35ae7bf87007f6794a49f53f2858ead7b7 /net/net.gyp | |
| parent | 54ce726e1af62939cb12b09dc687737b114d426c (diff) | |
| download | chromium_src-1ca2b45a6e0b6490d0ab1ff940e2d7769660682b.zip chromium_src-1ca2b45a6e0b6490d0ab1ff940e2d7769660682b.tar.gz chromium_src-1ca2b45a6e0b6490d0ab1ff940e2d7769660682b.tar.bz2 | |
Fix a deadlock that could happen during shutdown if a host resolve request was outstanding by a PAC script.
The solution is to abort the oustanding host resolver request during shutdown, and wake-up the blocked PAC thread.
BUG=41244
TEST=SingleThreadedProxyResolverWithBridgedHostResolverTest.ShutdownDeadlock
Review URL: http://codereview.chromium.org/1527037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44864 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/net.gyp b/net/net.gyp index a0602e1..1a41553 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -422,6 +422,8 @@ 'proxy/proxy_service.h', 'proxy/single_threaded_proxy_resolver.cc', 'proxy/single_threaded_proxy_resolver.h', + 'proxy/sync_host_resolver_bridge.cc', + 'proxy/sync_host_resolver_bridge.h', 'socket/client_socket.h', 'socket/client_socket_factory.cc', 'socket/client_socket_factory.h', @@ -699,6 +701,7 @@ 'proxy/proxy_server_unittest.cc', 'proxy/proxy_service_unittest.cc', 'proxy/single_threaded_proxy_resolver_unittest.cc', + 'proxy/sync_host_resolver_bridge_unittest.cc', 'socket/client_socket_pool_base_unittest.cc', 'socket/socks5_client_socket_unittest.cc', 'socket/socks_client_socket_pool_unittest.cc', |