From 0bf26b8e905e2685c92e8eef4d9cdd9fcf5c49c4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 9 May 2017 16:20:58 -0400 Subject: Avoid crash when --use-server is given an url that does not include a path. --- CHANGELOG | 2 ++ WebSockets.hs | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) 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 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 -- cgit v1.2.3