From 8a4fb790cfcb72a4eb939592d7280e35c9a6e3a6 Mon Sep 17 00:00:00 2001 From: James Burton Date: Tue, 9 Feb 2021 12:07:56 +0000 Subject: [PATCH] Revert "Fixed indentation" This reverts commit 52cf6339933a7f174f8723344b0dc3019b0f0a5f. --- yesod-bin/Devel.hs | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/yesod-bin/Devel.hs b/yesod-bin/Devel.hs index 7e52a68f..bb8d6c11 100644 --- a/yesod-bin/Devel.hs +++ b/yesod-bin/Devel.hs @@ -174,28 +174,28 @@ reverseProxy opts appPortVar = do manager defaultSettings' = maybe id (setHost . fromString) (develHost opts) defaultSettings runProxyTls port app = do - let certDef = $(embedFile "certificate.pem") - keyDef = $(embedFile "key.pem") - certOpts = bisequence $ (certPath &&& keyPath) opts - theSettings = maybe (tlsSettingsMemory certDef keyDef) (uncurry tlsSettings) certOpts - runTLS theSettings (setPort port defaultSettings') $ \req send -> do - let req' = req - { requestHeaders - = ("X-Forwarded-Proto", "https") - -- Workaround for - -- https://github.com/yesodweb/wai/issues/478, where - -- the Host headers aren't set. Without this, generated - -- URLs from guestApproot are incorrect, see: - -- https://github.com/yesodweb/yesod-scaffold/issues/114 - : (case lookup "host" (requestHeaders req) of - Nothing -> - case requestHeaderHost req of - Just host -> (("Host", host):) - Nothing -> id - Just _ -> id) - (requestHeaders req) - } - app req' send + let certDef = $(embedFile "certificate.pem") + keyDef = $(embedFile "key.pem") + certOpts = bisequence $ (certPath &&& keyPath) opts + theSettings = maybe (tlsSettingsMemory certDef keyDef) (uncurry tlsSettings) certOpts + runTLS theSettings (setPort port defaultSettings') $ \req send -> do + let req' = req + { requestHeaders + = ("X-Forwarded-Proto", "https") + -- Workaround for + -- https://github.com/yesodweb/wai/issues/478, where + -- the Host headers aren't set. Without this, generated + -- URLs from guestApproot are incorrect, see: + -- https://github.com/yesodweb/yesod-scaffold/issues/114 + : (case lookup "host" (requestHeaders req) of + Nothing -> + case requestHeaderHost req of + Just host -> (("Host", host):) + Nothing -> id + Just _ -> id) + (requestHeaders req) + } + app req' send httpProxy = runSettings (setPort (develPort opts) defaultSettings') proxyApp httpsProxy = runProxyTls (develTlsPort opts) proxyApp say "Application can be accessed at:\n"