summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2017-05-09 16:20:58 -0400
committerSean Whitton <spwhitton@spwhitton.name>2017-05-09 13:42:56 -0700
commit24ac3c83db16fe6d52a326b77b1c0e4a26cb1a0a (patch)
treeb388e6c7905fe7b4b750a237a1b7b5c92b6a025e
parent6f0f452d8c5b8406aac83dd64f6c108394e63177 (diff)
downloaddebug-me-24ac3c83db16fe6d52a326b77b1c0e4a26cb1a0a.tar.gz
Avoid crash when --use-server is given an url that does not include a path.
-rw-r--r--CHANGELOG2
-rw-r--r--WebSockets.hs4
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index cb4ae68..35658a3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,8 @@ debug-me (1.20170506) UNRELEASED; urgency=medium
* debug-me.default: Include a --from-email setting,
to encourage it be configured.
Thanks, Sean Whitton.
+ * Avoid crash when --use-server is given an url that does not
+ include a path.
-- Joey Hess <id@joeyh.name> Tue, 09 May 2017 11:45:41 -0400
diff --git a/WebSockets.hs b/WebSockets.hs
index 359fe7b..2a0eb40 100644
--- a/WebSockets.hs
+++ b/WebSockets.hs
@@ -144,7 +144,9 @@ runClientApp serverurl app = do
port = case uriPort serverauth of
(':':s) -> fromMaybe 80 (readMaybe s)
_ -> 80
- endpoint = uriPath serverurl
+ endpoint = case uriPath serverurl of
+ [] -> "/"
+ p -> p
catchconnclosed ConnectionClosed = Just ()
catchconnclosed _ = Nothing