Issue 552164: Merge 34903, 34928, 35008, 35549, 36054 to the 249s branch....

Issue 552164: Merge 34903, 34928, 35008, 35549, 36054 to the 249s branch.... (Closed)

Created:
10 years, 11 months ago by eroman

Modified:
9 years, 6 months ago

Reviewers:
laforge, Chris Evans

CC:
chromium-reviews_googlegroups.com, darin (slow to review), Paweł Hajdan Jr.

Base URL:
svn://chrome-svn/chrome/branches/249s/src/

Visibility:
Public.

Description

Merge 34903, 34928, 35008, 35549, 36054 to the 249s branch. This pulls down two proxy changes from head: (1) Use proxy-side DNS resolution when using SOCKS v5; BUG=29914 (2) Remove implicit fallback to DIRECT when using a proxy list; BUG=12303 r34903 - main SOCKS v5 DNS change r34928 - simplification of r34903 r35008 - extra set of unit-tests for SOCKS v5 r35549 - remove fallback to DIRECT for proxies r36054 - fix a regression from 35549 for single-proxy BUG=29914, 12303, 31983 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=37191

Patch Set 1 #

Patch Set 2 : Fix some other merge conflicts #

Created: 10 years, 11 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+551 lines, -350 lines)			Patch
M	net/base/net_error_list.h	View		1 chunk	+3 lines, -0 lines	0 comments	Download
M	net/http/http_network_transaction.cc	View		3 chunks	+43 lines, -3 lines	0 comments	Download
M	net/http/http_network_transaction_unittest.cc	View		3 chunks	+23 lines, -4 lines	0 comments	Download
MM	net/proxy/proxy_info.h	View		3 chunks	+19 lines, -12 lines	0 comments	Download
MM	net/proxy/proxy_info.cc	View		2 chunks	+2 lines, -4 lines	0 comments	Download
MM	net/proxy/proxy_list.h	View		1 chunk	+9 lines, -4 lines	0 comments	Download
MM	net/proxy/proxy_list.cc	View		5 chunks	+55 lines, -22 lines	0 comments	Download
MM	net/proxy/proxy_list_unittest.cc	View		4 chunks	+79 lines, -6 lines	0 comments	Download
M	net/proxy/proxy_server.h	View		1 chunk	+5 lines, -0 lines	0 comments	Download
M	net/proxy/proxy_service.h	View	1	2 chunks	+6 lines, -8 lines	0 comments	Download
M	net/proxy/proxy_service.cc	View	1	9 chunks	+26 lines, -71 lines	0 comments	Download
M	net/proxy/proxy_service_unittest.cc	View		7 chunks	+168 lines, -41 lines	0 comments	Download
M	net/socket/socks5_client_socket.h	View		6 chunks	+7 lines, -19 lines	0 comments	Download
M	net/socket/socks5_client_socket.cc	View		10 chunks	+17 lines, -77 lines	0 comments	Download
M	net/socket/socks5_client_socket_unittest.cc	View	1	10 chunks	+88 lines, -78 lines	0 comments	Download
M	net/socket_stream/socket_stream.cc	View		1 chunk	+1 line, -1 line	0 comments	Download

Messages

Total messages: 3 (0 generated)

Expand Messages | Collapse Messages

eroman

The diffs between patchset 1:2 are to resolve differences between the code in trunk versus ...

10 years, 11 months ago (2010-01-26 23:51:20 UTC) #2

cevans

10 years, 11 months ago (2010-01-27 00:40:37 UTC) #3

LGTM (largely rubber-stamp)

On Tue, Jan 26, 2010 at 3:51 PM, <eroman@chromium.org> wrote:

> The diffs between patchset 1:2 are to resolve differences between the code
> in
> trunk versus the branch.
>
>
> http://codereview.chromium.org/552164
>

Expand Messages | Collapse Messages