msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

gf -server: fix a redirection bug...

Browse Source 
...that was introduced with the recent changes to the handling of the
current working directory
This commit is contained in:
hallgren
2014-01-27 16:30:03 +00:00
parent fbcb66fd19
commit 1d251b2395
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/compiler/GFServer.hs
View File

@@ -154,7 +154,7 @@ handle documentroot state0 cache execute1 stateVar
wrapCGI $ PS.cgiMain' cache path wrapCGI $ PS.cgiMain' cache path
(dir,"grammars.cgi",_ ) -> grammarList dir (decoded qs) (dir,"grammars.cgi",_ ) -> grammarList dir (decoded qs)
(dir ,"exb.fcgi" ,_ ) -> wrapCGI $ ES.cgiMain' root dir (fst cache) (dir ,"exb.fcgi" ,_ ) -> wrapCGI $ ES.cgiMain' root dir (fst cache)
_ -> serveStaticFile path _ -> serveStaticFile rpath path
where path = translatePath rpath where path = translatePath rpath
_ -> return $ resp400 upath _ -> return $ resp400 upath
@@ -262,7 +262,7 @@ handle documentroot state0 cache execute1 stateVar
else err $ resp404 path else err $ resp404 path
rm path = err $ resp400 $ "unacceptable extension "++path rm path = err $ resp400 $ "unacceptable extension "++path
download path = liftIO $ serveStaticFile path download path = liftIO $ serveStaticFile' path
link_directories olddir newdir@('/':'t':'m':'p':'/':_) | old/=new = link_directories olddir newdir@('/':'t':'m':'p':'/':_) | old/=new =
hmInDir ".." $ liftIO $ hmInDir ".." $ liftIO $
@@ -315,13 +315,13 @@ jsonresult cwd dir cmd (ecode,stdout,stderr) files =
-- * Static content -- * Static content
serveStaticFile path = serveStaticFile rpath path =
do --logPutStrLn $ "Serving static file "++path do --logPutStrLn $ "Serving static file "++path
b <- doesDirectoryExist path b <- doesDirectoryExist path
if b if b
then if path `elem` ["","."] || last path=='/' then if rpath `elem` ["","."] || last path=='/'
then serveStaticFile' (path </> "index.html") then serveStaticFile' (path </> "index.html")
else return (resp301 (path++"/")) else return (resp301 ('/':rpath++"/"))
else serveStaticFile' path else serveStaticFile' path
serveStaticFile' path = serveStaticFile' path =