@@ -19,13 +19,12 @@ safeRead d s = case reads s of
1919
2020cgiToApp :: CGI CGIResult -> Application
2121cgiToApp cgi env = do
22− let vars = http env
22+ let vars = map (first fixVarName) (http env)++ getCgiVars env
2323 input = hackInput env
2424 (inputs, body') = decodeInput vars input
2525 req = CGIRequest
26− { cgiVars = Map.fromList $ map (first fixVarName) vars
27− ++ getCgiVars env
28− , cgiInputs = inputs
26+ { cgiVars = Map.fromList $ vars
27+ , cgiInputs = inputs
2928 , cgiRequestBody = body'
3029 }
3130 (headers'', output') <- runCGIT cgi req