Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(40)

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

Created:
10 years, 11 months ago by laforge
Modified:
9 years, 7 months ago
Reviewers:
eroman
CC:
chromium-reviews_googlegroups.com, darin (slow to review), Paweł Hajdan Jr.
Visibility:
Public.

Description

Merge 37191 - Merge 34903, 34928, 35008, 35549, 36054 to the 249s branch. This pulls down two proxy changes from head: (1) Use proxyside 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 unittests for SOCKS v5 r35549 remove fallback to DIRECT for proxies r36054 fix a regression from 35549 for singleproxy BUG=29914, 12303, 31983 Review URL: http://codereview.chromium.org/552164 TBR=eroman@chromium.org Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=37199

Patch Set 1 #

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 2 chunks +6 lines, -8 lines 0 comments Download
M net/proxy/proxy_service.cc View 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 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: 1 (0 generated)
laforge
10 years, 11 months ago (2010-01-27 01:18:42 UTC) #1

          

Powered by Google App Engine
This is Rietveld 408576698