GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-24 03:52:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Bug fix: add missing error handler for statically served files in pgf-server HTTP mode

Browse Source
This commit is contained in:
hallgren
2010-09-02 13:54:16 +00:00
parent 2a4661d054
commit c234222cd9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/server/PGFService.hs
View File

@@ -49,6 +49,7 @@ httpMain cache port = runHTTP port (do log ; serve =<< getPath)
logCGI $ method++" "++uri logCGI $ method++" "++uri
serve path = serve path =
handleErrors . handleCGIErrors $
if takeExtension path==".pgf" if takeExtension path==".pgf"
then cgiMain' cache path then cgiMain' cache path
else if takeFileName path=="grammars.cgi" else if takeFileName path=="grammars.cgi"
@@ -71,11 +72,11 @@ fcgiMain cache =
getPath = getVarWithDefault "SCRIPT_FILENAME" "" getPath = getVarWithDefault "SCRIPT_FILENAME" ""
cgiMain :: Cache PGF -> CGI CGIResult cgiMain :: Cache PGF -> CGI CGIResult
cgiMain cache = cgiMain' cache =<< getPath cgiMain cache = handleErrors . handleCGIErrors $
cgiMain' cache =<< getPath
cgiMain' :: Cache PGF -> FilePath -> CGI CGIResult cgiMain' :: Cache PGF -> FilePath -> CGI CGIResult
cgiMain' cache path = cgiMain' cache path =
handleErrors . handleCGIErrors $
do pgf <- liftIO $ readCache cache path do pgf <- liftIO $ readCache cache path
command <- liftM (maybe "grammar" (urlDecodeUnicode . UTF8.decodeString)) (getInput "command") command <- liftM (maybe "grammar" (urlDecodeUnicode . UTF8.decodeString)) (getInput "command")
pgfMain pgf command pgfMain pgf command