Rev1791, Fix gevent 1.2 compatibility

This commit is contained in:
shortcutme 2016-12-27 11:37:58 +01:00
parent 86b0046f28
commit 9a1735f37d
3 changed files with 6 additions and 3 deletions

View file

@ -9,7 +9,7 @@ class Config(object):
def __init__(self, argv): def __init__(self, argv):
self.version = "0.5.1" self.version = "0.5.1"
self.rev = 1786 self.rev = 1791
self.argv = argv self.argv = argv
self.action = None self.action = None
self.config_file = "zeronet.conf" self.config_file = "zeronet.conf"

View file

@ -55,7 +55,7 @@ class ConnectionServer:
if port: # Listen server on a port if port: # Listen server on a port
self.pool = Pool(1000) # do not accept more than 1000 connections self.pool = Pool(1000) # do not accept more than 1000 connections
self.stream_server = StreamServer( self.stream_server = StreamServer(
(ip.replace("*", ""), port), self.handleIncomingConnection, spawn=self.pool, backlog=500 (ip.replace("*", "0.0.0.0"), port), self.handleIncomingConnection, spawn=self.pool, backlog=500
) )
if request_handler: if request_handler:
self.handleRequest = request_handler self.handleRequest = request_handler

View file

@ -14,7 +14,10 @@ from Config import config
from Crypt import CryptRsa from Crypt import CryptRsa
from Site import SiteManager from Site import SiteManager
from lib.PySocks import socks from lib.PySocks import socks
from gevent.coros import RLock try:
from gevent.coros import RLock
except:
from gevent.lock import RLock
from util import helper from util import helper
from Debug import Debug from Debug import Debug