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

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

Issue 9226039: Revert r113405, since it appears to be causing a crash and a hang. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update more liscence dates Created 8 years, 11 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
« no previous file with comments | « no previous file | net/http/http_proxy_client_socket_pool.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/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 9361 matching lines...) Expand 10 before | Expand all | Expand 10 after
9372 data_writes2, arraysize(data_writes2)); 9372 data_writes2, arraysize(data_writes2));
9373 StaticSocketDataProvider* data[] = { &data1, &data2 }; 9373 StaticSocketDataProvider* data[] = { &data1, &data2 };
9374 9374
9375 SimpleGetHelperResult out = SimpleGetHelperForData(data, arraysize(data)); 9375 SimpleGetHelperResult out = SimpleGetHelperForData(data, arraysize(data));
9376 9376
9377 EXPECT_EQ(OK, out.rv); 9377 EXPECT_EQ(OK, out.rv);
9378 EXPECT_EQ("HTTP/1.0 200 OK", out.status_line); 9378 EXPECT_EQ("HTTP/1.0 200 OK", out.status_line);
9379 EXPECT_EQ("hello world", out.response_data); 9379 EXPECT_EQ("hello world", out.response_data);
9380 } 9380 }
9381 9381
9382 TEST_F(HttpNetworkTransactionTest, CloseOldSpdySessionToOpenNewOne) {
9383 HttpStreamFactory::set_next_protos(SpdyNextProtos());
9384 int old_max_sockets_per_group =
9385 ClientSocketPoolManager::max_sockets_per_group();
9386 int old_max_sockets_per_proxy_server =
9387 ClientSocketPoolManager::max_sockets_per_proxy_server();
9388 int old_max_sockets_per_pool =
9389 ClientSocketPoolManager::max_sockets_per_pool();
9390 ClientSocketPoolManager::set_max_sockets_per_group(1);
9391 ClientSocketPoolManager::set_max_sockets_per_proxy_server(1);
9392 ClientSocketPoolManager::set_max_sockets_per_pool(1);
9393
9394 // Use two different hosts with different IPs so they don't get pooled.
9395 SessionDependencies session_deps;
9396 session_deps.host_resolver->rules()->AddRule("a.com", "10.0.0.1");
9397 session_deps.host_resolver->rules()->AddRule("b.com", "10.0.0.2");
9398 scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps));
9399
9400 SSLSocketDataProvider ssl1(true, OK);
9401 ssl1.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
9402 ssl1.next_proto = "spdy/2";
9403 ssl1.was_npn_negotiated = true;
9404 ssl1.protocol_negotiated = SSLClientSocket::kProtoSPDY2;
9405 SSLSocketDataProvider ssl2(true, OK);
9406 ssl2.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
9407 ssl2.next_proto = "spdy/2";
9408 ssl2.was_npn_negotiated = true;
9409 ssl2.protocol_negotiated = SSLClientSocket::kProtoSPDY2;
9410 session_deps.socket_factory.AddSSLSocketDataProvider(&ssl1);
9411 session_deps.socket_factory.AddSSLSocketDataProvider(&ssl2);
9412
9413 scoped_ptr<spdy::SpdyFrame> host1_req(ConstructSpdyGet(
9414 "https://www.a.com", false, 1, LOWEST));
9415 MockWrite spdy1_writes[] = {
9416 CreateMockWrite(*host1_req, 1),
9417 };
9418 scoped_ptr<spdy::SpdyFrame> host1_resp(ConstructSpdyGetSynReply(NULL, 0, 1));
9419 scoped_ptr<spdy::SpdyFrame> host1_resp_body(ConstructSpdyBodyFrame(1, true));
9420 MockRead spdy1_reads[] = {
9421 CreateMockRead(*host1_resp, 2),
9422 CreateMockRead(*host1_resp_body, 3),
9423 MockRead(true, ERR_IO_PENDING, 4),
9424 };
9425
9426 scoped_ptr<OrderedSocketData> spdy1_data(
9427 new OrderedSocketData(
9428 spdy1_reads, arraysize(spdy1_reads),
9429 spdy1_writes, arraysize(spdy1_writes)));
9430 session_deps.socket_factory.AddSocketDataProvider(spdy1_data.get());
9431
9432 scoped_ptr<spdy::SpdyFrame> host2_req(ConstructSpdyGet(
9433 "https://www.b.com", false, 1, LOWEST));
9434 MockWrite spdy2_writes[] = {
9435 CreateMockWrite(*host2_req, 1),
9436 };
9437 scoped_ptr<spdy::SpdyFrame> host2_resp(ConstructSpdyGetSynReply(NULL, 0, 1));
9438 scoped_ptr<spdy::SpdyFrame> host2_resp_body(ConstructSpdyBodyFrame(1, true));
9439 MockRead spdy2_reads[] = {
9440 CreateMockRead(*host2_resp, 2),
9441 CreateMockRead(*host2_resp_body, 3),
9442 MockRead(true, ERR_IO_PENDING, 4),
9443 };
9444
9445 scoped_ptr<OrderedSocketData> spdy2_data(
9446 new OrderedSocketData(
9447 spdy2_reads, arraysize(spdy2_reads),
9448 spdy2_writes, arraysize(spdy2_writes)));
9449 session_deps.socket_factory.AddSocketDataProvider(spdy2_data.get());
9450
9451 MockWrite http_write[] = {
9452 MockWrite("GET / HTTP/1.1\r\n"
9453 "Host: www.a.com\r\n"
9454 "Connection: keep-alive\r\n\r\n"),
9455 };
9456
9457 MockRead http_read[] = {
9458 MockRead("HTTP/1.1 200 OK\r\n"),
9459 MockRead("Content-Type: text/html; charset=iso-8859-1\r\n"),
9460 MockRead("Content-Length: 6\r\n\r\n"),
9461 MockRead("hello!"),
9462 };
9463
9464 StaticSocketDataProvider http_data(http_read, arraysize(http_read),
9465 http_write, arraysize(http_write));
9466 session_deps.socket_factory.AddSocketDataProvider(&http_data);
9467
9468 HostPortPair host_port_pair_a("www.a.com", 443);
9469 HostPortProxyPair host_port_proxy_pair_a(
9470 host_port_pair_a, ProxyServer::Direct());
9471 EXPECT_FALSE(
9472 session->spdy_session_pool()->HasSession(host_port_proxy_pair_a));
9473
9474 TestCompletionCallback callback;
9475 HttpRequestInfo request1;
9476 request1.method = "GET";
9477 request1.url = GURL("https://www.a.com/");
9478 request1.load_flags = 0;
9479 scoped_ptr<HttpNetworkTransaction> trans(new HttpNetworkTransaction(session));
9480
9481 int rv = trans->Start(&request1, callback.callback(), BoundNetLog());
9482 EXPECT_EQ(ERR_IO_PENDING, rv);
9483 EXPECT_EQ(OK, callback.WaitForResult());
9484
9485 const HttpResponseInfo* response = trans->GetResponseInfo();
9486 ASSERT_TRUE(response != NULL);
9487 ASSERT_TRUE(response->headers != NULL);
9488 EXPECT_EQ("HTTP/1.1 200 OK", response->headers->GetStatusLine());
9489 EXPECT_TRUE(response->was_fetched_via_spdy);
9490 EXPECT_TRUE(response->was_npn_negotiated);
9491
9492 std::string response_data;
9493 ASSERT_EQ(OK, ReadTransaction(trans.get(), &response_data));
9494 EXPECT_EQ("hello!", response_data);
9495 trans.reset();
9496 EXPECT_TRUE(
9497 session->spdy_session_pool()->HasSession(host_port_proxy_pair_a));
9498
9499 HostPortPair host_port_pair_b("www.b.com", 443);
9500 HostPortProxyPair host_port_proxy_pair_b(
9501 host_port_pair_b, ProxyServer::Direct());
9502 EXPECT_FALSE(
9503 session->spdy_session_pool()->HasSession(host_port_proxy_pair_b));
9504 HttpRequestInfo request2;
9505 request2.method = "GET";
9506 request2.url = GURL("https://www.b.com/");
9507 request2.load_flags = 0;
9508 trans.reset(new HttpNetworkTransaction(session));
9509
9510 rv = trans->Start(&request2, callback.callback(), BoundNetLog());
9511 EXPECT_EQ(ERR_IO_PENDING, rv);
9512 EXPECT_EQ(OK, callback.WaitForResult());
9513
9514 response = trans->GetResponseInfo();
9515 ASSERT_TRUE(response != NULL);
9516 ASSERT_TRUE(response->headers != NULL);
9517 EXPECT_EQ("HTTP/1.1 200 OK", response->headers->GetStatusLine());
9518 EXPECT_TRUE(response->was_fetched_via_spdy);
9519 EXPECT_TRUE(response->was_npn_negotiated);
9520 ASSERT_EQ(OK, ReadTransaction(trans.get(), &response_data));
9521 EXPECT_EQ("hello!", response_data);
9522 EXPECT_FALSE(
9523 session->spdy_session_pool()->HasSession(host_port_proxy_pair_a));
9524 EXPECT_TRUE(
9525 session->spdy_session_pool()->HasSession(host_port_proxy_pair_b));
9526
9527 HostPortPair host_port_pair_a1("www.a.com", 80);
9528 HostPortProxyPair host_port_proxy_pair_a1(
9529 host_port_pair_a1, ProxyServer::Direct());
9530 EXPECT_FALSE(
9531 session->spdy_session_pool()->HasSession(host_port_proxy_pair_a1));
9532 HttpRequestInfo request3;
9533 request3.method = "GET";
9534 request3.url = GURL("http://www.a.com/");
9535 request3.load_flags = 0;
9536 trans.reset(new HttpNetworkTransaction(session));
9537
9538 rv = trans->Start(&request3, callback.callback(), BoundNetLog());
9539 EXPECT_EQ(ERR_IO_PENDING, rv);
9540 EXPECT_EQ(OK, callback.WaitForResult());
9541
9542 response = trans->GetResponseInfo();
9543 ASSERT_TRUE(response != NULL);
9544 ASSERT_TRUE(response->headers != NULL);
9545 EXPECT_EQ("HTTP/1.1 200 OK", response->headers->GetStatusLine());
9546 EXPECT_FALSE(response->was_fetched_via_spdy);
9547 EXPECT_FALSE(response->was_npn_negotiated);
9548 ASSERT_EQ(OK, ReadTransaction(trans.get(), &response_data));
9549 EXPECT_EQ("hello!", response_data);
9550 EXPECT_FALSE(
9551 session->spdy_session_pool()->HasSession(host_port_proxy_pair_a));
9552 EXPECT_FALSE(
9553 session->spdy_session_pool()->HasSession(host_port_proxy_pair_b));
9554
9555 HttpStreamFactory::set_next_protos(std::vector<std::string>());
9556 ClientSocketPoolManager::set_max_sockets_per_pool(old_max_sockets_per_pool);
9557 ClientSocketPoolManager::set_max_sockets_per_proxy_server(
9558 old_max_sockets_per_proxy_server);
9559 ClientSocketPoolManager::set_max_sockets_per_group(old_max_sockets_per_group);
9560 }
9561
9562 } // namespace net 9382 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | net/http/http_proxy_client_socket_pool.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698