Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-04-01 10:28:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

squash bug in closing Flask web server (fixes #131)

Browse Source
This commit is contained in:
Micah Lee 2014-09-03 00:11:15 -07:00
parent 17646641f6
commit 2c1534979e
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
onionshare/web.py
View File

@ -195,17 +195,14 @@ def start(port, stay_open=False):
set_stay_open(stay_open)
app.run(port=port)
def stop():
def stop(port):
# to stop flask, load http://127.0.0.1:<port>/<shutdown_slug>/shutdown
try:
if helpers.get_platform() == 'Tails':
# in Tails everything is proxies over Tor, so we need to get lower level
# to connect not over the proxy
import socket
s = socket.socket()
s.connect(('127.0.0.1', app.port))
s.sendall('GET /{0}/shutdown HTTP/1.1\r\n\r\n'.format(shutdown_slug))
else:
urllib2.urlopen('http://127.0.0.1:{0}/{1}/shutdown'.format(app.port, shutdown_slug)).read()
except:
pass
if helpers.get_platform() == 'Tails':
# in Tails everything is proxies over Tor, so we need to get lower level
# to connect not over the proxy
import socket
s = socket.socket()
s.connect(('127.0.0.1', port))
s.sendall('GET /{0}/shutdown HTTP/1.1\r\n\r\n'.format(shutdown_slug))
else:
urllib2.urlopen('http://127.0.0.1:{0}/{1}/shutdown'.format(port, shutdown_slug)).read()

2
onionshare_gui/onionshare_gui.py
View File

@ -138,7 +138,7 @@ class OnionShareGui(QtGui.QWidget):
t.start()
def stop_server(self):
web.stop()
web.stop(self.app.port)
self.app.cleanup()
self.stop_server_finished.emit()