Просмотр исходного кода

Remove last bits of websockify cruft

Issue #449 pointed out that there were some files that were
missed in 6f5148648bd0e0ffa7ad00474c230f5f1ff4e39f.  This
fixes that.

Closes #449
Closes #450
Solly Ross 10 лет назад
Родитель
Сommit
fe8a4dc9d8
3 измененных файлов с 4 добавлено и 66 удалено
  1. 0 11
      utils/Makefile
  2. 4 0
      utils/README.md
  3. 0 55
      utils/web.py

+ 0 - 11
utils/Makefile

@@ -1,11 +0,0 @@
-TARGETS=rebind.so
-CFLAGS += -fPIC
-
-all: $(TARGETS)
-
-rebind.so: rebind.o
-	$(CC) $(LDFLAGS) $^ -shared -fPIC -ldl -o $@
-
-clean:
-	rm -f rebind.o rebind.so
-

+ 4 - 0
utils/README.md

@@ -1,5 +1,9 @@
 ## WebSockets Proxy/Bridge
 
+Websockify has been forked out into its own project.  `launch.sh` wil
+automatically download it here if it is not already present and not
+installed as system-wide.
+
 For more detailed description and usage information please refer to
 the [websockify README](https://github.com/kanaka/websockify/blob/master/README.md).
 

+ 0 - 55
utils/web.py

@@ -1,55 +0,0 @@
-#!/usr/bin/env python
-'''
-A super simple HTTP/HTTPS webserver for python. Automatically detect
-
-You can make a cert/key with openssl using:
-openssl req -new -x509 -days 365 -nodes -out self.pem -keyout self.pem
-as taken from http://docs.python.org/dev/library/ssl.html#certificates
-
-'''
-
-import traceback, sys
-import socket
-import ssl
-#import http.server as server      # python 3.X
-import SimpleHTTPServer as server  # python 2.X
-
-def do_request(connstream, from_addr):
-    x = object()
-    server.SimpleHTTPRequestHandler(connstream, from_addr, x)
-    connstream.close()
-
-def serve():
-    bindsocket = socket.socket()
-    bindsocket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-    #bindsocket.bind(('localhost', PORT))
-    bindsocket.bind(('', PORT))
-    bindsocket.listen(5)
-
-    print("serving on port", PORT)
-
-    while True:
-        try:
-            newsocket, from_addr = bindsocket.accept()
-            peek = newsocket.recv(1024, socket.MSG_PEEK)
-            if peek.startswith("\x16"):
-                connstream = ssl.wrap_socket(
-                        newsocket,
-                        server_side=True,
-                        certfile='self.pem',
-                        ssl_version=ssl.PROTOCOL_TLSv1)
-            else:
-                connstream = newsocket
-
-            do_request(connstream, from_addr)
-
-        except Exception:
-            traceback.print_exc()
-
-try:
-    PORT = int(sys.argv[1])
-except:
-    print "%s port" % sys.argv[0]
-    sys.exit(2)
-
-serve()