| Index: net/tools/testserver/testserver.py
|
| diff --git a/net/tools/testserver/testserver.py b/net/tools/testserver/testserver.py
|
| index 60b7b2817f47c5f238e9b55c23eff4604d096c2b..019e782a806df2466afc2663830e8e2912ecdf7d 100755
|
| --- a/net/tools/testserver/testserver.py
|
| +++ b/net/tools/testserver/testserver.py
|
| @@ -157,7 +157,7 @@ class HTTPSServer(tlslite.api.TLSSocketServerMixIn,
|
| ssl_bulk_ciphers, ssl_key_exchanges, enable_npn,
|
| record_resume_info, tls_intolerant,
|
| tls_intolerance_type, signed_cert_timestamps,
|
| - fallback_scsv_enabled, ocsp_response):
|
| + fallback_scsv_enabled, ocsp_response, none_session_cache):
|
| self.cert_chain = tlslite.api.X509CertChain()
|
| self.cert_chain.parsePemList(pem_cert_and_key)
|
| # Force using only python implementation - otherwise behavior is different
|
| @@ -205,6 +205,8 @@ class HTTPSServer(tlslite.api.TLSSocketServerMixIn,
|
| # If record_resume_info is true then we'll replace the session cache with
|
| # an object that records the lookups and inserts that it sees.
|
| self.session_cache = RecordingSSLSessionCache()
|
| + elif none_session_cache:
|
| + self.session_cache = None
|
| else:
|
| self.session_cache = tlslite.api.SessionCache()
|
| testserver_base.StoppableHTTPServer.__init__(self,
|
| @@ -1986,7 +1988,8 @@ class ServerRunner(testserver_base.TestServerRunner):
|
| self.options.signed_cert_timestamps_tls_ext.decode(
|
| "base64"),
|
| self.options.fallback_scsv,
|
| - stapled_ocsp_response)
|
| + stapled_ocsp_response,
|
| + self.options.none_session_cache)
|
| print 'HTTPS server started on https://%s:%d...' % \
|
| (host, server.server_port)
|
| else:
|
| @@ -2086,6 +2089,10 @@ class ServerRunner(testserver_base.TestServerRunner):
|
|
|
| def add_options(self):
|
| testserver_base.TestServerRunner.add_options(self)
|
| + self.option_parser.add_option('--none-session-cache', action='store_true',
|
| + dest='none_session_cache',
|
| + help='tells the server to use a None'
|
| + 'session cache.')
|
| self.option_parser.add_option('-f', '--ftp', action='store_const',
|
| const=SERVER_FTP, default=SERVER_HTTP,
|
| dest='server_type',
|
|
|