Merge branch 'master' of github.com:robot-tools/certserver

2016-04-10 23:38:15 +00:00
parent d09a84c26c 367b8795b6
commit baaf278acc
2 changed files with 2 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,4 @@ target/

 # daemontools coexistance
 run
+log
--- a/certserver.py
+++ b/certserver.py
@@ -85,7 +85,7 @@ class CertServer(object):
        cert_reqs=ssl.CERT_REQUIRED,
        ssl_version=ssl.PROTOCOL_TLSv1_2,
        ciphers='ECDHE-ECDSA-AES256-GCM-SHA384')
-    self._httpd.settimeout(5.0)
+    self._httpd.socket.settimeout(5.0)

  def Serve(self):
    self._httpd.serve_forever()