summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Lee <micah@micahflee.com>2017-05-24 14:02:45 -0700
committerMicah Lee <micah@micahflee.com>2017-05-24 14:02:45 -0700
commit63b45d348e6521779fddddf79108ae5154da5aeb (patch)
tree5f124fdd1afb826e006592b79a598afb52e313ec
parent19f2fca2c1b681714fbb878fca46069581a1263e (diff)
parent3e329b1bac91b204fa3b5a36212f056cc281d1f1 (diff)
downloadonionshare-63b45d348e6521779fddddf79108ae5154da5aeb.tar.gz
onionshare-63b45d348e6521779fddddf79108ae5154da5aeb.zip
Merge branch 'mig5-fix_shutdown_from_gui'
-rw-r--r--onionshare/web.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/onionshare/web.py b/onionshare/web.py
index 844cff3c..de5b0d2f 100644
--- a/onionshare/web.py
+++ b/onionshare/web.py
@@ -394,4 +394,7 @@ def stop(port):
s.connect(('127.0.0.1', port))
s.sendall('GET /{0:s}/shutdown HTTP/1.1\r\n\r\n'.format(shutdown_slug))
except:
- pass
+ try:
+ urlopen('http://127.0.0.1:{0:d}/{1:s}/shutdown'.format(port, shutdown_slug)).read()
+ except:
+ pass