Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 14:35:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update web-platform-tests to revision 075802c1d3387d07e31cd5887459d539b1297c8d.

Browse source
This commit is contained in:
Ms2ger 2015-05-29 15:46:13 +02:00
parent 10127d6b5a
commit 881fe95cd1
1617 changed files with 57062 additions and 2789 deletions
Download patch file Download diff file Expand all files Collapse all files

32
tests/wpt/web-platform-tests/tools/serve/serve.py
View file

@ -235,6 +235,26 @@ class WebSocketDaemon(object):
"-d", doc_root,
"-w", handlers_root,
"--log-level", log_level]
if ssl_config is not None:
# This is usually done through pywebsocket.main, however we're
# working around that to get the server instance and manually
# setup the wss server.
if pywebsocket._import_ssl():
tls_module = pywebsocket._TLS_BY_STANDARD_MODULE
logger.debug("WebSocketDaemon: Using standard SSL module.")
elif pywebsocket._import_pyopenssl():
tls_module = pywebsocket._TLS_BY_PYOPENSSL
logger.debug("WebSocketDaemon: Using PyOpenSSL module.")
else:
logger.critical("WebSocketDaemon: No SSL module is available.")
sys.exit(1)
cmd_args += ["--tls",
"--private-key", ssl_config["key_path"],
"--certificate", ssl_config["cert_path"],
"--tls-module", tls_module]
if (bind_hostname):
cmd_args = ["-H", host] + cmd_args
opts, args = pywebsocket._parse_args_and_config(cmd_args)
@ -282,12 +302,18 @@ def start_ws_server(host, port, paths, routes, bind_hostname, external_config, s
paths["ws_doc_root"],
"debug",
bind_hostname,
ssl_config)
ssl_config = None)
def start_wss_server(host, port, path, routes, bind_hostname, external_config, ssl_config,
def start_wss_server(host, port, paths, routes, bind_hostname, external_config, ssl_config,
**kwargs):
return
return WebSocketDaemon(host,
str(port),
repo_root,
paths["ws_doc_root"],
"debug",
bind_hostname,
ssl_config)
def get_ports(config, ssl_environment):