diff --git a/TODO b/docs/TODO
similarity index 100%
rename from TODO
rename to docs/TODO
diff --git a/links b/docs/links
similarity index 100%
rename from links
rename to docs/links
diff --git a/rfb_notes b/docs/rfb_notes
similarity index 100%
rename from rfb_notes
rename to docs/rfb_notes
diff --git a/prime.html b/prime.html
deleted file mode 100644
index 54c8f78..0000000
--- a/prime.html
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
- Worker example: One-core computation
-
-
- The highest prime number discovered so far is:
-
-
-
-
- Log:
-
-
-
-
-
diff --git a/prime.js b/prime.js
deleted file mode 100644
index 1b43d71..0000000
--- a/prime.js
+++ /dev/null
@@ -1,39 +0,0 @@
-var n = 1;
-var cur = 1;
-var timer = null;
-
-function search() {
- if (timer) clearTimeout(timer);
- var sqrtn = Math.sqrt(n);
- for (iters = 0; iters < 10000; iters += 1) {
- cur += 1;
- if ((cur <= sqrtn) && (n % cur != 0)) continue;
- if (cur > sqrtn) {
- postMessage("num:" + n);
- }
- n += 1;
- cur = 1;
- }
- timer = setTimeout(search, 10);
-}
-
-
-onmessage = function (e) {
- switch (e.data) {
- case 'start':
- postMessage("log:start");
- if (timer) clearTimeout(timer);
- timer = setTimeout(search, 100);
- break;
- case 'stop':
- postMessage("log:stop");
- if (timer) clearTimeout(timer);
- started = false;
- break;
- case 'reset':
- postMessage("log:reset");
- n = 1;
- postMessage('num:');
- break;
- }
-}
diff --git a/web.py b/web.py
index 8f0e6ba..f0bffe2 100755
--- a/web.py
+++ b/web.py
@@ -1,14 +1,53 @@
#!/usr/bin/python
+'''
+A super simple HTTP/HTTPS webserver for python. Automatically detect
-import sys
-from BaseHTTPServer import HTTPServer
-from CGIHTTPServer import CGIHTTPRequestHandler
+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)
+
+def serve():
+ bindsocket = socket.socket()
+ #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])
+ PORT = int(sys.argv[1])
except:
print "%s port" % sys.argv[0]
sys.exit(2)
-server = HTTPServer(('',port), CGIHTTPRequestHandler)
-server.serve_forever()
+serve()
diff --git a/webs.py b/webs.py
deleted file mode 100755
index f0bffe2..0000000
--- a/webs.py
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/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)
-
-def serve():
- bindsocket = socket.socket()
- #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()