Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 140 int bulk_ciphers; | 140 int bulk_ciphers; |
| 141 | 141 |
| 142 // If true, pass the --https-record-resume argument to testserver.py which | 142 // If true, pass the --https-record-resume argument to testserver.py which |
| 143 // causes it to log session cache actions and echo the log on | 143 // causes it to log session cache actions and echo the log on |
| 144 // /ssl-session-cache. | 144 // /ssl-session-cache. |
| 145 bool record_resume; | 145 bool record_resume; |
| 146 | 146 |
| 147 // If not TLS_INTOLERANT_NONE, the server will abort any handshake that | 147 // If not TLS_INTOLERANT_NONE, the server will abort any handshake that |
| 148 // negotiates an intolerant TLS version in order to test version fallback. | 148 // negotiates an intolerant TLS version in order to test version fallback. |
| 149 TLSIntolerantLevel tls_intolerant; | 149 TLSIntolerantLevel tls_intolerant; |
| 150 | |
| 151 // (Fake) Signed Certificate Timestamps to send in a TLS extension. | |
| 152 // Temporary glue for testing: validation of SCTs is application-controlled | |
| 153 // and can be appropriately mocked out, so sending fake data here does not | |
| 154 // affect handshaking behaviour. | |
| 155 // TODO(ekasper): replace with valid SCT files for test certs. | |
| 156 std::string signed_cert_timestamps; | |
| 150 }; | 157 }; |
| 151 | 158 |
| 152 // Pass as the 'host' parameter during construction to server on 127.0.0.1 | 159 // Pass as the 'host' parameter during construction to server on 127.0.0.1 |
| 153 static const char kLocalhost[]; | 160 static const char kLocalhost[]; |
| 154 | 161 |
| 155 // Initialize a TestServer listening on a specific host (IP or hostname). | 162 // Initialize a TestServer listening on a specific host (IP or hostname). |
| 156 BaseTestServer(Type type, const std::string& host); | 163 BaseTestServer(Type type, const std::string& host); |
| 157 | 164 |
| 158 // Initialize a TestServer with a specific set of SSLOptions for HTTPS or WSS. | 165 // Initialize a TestServer with a specific set of SSLOptions for HTTPS or WSS. |
| 159 explicit BaseTestServer(Type type, const SSLOptions& ssl_options); | 166 explicit BaseTestServer(Type type, const SSLOptions& ssl_options); |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 253 bool log_to_console_; | 260 bool log_to_console_; |
| 254 | 261 |
| 255 scoped_ptr<ScopedPortException> allowed_port_; | 262 scoped_ptr<ScopedPortException> allowed_port_; |
| 256 | 263 |
| 257 DISALLOW_COPY_AND_ASSIGN(BaseTestServer); | 264 DISALLOW_COPY_AND_ASSIGN(BaseTestServer); |
| 258 }; | 265 }; |
| 259 | 266 |
| 260 } // namespace net | 267 } // namespace net |
| 261 | 268 |
| 262 #endif // NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_ | 269 #endif // NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_ |
| 263 | |
|
wtc
2013/11/26 17:32:55
Some of these lines at the end of files may have b
ekasper
2013/11/26 19:33:54
Done.
| |
| OLD | NEW |