diff --git a/Network/Wai/Application/Classic/RevProxy.hs b/Network/Wai/Application/Classic/RevProxy.hs
--- a/Network/Wai/Application/Classic/RevProxy.hs
+++ b/Network/Wai/Application/Classic/RevProxy.hs
@@ -13,7 +13,6 @@
import qualified Data.ByteString as BS (uncons)
import qualified Data.ByteString.Char8 as BS hiding (uncons)
import Data.Conduit
-import Data.Default.Class
import qualified Network.HTTP.Client as H
import Network.HTTP.Types
import Network.Wai.Application.Classic.Conduit
@@ -54,7 +53,7 @@
----------------------------------------------------------------
reqToHReq :: Request -> RevProxyRoute -> H.Request
-reqToHReq req route = def {
+reqToHReq req route = H.defaultRequest {
H.host = revProxyDomain route
, H.port = revProxyPort route
, H.secure = False -- FIXME: upstream is HTTP only
@@ -66,7 +65,7 @@
, H.proxy = Nothing
-- , H.rawBody = False
, H.decompress = const True
- , H.checkStatus = \_ _ _ -> Nothing -- FIXME
+ , H.checkResponse = \_ _ -> return ()
, H.redirectCount = 0
}
where
diff --git a/test/cgi-bin/broken b/test/cgi-bin/broken
new file mode 100644
--- /dev/null
+++ b/test/cgi-bin/broken
@@ -0,0 +1,3 @@
+#! /bin/sh
+
+cat -
diff --git a/test/cgi-bin/echo-env b/test/cgi-bin/echo-env
new file mode 100644
--- /dev/null
+++ b/test/cgi-bin/echo-env
@@ -0,0 +1,21 @@
+#! /bin/sh
+
+echo "Content-Type: text/plain"
+echo "Status: 200"
+echo ""
+echo "GATEWAY_INTERFACE: $GATEWAY_INTERFACE"
+echo "SCRIPT_NAME: $SCRIPT_NAME"
+echo "REQUEST_METHOD: $REQUEST_METHOD"
+echo "SERVER_NAME: $SERVER_NAME"
+echo "SERVER_PORT: $SERVER_PORT"
+#echo "REMOTE_ADDR: $REMOTE_ADDR"
+echo "SERVER_PROTOCOL: $SERVER_PROTOCOL"
+echo "SERVER_SOFTWARE: $SERVER_SOFTWARE"
+echo "PATH_INFO: $PATH_INFO"
+echo "QUERY_STRING: $QUERY_STRING"
+echo "CONTENT_LENGTH: $CONTENT_LENGTH"
+echo "CONTENT_TYPE: $CONTENT_TYPE"
+echo "HTTP_COOKIE: $HTTP_COOKIE"
+echo ""
+
+cat -
diff --git a/test/data/post b/test/data/post
new file mode 100644
--- /dev/null
+++ b/test/data/post
@@ -0,0 +1,15 @@
+GATEWAY_INTERFACE: CGI/1.1
+SCRIPT_NAME: /cgi-bin/echo-env
+REQUEST_METHOD: POST
+SERVER_NAME: 127.0.0.1
+SERVER_PORT: 2345
+SERVER_PROTOCOL: HTTP/1.1
+SERVER_SOFTWARE: ClassicTester
+PATH_INFO: /pathinfo
+QUERY_STRING: query=foo
+CONTENT_LENGTH: 14
+CONTENT_TYPE: Text/Plain
+HTTP_COOKIE:
+
+foo bar.
+baz!
diff --git a/test/html/index.html b/test/html/index.html
new file mode 100644
--- /dev/null
+++ b/test/html/index.html
@@ -0,0 +1,10 @@
+
+
+
+
+Test
+
+
+Hello World!
+
+
diff --git a/test/html/ja/index.html.ja b/test/html/ja/index.html.ja
new file mode 100644
--- /dev/null
+++ b/test/html/ja/index.html.ja
@@ -0,0 +1,10 @@
+
+
+
+
+てすと
+
+
+こんにちは！
+
+
diff --git a/test/html/no_extension b/test/html/no_extension
new file mode 100644
--- /dev/null
+++ b/test/html/no_extension
@@ -0,0 +1,1 @@
+This is a file without an extension! Hi!
diff --git a/test/html/redirect/index.html b/test/html/redirect/index.html
new file mode 100644
--- /dev/null
+++ b/test/html/redirect/index.html
@@ -0,0 +1,10 @@
+
+
+
+
+Test
+
+
+Hello World!
+
+
diff --git a/wai-app-file-cgi.cabal b/wai-app-file-cgi.cabal
--- a/wai-app-file-cgi.cabal
+++ b/wai-app-file-cgi.cabal
@@ -1,5 +1,5 @@
Name: wai-app-file-cgi
-Version: 3.1.2
+Version: 3.1.3
Author: Kazu Yamamoto
Maintainer: Kazu Yamamoto
License: BSD3
@@ -12,7 +12,13 @@
Category: Web, Yesod
Cabal-Version: >= 1.10
Build-Type: Simple
-
+Extra-Source-Files: test/cgi-bin/broken
+ test/cgi-bin/echo-env
+ test/data/post
+ test/html/index.html
+ test/html/ja/index.html.ja
+ test/html/no_extension
+ test/html/redirect/index.html
Library
Default-Language: Haskell2010
GHC-Options: -Wall
@@ -46,7 +52,7 @@
, data-default-class
, directory
, filepath
- , http-client >= 0.3
+ , http-client >= 0.5
, http-conduit >= 2.1
, http-date
, http-types >= 0.7