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

Side by Side Diff: net/http/proxy_client_socket.cc

Issue 266243004: Clang format slam. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/http/proxy_client_socket.h" 5 #include "net/http/proxy_client_socket.h"
6 6
7 #include "base/metrics/histogram.h" 7 #include "base/metrics/histogram.h"
8 #include "base/strings/stringprintf.h" 8 #include "base/strings/stringprintf.h"
9 #include "net/base/host_port_pair.h" 9 #include "net/base/host_port_pair.h"
10 #include "net/base/net_errors.h" 10 #include "net/base/net_errors.h"
11 #include "net/base/net_util.h" 11 #include "net/base/net_util.h"
12 #include "net/http/http_auth_controller.h" 12 #include "net/http/http_auth_controller.h"
13 #include "net/http/http_request_info.h" 13 #include "net/http/http_request_info.h"
14 #include "net/http/http_response_headers.h" 14 #include "net/http/http_response_headers.h"
15 #include "net/http/http_response_info.h" 15 #include "net/http/http_response_info.h"
16 #include "url/gurl.h" 16 #include "url/gurl.h"
17 17
18 namespace net { 18 namespace net {
19 19
20 // static 20 // static
21 void ProxyClientSocket::BuildTunnelRequest( 21 void ProxyClientSocket::BuildTunnelRequest(
22 const HttpRequestInfo& request_info, 22 const HttpRequestInfo& request_info,
23 const HttpRequestHeaders& auth_headers, 23 const HttpRequestHeaders& auth_headers,
24 const HostPortPair& endpoint, 24 const HostPortPair& endpoint,
25 std::string* request_line, 25 std::string* request_line,
26 HttpRequestHeaders* request_headers) { 26 HttpRequestHeaders* request_headers) {
27 // RFC 2616 Section 9 says the Host request-header field MUST accompany all 27 // RFC 2616 Section 9 says the Host request-header field MUST accompany all
28 // HTTP/1.1 requests. Add "Proxy-Connection: keep-alive" for compat with 28 // HTTP/1.1 requests. Add "Proxy-Connection: keep-alive" for compat with
29 // HTTP/1.0 proxies such as Squid (required for NTLM authentication). 29 // HTTP/1.0 proxies such as Squid (required for NTLM authentication).
30 *request_line = base::StringPrintf( 30 *request_line = base::StringPrintf("CONNECT %s HTTP/1.1\r\n",
31 "CONNECT %s HTTP/1.1\r\n", endpoint.ToString().c_str()); 31 endpoint.ToString().c_str());
32 request_headers->SetHeader(HttpRequestHeaders::kHost, 32 request_headers->SetHeader(HttpRequestHeaders::kHost,
33 GetHostAndOptionalPort(request_info.url)); 33 GetHostAndOptionalPort(request_info.url));
34 request_headers->SetHeader(HttpRequestHeaders::kProxyConnection, 34 request_headers->SetHeader(HttpRequestHeaders::kProxyConnection,
35 "keep-alive"); 35 "keep-alive");
36 36
37 std::string user_agent; 37 std::string user_agent;
38 if (request_info.extra_headers.GetHeader(HttpRequestHeaders::kUserAgent, 38 if (request_info.extra_headers.GetHeader(HttpRequestHeaders::kUserAgent,
39 &user_agent)) 39 &user_agent))
40 request_headers->SetHeader(HttpRequestHeaders::kUserAgent, user_agent); 40 request_headers->SetHeader(HttpRequestHeaders::kUserAgent, user_agent);
41 41
42 request_headers->MergeFrom(auth_headers); 42 request_headers->MergeFrom(auth_headers);
43 } 43 }
44 44
45 // static 45 // static
46 int ProxyClientSocket::HandleProxyAuthChallenge(HttpAuthController* auth, 46 int ProxyClientSocket::HandleProxyAuthChallenge(HttpAuthController* auth,
47 HttpResponseInfo* response, 47 HttpResponseInfo* response,
48 const BoundNetLog& net_log) { 48 const BoundNetLog& net_log) {
49 DCHECK(response->headers.get()); 49 DCHECK(response->headers.get());
(...skipping 24 matching lines...) Expand all
74 // static 74 // static
75 bool ProxyClientSocket::SanitizeProxyRedirect(HttpResponseInfo* response, 75 bool ProxyClientSocket::SanitizeProxyRedirect(HttpResponseInfo* response,
76 const GURL& url) { 76 const GURL& url) {
77 DCHECK(response && response->headers.get()); 77 DCHECK(response && response->headers.get());
78 78
79 std::string location; 79 std::string location;
80 if (!response->headers->IsRedirect(&location)) 80 if (!response->headers->IsRedirect(&location))
81 return false; 81 return false;
82 82
83 // Return minimal headers; set "Content-length: 0" to ignore response body. 83 // Return minimal headers; set "Content-length: 0" to ignore response body.
84 std::string fake_response_headers = 84 std::string fake_response_headers = base::StringPrintf(
85 base::StringPrintf("HTTP/1.0 302 Found\n" 85 "HTTP/1.0 302 Found\n"
86 "Location: %s\n" 86 "Location: %s\n"
87 "Content-length: 0\n" 87 "Content-length: 0\n"
88 "Connection: close\n" 88 "Connection: close\n"
89 "\n", 89 "\n",
90 location.c_str()); 90 location.c_str());
91 std::string raw_headers = 91 std::string raw_headers = HttpUtil::AssembleRawHeaders(
92 HttpUtil::AssembleRawHeaders(fake_response_headers.data(), 92 fake_response_headers.data(), fake_response_headers.length());
93 fake_response_headers.length());
94 response->headers = new HttpResponseHeaders(raw_headers); 93 response->headers = new HttpResponseHeaders(raw_headers);
95 94
96 return true; 95 return true;
97 } 96 }
98 97
99 } // namespace net 98 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698