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

Fix bug with shutdown_slug

Browse Source
This commit is contained in:
Micah Lee 2018-03-14 08:33:25 -07:00
parent 72698a7247
commit fee1d49563
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
onionshare/web.py
View File

@ -350,7 +350,7 @@ class Web(object):
"""
Stop the flask web server, from the context of an http request.
"""
self.check_slug_candidate(slug_candidate, shutdown_slug)
self.check_slug_candidate(slug_candidate, self.shutdown_slug)
self.force_shutdown()
return ""
@ -472,10 +472,10 @@ class Web(object):
try:
s = socket.socket()
s.connect(('127.0.0.1', port))
s.sendall('GET /{0:s}/shutdown HTTP/1.1\r\n\r\n'.format(shutdown_slug))
s.sendall('GET /{0:s}/shutdown HTTP/1.1\r\n\r\n'.format(self.shutdown_slug))
except:
try:
urlopen('http://127.0.0.1:{0:d}/{1:s}/shutdown'.format(port, shutdown_slug)).read()
urlopen('http://127.0.0.1:{0:d}/{1:s}/shutdown'.format(port, self.shutdown_slug)).read()
except:
pass