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

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

Issue 416683002: This CL corrects a bug in which the OnHandshakeComplete callback for an ssl session was never called (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@r2
Patch Set: Renamed server command line flag and fixed other cl comments Created 6 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
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 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 // TODO(ekasper): replace with valid SCT files for test certs. 196 // TODO(ekasper): replace with valid SCT files for test certs.
197 // (Fake) SignedCertificateTimestampList (as a raw binary string) to send in 197 // (Fake) SignedCertificateTimestampList (as a raw binary string) to send in
198 // a TLS extension. 198 // a TLS extension.
199 std::string signed_cert_timestamps_tls_ext; 199 std::string signed_cert_timestamps_tls_ext;
200 200
201 // Whether to staple the OCSP response. 201 // Whether to staple the OCSP response.
202 bool staple_ocsp_response; 202 bool staple_ocsp_response;
203 203
204 // Whether to enable NPN support. 204 // Whether to enable NPN support.
205 bool enable_npn; 205 bool enable_npn;
206
207 // Whether to disable TLS session caching. When session caching is
208 // disabled, the server will generate a new Session ID for every connection.
209 bool disable_session_cache;
206 }; 210 };
207 211
208 // Pass as the 'host' parameter during construction to server on 127.0.0.1 212 // Pass as the 'host' parameter during construction to server on 127.0.0.1
209 static const char kLocalhost[]; 213 static const char kLocalhost[];
210 214
211 // Initialize a TestServer listening on a specific host (IP or hostname). 215 // Initialize a TestServer listening on a specific host (IP or hostname).
212 BaseTestServer(Type type, const std::string& host); 216 BaseTestServer(Type type, const std::string& host);
213 217
214 // Initialize a TestServer with a specific set of SSLOptions for HTTPS or WSS. 218 // Initialize a TestServer with a specific set of SSLOptions for HTTPS or WSS.
215 BaseTestServer(Type type, const SSLOptions& ssl_options); 219 BaseTestServer(Type type, const SSLOptions& ssl_options);
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 bool ws_basic_auth_; 322 bool ws_basic_auth_;
319 323
320 scoped_ptr<ScopedPortException> allowed_port_; 324 scoped_ptr<ScopedPortException> allowed_port_;
321 325
322 DISALLOW_COPY_AND_ASSIGN(BaseTestServer); 326 DISALLOW_COPY_AND_ASSIGN(BaseTestServer);
323 }; 327 };
324 328
325 } // namespace net 329 } // namespace net
326 330
327 #endif // NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_ 331 #endif // NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698