checkpoint Blink-side work to use Apache on Windows

Tools/Scripts/run-blink-websocketserver

Index: Tools/Scripts/run-blink-websocketserver
diff --git a/Tools/Scripts/run-blink-websocketserver b/Tools/Scripts/run-blink-websocketserver
index 15ed1f99efed7be984835a9c4470ddb1f45ec0ba..9a938ca0c37dda182b06e09e150a2c89ed699c75 100755
--- a/Tools/Scripts/run-blink-websocketserver
+++ b/Tools/Scripts/run-blink-websocketserver
@@ -32,7 +32,9 @@
 
 import logging
 import optparse
-import tempfile
+import time
+
+import webkitpy.common.version_check
 
 from webkitpy.common.host import Host
 from webkitpy.layout_tests.servers import websocket_server
@@ -40,76 +42,29 @@ from webkitpy.layout_tests.servers import websocket_server
 
 def main():
     option_parser = optparse.OptionParser()
-    option_parser.add_option('--server', type='choice',
-                             choices=['start', 'stop'], default='start',
-                             help='Server action (start|stop).')
-    option_parser.add_option('-p', '--port', dest='port',
-                             default=None, help='Port to listen on.')
-    option_parser.add_option('-r', '--root',
-                             help='Absolute path to DocumentRoot '
-                                  '(overrides layout test roots).')
-    option_parser.add_option('-t', '--tls', dest='use_tls',
-                             action='store_true',
-                             default=False, help='use TLS (wss://).')
-    option_parser.add_option('-k', '--private_key', dest='private_key',
-                             default='', help='TLS private key file.')
-    option_parser.add_option('-c', '--certificate', dest='certificate',
-                             default='', help='TLS certificate file.')
-    option_parser.add_option('--ca-certificate', dest='ca_certificate',
-                             default='', help='TLS CA certificate file for '
-                                              'client authentication.')
-    option_parser.add_option('--chromium', action='store_true',
-                             dest='chromium',
-                             default=False,
-                             help='Use the Chromium port.')
-    option_parser.add_option('--register_cygwin', action="store_true",
-                             dest="register_cygwin",
-                             help='Register Cygwin paths (on Win try bots).')
-    option_parser.add_option('--pidfile', help='path to pid file.')
     option_parser.add_option('--output-dir', dest='output_dir',
                              default=None, help='output directory.')
-    option_parser.add_option('-v', '--verbose', action='store_true',
-                             default=False,
-                             help='Include debug-level logging.')
+    option_parser.add_option('-v', '--verbose', action='store_true')
     options, args = option_parser.parse_args()
 
-    if not options.port:
-        if options.use_tls:
-            # FIXME: We shouldn't grab at this private variable.
-            options.port = websocket_server._DEFAULT_WSS_PORT
-        else:
-            # FIXME: We shouldn't grab at this private variable.
-            options.port = websocket_server._DEFAULT_WS_PORT
-
-    if not options.output_dir:
-        options.output_dir = tempfile.gettempdir()
-
-    kwds = {'port': options.port, 'use_tls': options.use_tls}
-    if options.root:
-        kwds['root'] = options.root
-    if options.private_key:
-        kwds['private_key'] = options.private_key
-    if options.certificate:
-        kwds['certificate'] = options.certificate
-    if options.ca_certificate:
-        kwds['ca_certificate'] = options.ca_certificate
-    if options.pidfile:
-        kwds['pidfile'] = options.pidfile
-
     host = Host()
-    # FIXME: Make this work with other ports as well.
-    port_obj = host.port_factory.get(port_name='chromium', options=options)
-    pywebsocket = websocket_server.PyWebSocket(port_obj, options.output_dir, **kwds)
+    port_obj = host.port_factory.get()
+    if not options.output_dir:
+        options.output_dir = port_obj.default_results_directory()
 
     log_level = logging.WARN
     if options.verbose:
         log_level = logging.DEBUG
     logging.basicConfig(level=log_level)
 
-    if 'start' == options.server:
-        pywebsocket.start()
-    else:
-        pywebsocket.stop()
+    pywebsocket = websocket_server.PyWebSocket(port_obj, options.output_dir, number_of_servers=4)
+    pywebsocket.start()
+    try:
+        while True:
+            time.sleep(1)
+    except KeyboardInterrupt as e:
+        pass
+    pywebsocket.stop()
 
 if '__main__' == __name__:
     main()