Merge PR #969

yesodweb · Jan 9, 2024 · 7846053 · 7846053
2 parents 142c679 + abe05cf
commit 7846053
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/warp-tls/Network/Wai/Handler/WarpTLS.hs b/warp-tls/Network/Wai/Handler/WarpTLS.hs
@@ -428,9 +428,9 @@ plainHTTP TLSSettings{..} set s bs0 = case onInsecure of
         -- FIXME: Content-Length:
         -- FIXME: TLS/<version>
         sendAll s "HTTP/1.1 426 Upgrade Required\
-        \r\nUpgrade: TLS/1.0, HTTP/1.1\
-        \r\nConnection: Upgrade\
-        \r\nContent-Type: text/plain\r\n\r\n"
+            \\r\nUpgrade: TLS/1.0, HTTP/1.1\
+            \\r\nConnection: Upgrade\
+            \\r\nContent-Type: text/plain\r\n\r\n"
         mapM_ (sendAll s) $ L.toChunks lbs
         close s
         throwIO InsecureConnectionDenied

diff --git a/warp/Network/Wai/Handler/Warp/HTTP2/PushPromise.hs b/warp/Network/Wai/Handler/Warp/HTTP2/PushPromise.hs
@@ -17,9 +17,7 @@ import Network.Wai.Handler.Warp.Types
 fromPushPromises :: InternalInfo -> Request -> IO [H2.PushPromise]
 fromPushPromises ii req = do
     mh2data <- getHTTP2Data req
-    let pp = case mh2data of
-          Nothing     -> []
-          Just h2data -> http2dataPushPromise h2data
+    let pp = maybe [] http2dataPushPromise mh2data
     catMaybes <$> mapM (fromPushPromise ii) pp
 
 fromPushPromise :: InternalInfo -> PushPromise -> IO (Maybe H2.PushPromise)