diff --git a/sleepymongoose/handlers.pyc b/sleepymongoose/handlers.pyc new file mode 100644 index 0000000..45570f3 Binary files /dev/null and b/sleepymongoose/handlers.pyc differ diff --git a/sleepymongoose/httpd.py b/sleepymongoose/httpd.py index 53629d5..701b367 100644 --- a/sleepymongoose/httpd.py +++ b/sleepymongoose/httpd.py @@ -16,10 +16,7 @@ from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer from handlers import MongoHandler -try: - from OpenSSL import SSL -except ImportError: - pass +import ssl import os.path, socket import urlparse @@ -45,15 +42,9 @@ class MongoServer(HTTPServer): pem = None def __init__(self, server_address, HandlerClass): - BaseServer.__init__(self, server_address, HandlerClass) - ctx = SSL.Context(SSL.SSLv23_METHOD) - fpem = MongoServer.pem - ctx.use_privatekey_file(fpem) - ctx.use_certificate_file(fpem) - - self.socket = SSL.Connection(ctx, socket.socket(self.address_family, - self.socket_type)) + BaseServer.__init__(self, server_address, HandlerClass) + self.socket = ssl.SSLSocket(sock=socket.socket(self.address_family,self.socket_type), ssl_version=ssl.PROTOCOL_SSLv23, certfile=fpem, keyfile=fpem, server_side=True) self.server_bind() self.server_activate()