wai-app-file-cgi 3.0.5 → 3.0.6

raw patch · 2 files changed

+4/−30 lines, 2 filesdep ~waidep ~warp

Dependency ranges changed: wai, warp

Files

• Network/Wai/Application/Classic/File.hs +1/−27
• wai-app-file-cgi.cabal +3/−3

@@ -60,7 +60,7 @@ fileApp cspec spec filei req respond = do     RspSpec st body <- case method of         Right GET  -> processGET  hinfo ishtml rfile-        Right HEAD -> processHEAD hinfo ishtml rfile+        Right HEAD -> processGET  hinfo ishtml rfile         _          -> return notAllowed     (response, mlen) <- case body of             NoBody                 -> noBody st@@ -134,32 +134,6 @@           | st == ok200  -> return $ RspSpec ok200 (BodyFile hdr sfile (Entire size))           | otherwise    -> return $ RspSpec st (BodyFileNoBody hdr)         Partial skip len -> return $ RspSpec partialContent206 (BodyFile hdr sfile (Part skip len size))--------------------------------------------------------------------processHEAD :: HandlerInfo -> Bool -> Maybe Path -> Rsp-processHEAD hinfo ishtml rfile = tryHead     hinfo ishtml-                             ||> tryRedirect hinfo rfile-                             ||> return notFoundNoBody--tryHead :: HandlerInfo -> Bool -> Rsp-tryHead hinfo@(HandlerInfo _ _ _ _ langs) True =-    runAnyOne $ map (tryHeadFile hinfo True) langs-tryHead hinfo False= tryHeadFile hinfo False id--tryHeadFile :: HandlerInfo -> Bool -> Lang -> Rsp-tryHeadFile (HandlerInfo spec req reqidx file _) ishtml lang = do-    finfo <- liftIO $ getFileInfo spec (lang file)-    let mtime = fileInfoTime finfo-        size  = fileInfoSize finfo-        date  = fileInfoDate finfo-        hdr = newHeader ishtml (pathByteString file) date-        mrange = requestHeaderRange req-        Just pst = ifmodified reqidx size mtime mrange-               <|> Just (Full ok200)-    case pst of-        Full st -> return $ RspSpec st (BodyFileNoBody hdr)-        _       -> goNext -- never reached  ---------------------------------------------------------------- 

@@ -1,5 +1,5 @@ Name:                   wai-app-file-cgi-Version:                3.0.5+Version:                3.0.6 Author:                 Kazu Yamamoto <kazu@iij.ad.jp> Maintainer:             Kazu Yamamoto <kazu@iij.ad.jp> License:                BSD3@@ -90,9 +90,9 @@                       , hspec >= 1.3                       , http-types                       , unix-                      , wai >= 2.0+                      , wai >= 3                       , wai-app-file-cgi-                      , warp >= 3.0.2+                      , warp >= 3.0.10.1                       , HTTP  Source-Repository head