OLD | NEW |
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/http_network_transaction.h" | 5 #include "net/http/http_network_transaction.h" |
6 | 6 |
7 #include <math.h> // ceil | 7 #include <math.h> // ceil |
8 #include <stdarg.h> | 8 #include <stdarg.h> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
454 HostResolver* host_resolver, | 454 HostResolver* host_resolver, |
455 CertVerifier* /* cert_verifier */) | 455 CertVerifier* /* cert_verifier */) |
456 : ParentPool(0, 0, NULL, host_resolver, NULL, NULL) {} | 456 : ParentPool(0, 0, NULL, host_resolver, NULL, NULL) {} |
457 | 457 |
458 template<> | 458 template<> |
459 CaptureGroupNameHttpProxySocketPool::CaptureGroupNameSocketPool( | 459 CaptureGroupNameHttpProxySocketPool::CaptureGroupNameSocketPool( |
460 HostResolver* host_resolver, | 460 HostResolver* host_resolver, |
461 CertVerifier* /* cert_verifier */) | 461 CertVerifier* /* cert_verifier */) |
462 : HttpProxyClientSocketPool(0, 0, NULL, host_resolver, NULL, NULL, NULL) {} | 462 : HttpProxyClientSocketPool(0, 0, NULL, host_resolver, NULL, NULL, NULL) {} |
463 | 463 |
464 template<> | 464 template <> |
465 CaptureGroupNameSSLSocketPool::CaptureGroupNameSocketPool( | 465 CaptureGroupNameSSLSocketPool::CaptureGroupNameSocketPool( |
466 HostResolver* host_resolver, | 466 HostResolver* host_resolver, |
467 CertVerifier* cert_verifier) | 467 CertVerifier* cert_verifier) |
468 : SSLClientSocketPool(0, 0, NULL, host_resolver, cert_verifier, NULL, | 468 : SSLClientSocketPool(0, |
469 NULL, "", NULL, NULL, NULL, NULL, NULL, NULL) {} | 469 0, |
| 470 NULL, |
| 471 host_resolver, |
| 472 cert_verifier, |
| 473 NULL, |
| 474 NULL, |
| 475 std::string(), |
| 476 NULL, |
| 477 NULL, |
| 478 NULL, |
| 479 NULL, |
| 480 NULL, |
| 481 NULL) {} |
470 | 482 |
471 //----------------------------------------------------------------------------- | 483 //----------------------------------------------------------------------------- |
472 | 484 |
473 // This is the expected return from a current server advertising SPDY. | 485 // This is the expected return from a current server advertising SPDY. |
474 static const char kAlternateProtocolHttpHeader[] = | 486 static const char kAlternateProtocolHttpHeader[] = |
475 "Alternate-Protocol: 443:npn-spdy/3\r\n\r\n"; | 487 "Alternate-Protocol: 443:npn-spdy/3\r\n\r\n"; |
476 | 488 |
477 // Helper functions for validating that AuthChallengeInfo's are correctly | 489 // Helper functions for validating that AuthChallengeInfo's are correctly |
478 // configured for common cases. | 490 // configured for common cases. |
479 bool CheckBasicServerAuth(const AuthChallengeInfo* auth_challenge) { | 491 bool CheckBasicServerAuth(const AuthChallengeInfo* auth_challenge) { |
(...skipping 8340 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
8820 HttpNetworkSession::NORMAL_SOCKET_POOL), | 8832 HttpNetworkSession::NORMAL_SOCKET_POOL), |
8821 BoundNetLog())); | 8833 BoundNetLog())); |
8822 EXPECT_EQ(OK, callback.WaitForResult()); | 8834 EXPECT_EQ(OK, callback.WaitForResult()); |
8823 | 8835 |
8824 SSLConfig ssl_config; | 8836 SSLConfig ssl_config; |
8825 session->ssl_config_service()->GetSSLConfig(&ssl_config); | 8837 session->ssl_config_service()->GetSSLConfig(&ssl_config); |
8826 scoped_ptr<ClientSocketHandle> ssl_connection(new ClientSocketHandle); | 8838 scoped_ptr<ClientSocketHandle> ssl_connection(new ClientSocketHandle); |
8827 SSLClientSocketContext context; | 8839 SSLClientSocketContext context; |
8828 context.cert_verifier = session_deps.cert_verifier.get(); | 8840 context.cert_verifier = session_deps.cert_verifier.get(); |
8829 ssl_connection->set_socket(session_deps.socket_factory->CreateSSLClientSocket( | 8841 ssl_connection->set_socket(session_deps.socket_factory->CreateSSLClientSocket( |
8830 connection.release(), HostPortPair("" , 443), ssl_config, context)); | 8842 connection.release(), |
| 8843 HostPortPair(std::string(), 443), |
| 8844 ssl_config, |
| 8845 context)); |
8831 EXPECT_EQ(ERR_IO_PENDING, | 8846 EXPECT_EQ(ERR_IO_PENDING, |
8832 ssl_connection->socket()->Connect(callback.callback())); | 8847 ssl_connection->socket()->Connect(callback.callback())); |
8833 EXPECT_EQ(OK, callback.WaitForResult()); | 8848 EXPECT_EQ(OK, callback.WaitForResult()); |
8834 | 8849 |
8835 EXPECT_EQ(OK, spdy_session->InitializeWithSocket(ssl_connection.release(), | 8850 EXPECT_EQ(OK, spdy_session->InitializeWithSocket(ssl_connection.release(), |
8836 true, OK)); | 8851 true, OK)); |
8837 | 8852 |
8838 trans.reset(new HttpNetworkTransaction(DEFAULT_PRIORITY, session)); | 8853 trans.reset(new HttpNetworkTransaction(DEFAULT_PRIORITY, session)); |
8839 | 8854 |
8840 rv = trans->Start(&request, callback.callback(), BoundNetLog()); | 8855 rv = trans->Start(&request, callback.callback(), BoundNetLog()); |
(...skipping 2374 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
11215 trans2.Start(&request2, callback2.callback(), BoundNetLog())); | 11230 trans2.Start(&request2, callback2.callback(), BoundNetLog())); |
11216 MessageLoop::current()->RunUntilIdle(); | 11231 MessageLoop::current()->RunUntilIdle(); |
11217 data2->RunFor(3); | 11232 data2->RunFor(3); |
11218 | 11233 |
11219 ASSERT_TRUE(callback2.have_result()); | 11234 ASSERT_TRUE(callback2.have_result()); |
11220 EXPECT_EQ(OK, callback2.WaitForResult()); | 11235 EXPECT_EQ(OK, callback2.WaitForResult()); |
11221 EXPECT_TRUE(trans2.GetResponseInfo()->was_fetched_via_spdy); | 11236 EXPECT_TRUE(trans2.GetResponseInfo()->was_fetched_via_spdy); |
11222 } | 11237 } |
11223 | 11238 |
11224 } // namespace net | 11239 } // namespace net |
OLD | NEW |