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

Side by Side Diff: net/test/spawned_test_server/base_test_server.cc

Issue 2205433002: Implement ALPN in tlslite. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moving nextProtos back to where it was. Created 4 years, 4 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
« no previous file with comments | « net/test/spawned_test_server/base_test_server.h ('k') | net/tools/testserver/testserver.py » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/test/spawned_test_server/base_test_server.h" 5 #include "net/test/spawned_test_server/base_test_server.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <limits> 8 #include <limits>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 621 matching lines...) Expand 10 before | Expand all | Expand 10 after
632 base::Base64Encode(ssl_options_.signed_cert_timestamps_tls_ext, 632 base::Base64Encode(ssl_options_.signed_cert_timestamps_tls_ext,
633 &b64_scts_tls_ext); 633 &b64_scts_tls_ext);
634 arguments->SetString("signed-cert-timestamps-tls-ext", b64_scts_tls_ext); 634 arguments->SetString("signed-cert-timestamps-tls-ext", b64_scts_tls_ext);
635 } 635 }
636 if (ssl_options_.staple_ocsp_response) 636 if (ssl_options_.staple_ocsp_response)
637 arguments->Set("staple-ocsp-response", base::Value::CreateNullValue()); 637 arguments->Set("staple-ocsp-response", base::Value::CreateNullValue());
638 if (ssl_options_.ocsp_server_unavailable) { 638 if (ssl_options_.ocsp_server_unavailable) {
639 arguments->Set("ocsp-server-unavailable", 639 arguments->Set("ocsp-server-unavailable",
640 base::Value::CreateNullValue()); 640 base::Value::CreateNullValue());
641 } 641 }
642 if (!ssl_options_.alpn_protocols.empty()) {
643 std::unique_ptr<base::ListValue> alpn_protocols(new base::ListValue());
644 for (const std::string& proto : ssl_options_.alpn_protocols) {
645 alpn_protocols->AppendString(proto);
646 }
647 arguments->Set("alpn-protocols", std::move(alpn_protocols));
648 }
642 if (!ssl_options_.npn_protocols.empty()) { 649 if (!ssl_options_.npn_protocols.empty()) {
643 std::unique_ptr<base::ListValue> npn_protocols(new base::ListValue()); 650 std::unique_ptr<base::ListValue> npn_protocols(new base::ListValue());
644 for (const std::string& proto : ssl_options_.npn_protocols) { 651 for (const std::string& proto : ssl_options_.npn_protocols) {
645 npn_protocols->AppendString(proto); 652 npn_protocols->AppendString(proto);
646 } 653 }
647 arguments->Set("npn-protocols", std::move(npn_protocols)); 654 arguments->Set("npn-protocols", std::move(npn_protocols));
648 } 655 }
649 if (ssl_options_.alert_after_handshake) 656 if (ssl_options_.alert_after_handshake)
650 arguments->Set("alert-after-handshake", base::Value::CreateNullValue()); 657 arguments->Set("alert-after-handshake", base::Value::CreateNullValue());
651 658
(...skipping 14 matching lines...) Expand all
666 673
667 return GenerateAdditionalArguments(arguments); 674 return GenerateAdditionalArguments(arguments);
668 } 675 }
669 676
670 bool BaseTestServer::GenerateAdditionalArguments( 677 bool BaseTestServer::GenerateAdditionalArguments(
671 base::DictionaryValue* arguments) const { 678 base::DictionaryValue* arguments) const {
672 return true; 679 return true;
673 } 680 }
674 681
675 } // namespace net 682 } // namespace net
OLDNEW
« no previous file with comments | « net/test/spawned_test_server/base_test_server.h ('k') | net/tools/testserver/testserver.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698