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

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

Issue 1066613002: Revert of Don't process HSTS/HPKP headers when host is an IP address (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 TYPE_WSS, 42 TYPE_WSS,
43 TYPE_TCP_ECHO, 43 TYPE_TCP_ECHO,
44 TYPE_UDP_ECHO, 44 TYPE_UDP_ECHO,
45 }; 45 };
46 46
47 // Container for various options to control how the HTTPS or WSS server is 47 // Container for various options to control how the HTTPS or WSS server is
48 // initialized. 48 // initialized.
49 struct SSLOptions { 49 struct SSLOptions {
50 enum ServerCertificate { 50 enum ServerCertificate {
51 CERT_OK, 51 CERT_OK,
52 // Causes the testserver to use a hostname that is a domain
53 // instead of an IP.
54 CERT_OK_FOR_LOCALHOST,
55 52
56 // CERT_AUTO causes the testserver to generate a test certificate issued 53 // CERT_AUTO causes the testserver to generate a test certificate issued
57 // by "Testing CA" (see net/data/ssl/certificates/ocsp-test-root.pem). 54 // by "Testing CA" (see net/data/ssl/certificates/ocsp-test-root.pem).
58 CERT_AUTO, 55 CERT_AUTO,
59 56
60 CERT_MISMATCHED_NAME, 57 CERT_MISMATCHED_NAME,
61 CERT_EXPIRED, 58 CERT_EXPIRED,
62 // Cross-signed certificate to test PKIX path building. Contains an 59 // Cross-signed certificate to test PKIX path building. Contains an
63 // intermediate cross-signed by an unknown root, while the client (via 60 // intermediate cross-signed by an unknown root, while the client (via
64 // TestRootStore) is expected to have a self-signed version of the 61 // TestRootStore) is expected to have a self-signed version of the
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 bool ws_basic_auth_; 327 bool ws_basic_auth_;
331 328
332 scoped_ptr<ScopedPortException> allowed_port_; 329 scoped_ptr<ScopedPortException> allowed_port_;
333 330
334 DISALLOW_COPY_AND_ASSIGN(BaseTestServer); 331 DISALLOW_COPY_AND_ASSIGN(BaseTestServer);
335 }; 332 };
336 333
337 } // namespace net 334 } // namespace net
338 335
339 #endif // NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_ 336 #endif // NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698