Chromium Code Reviews Chromium Code Reviews
Issue 1467453006:
Deprecate FLAGS_reset_cubic_epoch_when_app_limited. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@107709890| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 // A binary wrapper for QuicServer. It listens forever on --port | 5 // A binary wrapper for QuicServer. It listens forever on --port |
| 6 // (default 6121) until it's killed or ctrl-cd to death. | 6 // (default 6121) until it's killed or ctrl-cd to death. |
| 7 | 7 |
| 8 #include <iostream> | 8 #include <iostream> |
| 9 | 9 |
| 10 #include "base/at_exit.h" | 10 #include "base/at_exit.h" |
| (...skipping 17 matching lines...) Expand all Loading... | |
| 28 <<<<<<< | 28 <<<<<<< |
| 29 CHECK(proof_source->Initialize(cert_path, key_path, base::FilePath())); | 29 CHECK(proof_source->Initialize(cert_path, key_path, base::FilePath())); |
| 30 return proof_source; | 30 return proof_source; |
| 31 ||||||| | 31 ||||||| |
| 32 CHECK(ssl_ctx->Init( | 32 CHECK(ssl_ctx->Init( |
| 33 nullptr /* cert_loader */, NO_AUTHENTICATE_PEER, &config)); | 33 nullptr /* cert_loader */, NO_AUTHENTICATE_PEER, &config)); |
| 34 | 34 |
| 35 return new gfe_quic::ProofSourceGoogle3(ssl_ctx, | 35 return new gfe_quic::ProofSourceGoogle3(ssl_ctx, |
| 36 /*take_ownership_of_ssl_ctx=*/true); | 36 /*take_ownership_of_ssl_ctx=*/true); |
| 37 ======= | 37 ======= |
| 38 <<<<<<< | |
| 38 CHECK(ssl_ctx->Init( | 39 CHECK(ssl_ctx->Init( |
| 39 nullptr /* cert_loader */, NO_AUTHENTICATE_PEER, &config)); | 40 nullptr /* cert_loader */, NO_AUTHENTICATE_PEER, &config)); |
| 41 ||||||| | |
| 42 SSLContext* ssl_ctx = new SSLContext( | |
| 43 SSLContext::SSL_SERVER_CONTEXT_SSL_V23, | |
| 44 SSL_SESS_CACHE_SERVER | SSL_SESS_CACHE_NO_INTERNAL_STORE); | |
| 45 CHECK(ssl_ctx->Init( | |
| 46 nullptr /* cert_loader */, NO_AUTHENTICATE_PEER, &config)); | |
| 47 ======= | |
| 48 SSLContext* ssl_ctx = new SSLContext( | |
| 49 SSLContext::SSL_SERVER_CONTEXT_SSL_V23, | |
| 50 SSL_SESS_CACHE_SERVER | SSL_SESS_CACHE_NO_INTERNAL_STORE); | |
| 51 CHECK(ssl_ctx->Init(NO_AUTHENTICATE_PEER, &config)); | |
| 52 >>>>>>> | |
|
Ryan Hamilton
2015/11/22 00:54:10
This looks like a merge conflict. You'll want to m
ianswett
2015/11/23 20:04:06
Done.
| |
| 40 | 53 |
| 41 return new gfe_quic::ProofSourceGoogle3([=]() { return ssl_ctx; }); | 54 return new gfe_quic::ProofSourceGoogle3([=]() { return ssl_ctx; }); |
| 42 >>>>>>> | 55 >>>>>>> |
| 43 } | 56 } |
| 44 | 57 |
| 45 int main(int argc, char *argv[]) { | 58 int main(int argc, char *argv[]) { |
| 46 base::AtExitManager exit_manager; | 59 base::AtExitManager exit_manager; |
| 47 base::MessageLoopForIO message_loop; | 60 base::MessageLoopForIO message_loop; |
| 48 | 61 |
| 49 base::CommandLine::Init(argc, argv); | 62 base::CommandLine::Init(argc, argv); |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 102 | 115 |
| 103 int rc = server.Listen(net::IPEndPoint(ip, FLAGS_port)); | 116 int rc = server.Listen(net::IPEndPoint(ip, FLAGS_port)); |
| 104 if (rc < 0) { | 117 if (rc < 0) { |
| 105 return 1; | 118 return 1; |
| 106 } | 119 } |
| 107 | 120 |
| 108 while (1) { | 121 while (1) { |
| 109 server.WaitForEvents(); | 122 server.WaitForEvents(); |
| 110 } | 123 } |
| 111 } | 124 } |
| OLD | NEW |
