Transfer-Encoding is always overwritten / foundEntity refuses POST requests / Documen...

[Lucu.git] / Network / HTTP / Lucu / Postprocess.hs

diff --git a/Network/HTTP/Lucu/Postprocess.hs b/Network/HTTP/Lucu/Postprocess.hs
index 124b66bd2ba3e4c4a4ac9aef92c4f9c76e0957ef..6f76e88811734508c1da16337712f7b7760577f3 100644 (file)
--- a/Network/HTTP/Lucu/Postprocess.hs
+++ b/Network/HTTP/Lucu/Postprocess.hs
@@ -32,14 +32,11 @@ import           System.Time
   * 304 Not Modified 以外の 3xx なのに Location ヘッダが無ければ 500 に
     する。
 
-  * Content-Length があれば、それを削除する。
+  * Content-Length があれば、それを削除する。Transfer-Encoding があって
+    も削除する。
 
-  * HTTP/1.1 であり、且つ body を持つ事が出來る時、Transfer-Encoding の
-    最後の要素が chunked でなければ 500 Internal Error にする。
-    Transfer-Encoding が未設定であれば、chunked に設定する。
-
-  * HTTP/1.0 なのに Transfer-Encoding が設定濟なら 500 Internal Server
-    Error にする。但し identity だけは許す。
+  * HTTP/1.1 であり、body を持つ事が出來る時、Transfer-Encoding を
+    chunked に設定する。
 
   * body を持つ事が出來る時、Content-Type が無ければデフォルト値にする。
     出來ない時、HEAD でなければContent-Type, Etag, Last-Modified を削除
@@ -78,8 +75,11 @@ postprocess itr
          when (itrRequest itr /= Nothing)
               $ relyOnRequest itr
 
-         do newRes <- unsafeIOToSTM
-                      $ completeUnconditionalHeaders (itrConfig itr) res
+         -- itrResponse の内容は relyOnRequest によって變へられてゐる可
+         -- 能性が高い。
+         do oldRes <- readItr itr itrResponse id
+            newRes <- unsafeIOToSTM
+                      $ completeUnconditionalHeaders (itrConfig itr) oldRes
             writeItr itr itrResponse newRes
     where
       relyOnRequest :: Interaction -> STM ()
@@ -97,42 +97,22 @@ postprocess itr
                                           status == NotModified    )
 
                updateRes itr $ deleteHeader "Content-Length"
+               updateRes itr $ deleteHeader "Transfer-Encoding"
 
                cType <- readHeader itr "Content-Type"
                when (cType == Nothing)
                         $ updateRes itr $ setHeader "Content-Type" defaultPageContentType
 
                if canHaveBody then
-                   do teM <- readHeader itr "Transfer-Encoding"
-                      if reqVer == HttpVersion 1 1 then
-
-                          do case teM of
-                               Nothing -> updateRes itr $ setHeader "Transfer-Encoding" "chunked"
-                               Just te -> let teList = [trim isWhiteSpace x
-                                                            | x <- splitBy (== ',') (map toLower te)]
-                                          in
-                                            when (teList == [] || last teList /= "chunked")
-                                                     $ abortSTM InternalServerError []
-                                                           $ Just ("Transfer-Encoding must end with `chunked' "
-                                                                   ++ "because this is an HTTP/1.1 request: "
-                                                                   ++ te)
-
-                             writeItr itr itrWillChunkBody True
-                        else
-                          case fmap (map toLower) teM of
-                            Nothing         -> return ()
-                            Just "identity" -> return ()
-                            Just te         -> abortSTM InternalServerError []
-                                               $ Just ("Transfer-Encoding must be `identity' because "
-                                                       ++ "this is an HTTP/1.0 request: "
-                                                       ++ te)
+                   when (reqVer == HttpVersion 1 1)
+                            $ do updateRes itr $ setHeader "Transfer-Encoding" "chunked"
+                                 writeItr itr itrWillChunkBody True
                  else
                    -- body 関連のヘッダを削除。但し HEAD なら Content-* は殘す
-                   do updateRes itr $ deleteHeader "Transfer-Encoding"
-                      when (reqMethod req /= HEAD)
-                               $ do updateRes itr $ deleteHeader "Content-Type"
-                                    updateRes itr $ deleteHeader "Etag"
-                                    updateRes itr $ deleteHeader "Last-Modified"
+                   when (reqMethod req /= HEAD)
+                            $ do updateRes itr $ deleteHeader "Content-Type"
+                                 updateRes itr $ deleteHeader "Etag"
+                                 updateRes itr $ deleteHeader "Last-Modified"
 
                conn <- readHeader itr "Connection"
                case fmap (map toLower) conn of