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

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

Issue 1347503002: Add flags to python test server for channel id, extended master secret, and token binding (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Initialize new fields in both constructors (fix memory error) Created 5 years, 3 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 | « no previous file | net/test/spawned_test_server/base_test_server.cc » ('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 #ifndef NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_ 5 #ifndef NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_
6 #define NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_ 6 #define NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 216
217 // Whether to make the OCSP server unavailable. This does not affect the 217 // Whether to make the OCSP server unavailable. This does not affect the
218 // stapled OCSP response. 218 // stapled OCSP response.
219 bool ocsp_server_unavailable; 219 bool ocsp_server_unavailable;
220 220
221 // Whether to enable NPN support. 221 // Whether to enable NPN support.
222 bool enable_npn; 222 bool enable_npn;
223 223
224 // Whether to send a fatal alert immediately after completing the handshake. 224 // Whether to send a fatal alert immediately after completing the handshake.
225 bool alert_after_handshake; 225 bool alert_after_handshake;
226
227 // If true, disables channel ID on the server.
228 bool disable_channel_id;
229
230 // If true, disables extended master secret tls extension.
231 bool disable_extended_master_secret;
232
233 // List of token binding params that the server supports and will negotiate.
234 std::vector<int> supported_token_binding_params;
226 }; 235 };
227 236
228 // Pass as the 'host' parameter during construction to server on 127.0.0.1 237 // Pass as the 'host' parameter during construction to server on 127.0.0.1
229 static const char kLocalhost[]; 238 static const char kLocalhost[];
230 239
231 // Initialize a TestServer listening on a specific host (IP or hostname). 240 // Initialize a TestServer listening on a specific host (IP or hostname).
232 BaseTestServer(Type type, const std::string& host); 241 BaseTestServer(Type type, const std::string& host);
233 242
234 // Initialize a TestServer with a specific set of SSLOptions for HTTPS or WSS. 243 // Initialize a TestServer with a specific set of SSLOptions for HTTPS or WSS.
235 BaseTestServer(Type type, const SSLOptions& ssl_options); 244 BaseTestServer(Type type, const SSLOptions& ssl_options);
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 bool no_anonymous_ftp_user_; 358 bool no_anonymous_ftp_user_;
350 359
351 scoped_ptr<ScopedPortException> allowed_port_; 360 scoped_ptr<ScopedPortException> allowed_port_;
352 361
353 DISALLOW_COPY_AND_ASSIGN(BaseTestServer); 362 DISALLOW_COPY_AND_ASSIGN(BaseTestServer);
354 }; 363 };
355 364
356 } // namespace net 365 } // namespace net
357 366
358 #endif // NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_ 367 #endif // NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_
OLDNEW
« no previous file with comments | « no previous file | net/test/spawned_test_server/base_test_server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698