Skip to content

Commit

Permalink
Merge pull request #97 from strategicpause/master
Browse files Browse the repository at this point in the history
Fixes
  • Loading branch information
progrium committed Apr 4, 2013
2 parents 65addb0 + a7cb72d commit 4866298
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 2 deletions.
5 changes: 4 additions & 1 deletion localtunnel/client/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ def run():
name = args.name
client = util.client_name()
target = util.parse_address(args.target)[0]

try:
control = eventlet.connect(backend)
control.sendall(protocol.version)
Expand Down Expand Up @@ -121,3 +120,7 @@ def maintain_proxy_backend_pool():
print " Make sure you have the latest version of the client."
except KeyboardInterrupt:
pass

if __name__ == '__main__':
run()

7 changes: 7 additions & 0 deletions localtunnel/meta.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
import json
import os
# Some environments require these extra imports due to
# eventlet's monkey patching code.
import SocketServer
import httplib
import ftplib
import urllib
import BaseHTTPServer

from eventlet.wsgi import Server

Expand Down
4 changes: 4 additions & 0 deletions localtunnel/server/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,7 @@ def run():
pool.waitall()
except KeyboardInterrupt:
pass

if __name__ == '__main__':
run()

2 changes: 1 addition & 1 deletion localtunnel/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def parse_address(address, default_port=None, default_ip=None):
myhost:80
0.0.0.0:8000
"""
default_ip = default_ip or '0.0.0.0'
default_ip = default_ip or '127.0.0.1'
try:
# this is if address is simply a port number
return (default_ip, int(address)), None
Expand Down

0 comments on commit 4866298

Please sign in to comment.