wai-app-file-cgi 3.0.2 → 3.0.3

raw patch · 5 files changed

+9/−13 lines, 5 filesdep ~warpPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: warp

API changes (from Hackage documentation)

Files

• Network/Wai/Application/Classic/CGI.hs +1/−2
• Network/Wai/Application/Classic/Field.hs +0/−3
• Network/Wai/Application/Classic/File.hs +5/−5
• Network/Wai/Application/Classic/Redirect.hs +1/−1
• wai-app-file-cgi.cabal +2/−2

@@ -74,11 +74,10 @@     let (st, hdr, hasBody) = case check hs of             Nothing    -> (internalServerError500,[],False)             Just (s,h) -> (s,h,True)-        hdr' = addServer cspec hdr     logger cspec req st Nothing     let src | hasBody   = src'             | otherwise = CL.sourceNull-    return $ responseSource st hdr' src+    return $ responseSource st hdr src   where     check hs = lookup hContentType hs >> case lookup hStatus hs of         Nothing -> Just (ok200, hs)

@@ -47,9 +47,6 @@ locationHeader :: ByteString -> ResponseHeaders locationHeader url = [(hLocation, url)] -addServer :: ClassicAppSpec -> ResponseHeaders -> ResponseHeaders-addServer cspec hdr = (hServer, softwareName cspec) : hdr- -- FIXME: the case where "Via:" already exists addVia :: ClassicAppSpec -> Request -> ResponseHeaders -> ResponseHeaders addVia cspec req hdr = (hVia, val) : hdr

@@ -78,7 +78,7 @@     ishtml = isHTML spec file     rfile = redirectPath spec path     langs = langSuffixes reqidx-    noBody st = return (responseLBS st (addServer cspec []) "", Nothing)+    noBody st = return (responseLBS st [] "", Nothing)     bodyStatus st = liftIO (getStatusInfo cspec spec langs st)                 >>= statusBody st     statusBody st StatusNone = noBody st@@ -86,17 +86,17 @@         return (responseLBS st hdr bd, Just (len bd))       where         len = fromIntegral . BL.length-        hdr = addServer cspec textPlainHeader+        hdr = textPlainHeader     statusBody st (StatusFile afile len) =         return (ResponseFile st hdr fl mfp, Just len)       where         mfp = Just (FilePart 0 len len)         fl = pathString afile-        hdr = addServer cspec textHtmlHeader+        hdr = textHtmlHeader     bodyFileNoBody st hdr =-        return (responseLBS st (addServer cspec hdr) "", Nothing)+        return (responseLBS st hdr "", Nothing)     bodyFile st hdr afile rng =-        return (ResponseFile st (addServer cspec hdr) fl mfp, Just len)+        return (ResponseFile st hdr fl mfp, Just len)       where         (len, mfp) = case rng of             -- sendfile of Linux does not support the entire file

@@ -20,5 +20,5 @@     src = redirectSrc route     dst = redirectDst route     rurl = "http://" `append` pathByteString (dst </> (path <\> src))-    hdr = addServer cspec $ locationHeader rurl+    hdr = locationHeader rurl     status = movedPermanently301

@@ -1,5 +1,5 @@ Name:                   wai-app-file-cgi-Version:                3.0.2+Version:                3.0.3 Author:                 Kazu Yamamoto <kazu@iij.ad.jp> Maintainer:             Kazu Yamamoto <kazu@iij.ad.jp> License:                BSD3@@ -92,7 +92,7 @@                       , unix                       , wai >= 2.0                       , wai-app-file-cgi-                      , warp >= 2.0+                      , warp >= 3.0.2                       , HTTP  Source-Repository head