diff --git a/src/compiler/api/GF/Server.hs b/src/compiler/api/GF/Server.hs index 342494ed6c..310d06c725 100644 --- a/src/compiler/api/GF/Server.hs +++ b/src/compiler/api/GF/Server.hs @@ -39,10 +39,10 @@ import System.Exit(ExitCode(..)) import GF.Infra.UseIO(readBinaryFile,writeBinaryFile,ePutStrLn) import GF.Infra.SIO(captureSIO) import GF.Data.Utilities(apSnd,mapSnd) -import qualified PGFService as PS import Data.Version(showVersion) import Paths_gf(getDataDir,version) import GF.Infra.BuildInfo (buildInfo) +import GF.Server.PGFService import GF.Server.SimpleEditor.Convert(parseModule) import Control.Monad.IO.Class @@ -53,9 +53,9 @@ server jobs port optroot init execute1 = do state <- newMVar M.empty datadir <- getDataDir let root = maybe (datadir"www") id optroot - cache <- PS.newPGFCache root jobs + cache <- newPGFCache root jobs setDir root - let readNGF = PS.readCachedNGF cache + let readNGF = readCachedNGF cache state0 <- init readNGF http_server (execute1 readNGF) state0 state cache root where @@ -110,15 +110,15 @@ handle logLn documentroot state0 cache execute stateVar conn = do "/gfshell" -> addDate (stateful $ inDir command) "/cloud" -> addDate (stateful $ inDir cloud) "/parse" -> addDate (parse query) - "/version" -> addDate (versionInfo `fmap` PS.listPGFCache cache) - "/flush" -> addDate (PS.flushPGFCache cache >> return (ok200 "flushed")) + "/version" -> addDate (versionInfo `fmap` listPGFCache cache) + "/flush" -> addDate (flushPGFCache cache >> return (ok200 "flushed")) '/':rpath -> -- This code runs without mutual exclusion, so it must *not* -- use/change the cwd. Access files by absolute paths only. let path = translatePath rpath in case (takeDirectory path,takeFileName path,takeExtension path) of - (_ ,_ ,".pgf") -> PS.pgfMain logLn conn cache path rq - (_ ,_ ,".ngf") -> PS.pgfMain logLn conn cache path rq + (_ ,_ ,".pgf") -> pgfMain logLn conn cache path rq + (_ ,_ ,".ngf") -> pgfMain logLn conn cache path rq (dir,"grammars.cgi",_ ) -> addDate (grammarList dir query) _ -> serveStaticFile conn rpath path _ -> addDate (return $ resp400 upath) diff --git a/src/server/Cache.hs b/src/compiler/api/GF/Server/Cache.hs similarity index 96% rename from src/server/Cache.hs rename to src/compiler/api/GF/Server/Cache.hs index 588dd44702..8e0a84465c 100644 --- a/src/server/Cache.hs +++ b/src/compiler/api/GF/Server/Cache.hs @@ -1,5 +1,5 @@ -- | A file cache to avoid reading and parsing the same file many times -module Cache (Cache,newCache,flushCache,expireCache,listCache,readCache,readCache') where +module GF.Server.Cache (Cache,newCache,flushCache,expireCache,listCache,readCache,readCache') where import Control.Concurrent.MVar import Data.Map (Map) diff --git a/src/server/PGFService.hs b/src/compiler/api/GF/Server/PGFService.hs similarity index 98% rename from src/server/PGFService.hs rename to src/compiler/api/GF/Server/PGFService.hs index 41f9799e04..9fe00963c9 100644 --- a/src/server/PGFService.hs +++ b/src/compiler/api/GF/Server/PGFService.hs @@ -1,11 +1,11 @@ {-# LANGUAGE CPP, ScopedTypeVariables #-} -module PGFService(pgfMain, - Caches,newPGFCache,readCachedPGF,readCachedNGF, - flushPGFCache,listPGFCache) where +module GF.Server.PGFService(pgfMain, + Caches,newPGFCache,readCachedPGF,readCachedNGF, + flushPGFCache,listPGFCache) where import PGF2 import PGF2.Transactions -import Cache +import GF.Server.Cache import Data.Time.Format(formatTime) import Data.Time.Format(defaultTimeLocale,rfc822DateFormat) diff --git a/src/server/LICENSE b/src/server/LICENSE deleted file mode 100644 index 5b6e7c66c2..0000000000 --- a/src/server/LICENSE +++ /dev/null @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/src/server/Setup.hs b/src/server/Setup.hs deleted file mode 100644 index 7b7b313754..0000000000 --- a/src/server/Setup.hs +++ /dev/null @@ -1,4 +0,0 @@ -import Distribution.Simple(defaultMain) - -main :: IO () -main = defaultMain diff --git a/src/server/URLEncoding.hs b/src/server/URLEncoding.hs deleted file mode 100644 index 1a8f579b2b..0000000000 --- a/src/server/URLEncoding.hs +++ /dev/null @@ -1,61 +0,0 @@ -module URLEncoding(urlDecodeUnicode,decodeQuery) where - -import Data.Bits (shiftL, (.|.)) -import Data.Char (chr,digitToInt,isHexDigit) - --- | Decode hexadecimal escapes -urlDecodeUnicode :: String -> String -urlDecodeUnicode [] = "" -urlDecodeUnicode ('%':'u':x1:x2:x3:x4:s) - | all isHexDigit [x1,x2,x3,x4] = - chr ( digitToInt x1 `shiftL` 12 - .|. digitToInt x2 `shiftL` 8 - .|. digitToInt x3 `shiftL` 4 - .|. digitToInt x4) : urlDecodeUnicode s -urlDecodeUnicode ('%':x1:x2:s) | isHexDigit x1 && isHexDigit x2 = - chr ( digitToInt x1 `shiftL` 4 - .|. digitToInt x2) : urlDecodeUnicode s -urlDecodeUnicode (c:s) = c : urlDecodeUnicode s - --------------------------------------------------------------------------------- - -type Query = [(String,String)] - --- | Decode application/x-www-form-urlencoded -decodeQuery :: String -> Query -decodeQuery = map (aboth decode . breakAt '=') . chopList (breakAt '&') - -aboth f (x,y) = (f x,f y) - --- | Decode "+" and hexadecimal escapes -decode [] = [] -decode ('%':'u':d1:d2:d3:d4:cs) - | all isHexDigit [d1,d2,d3,d4] = chr(fromhex4 d1 d2 d3 d4):decode cs -decode ('%':d1:d2:cs) - | all isHexDigit [d1,d2] = chr(fromhex2 d1 d2):decode cs -decode ('+':cs) = ' ':decode cs -decode (c:cs) = c:decode cs - -fromhex4 d1 d2 d3 d4 = 256*fromhex2 d1 d2+fromhex2 d3 d4 -fromhex2 d1 d2 = 16*digitToInt d1+digitToInt d2 - - --- From hbc-library ListUtil --------------------------------------------------- - --- Repeatedly extract (and transform) values until a predicate hold. Return the list of values. -unfoldr :: (a -> (b, a)) -> (a -> Bool) -> a -> [b] -unfoldr f p x | p x = [] - | otherwise = y:unfoldr f p x' - where (y, x') = f x - -chopList :: ([a] -> (b, [a])) -> [a] -> [b] -chopList f l = unfoldr f null l - -breakAt :: (Eq a) => a -> [a] -> ([a], [a]) -breakAt _ [] = ([], []) -breakAt x (x':xs) = - if x == x' then - ([], xs) - else - let (ys, zs) = breakAt x xs - in (x':ys, zs) diff --git a/src/server/lighttpd.conf b/src/server/lighttpd.conf deleted file mode 100644 index 13514a2090..0000000000 --- a/src/server/lighttpd.conf +++ /dev/null @@ -1,99 +0,0 @@ -# Run with (with -D for no-daemon) -# /usr/sbin/lighttpd -f lighttpd.conf -D -# - -server.modules = ( - "mod_access", - "mod_fastcgi", - "mod_accesslog", - "mod_redirect", - "mod_cgi" - ) - -var.basedir = var.CWD - -# John: no longer valid after removing `src/ui` 2018-11-15 -server.document-root = basedir + "/../ui/gwt/www" - -server.errorlog = basedir + "/error.log" - -cgi.assign = ( ".cgi" => "" ) -cgi.execute-x-only = "enable" - -index-file.names = ( "index.html" ) - -## set the event-handler (read the performance section in the manual) -# server.event-handler = "freebsd-kqueue" # needed on OS X # Crashes on osx -#server.event-handler = "poll" -server.event-handler = "select" - -# mimetype mapping -mimetype.assign = ( - ".gif" => "image/gif", - ".jpg" => "image/jpeg", - ".jpeg" => "image/jpeg", - ".png" => "image/png", - ".css" => "text/css", - ".html" => "text/html", - ".htm" => "text/html", - ".js" => "text/javascript", - # default mime type - "" => "application/octet-stream", - ) - -accesslog.filename = basedir + "/access.log" - -debug.log-request-header = "disable" -debug.log-response-header = "disable" -debug.log-request-handling = "disable" - -$HTTP["host"] =~ "^(.*)$" { - url.redirect = ( "^/$" => "http://%1/translate/" ) -} - -fastcgi.debug = 0 -fastcgi.server = (".pgf" => - (( - "socket" => basedir + "/" + var.PID + "-pgf.socket", - "bin-path" => basedir + "/dist/build/pgf-service/pgf-fcgi", - # Use 2 OS threads (to be able to use 2 cores). - # Limit heap size to 512 MB. - "bin-environment" => ("GHCRTS" => "-N2 -M512M"), - "min-procs" => 1, - "max-procs" => 1, - "broken-scriptfilename" => "disable", - "check-local" => "disable" - )), - ".fcgi" => - (( - "socket" => basedir + "/" + var.PID + "-morpho.socket", -# "bin-path" => basedir + "/dist/build/morpho-server/morpho-server", - "bin-environment" => ("GHCRTS" => "-M512M"), - "min-procs" => 1, - "max-procs" => 1, - "broken-scriptfilename" => "disable", - "check-local" => "disable" - )) - ) - -## deny access the file-extensions -# -# ~ is for backupfiles from vi, emacs, joe, ... -# .inc is often used for code includes which should in general not be part -# of the document-root -url.access-deny = ( "~", ".inc" ) - -$HTTP["url"] =~ "\.pdf$" { - server.range-requests = "disable" -} - -## -# which extensions should not be handle via static-file transfer -# -# .php, .pl, .fcgi are most often handled by mod_fastcgi or mod_cgi -static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" ) - -######### Options that are good to be but not neccesary to be changed ####### - -## bind to port (default: 80) -server.port = 41296 diff --git a/src/server/pgf-fcgi.hs b/src/server/pgf-fcgi.hs deleted file mode 100644 index 85dd2604db..0000000000 --- a/src/server/pgf-fcgi.hs +++ /dev/null @@ -1,15 +0,0 @@ -{-# LANGUAGE CPP #-} -import Control.Concurrent(forkIO) -import Network.FastCGI - -import PGFService(cgiMain,newPGFCache,stderrToFile,logFile) - -main = do stderrToFile logFile - fcgiMain =<< newPGFCache "" Nothing - -fcgiMain cache = -#ifndef mingw32_HOST_OS - runFastCGIConcurrent' forkIO 100 (cgiMain cache) -#else - runFastCGI (cgiMain cache) -#endif diff --git a/src/server/pgf-service.cabal b/src/server/pgf-service.cabal deleted file mode 100644 index aaf157f004..0000000000 --- a/src/server/pgf-service.cabal +++ /dev/null @@ -1,71 +0,0 @@ -name: pgf-service -version: 1.0 -cabal-version: >= 1.8 -build-type: Simple -license: GPL -license-file: LICENSE -synopsis: CGI library and FastCGI Service for Grammatical Framework - -flag fastcgi - Description: Build library & pgf-fcgi executable with fastcgi support - Default: True - -flag network-uri - description: Get Network.URI from the network-uri package - default: True - -Library - exposed-modules: PGFService - other-modules: Cache - build-depends: base >=4.2, - time, - directory, - filepath, - containers, - process, - pgf2 >= 4.0.0, - http-slim, - mtl, - json >= 0.3.3, - bytestring, - pretty, - random - - if flag(network-uri) - build-depends: network-uri>=2.6, network>=2.6 - else - build-depends: network>=2.3 && <2.6 - - ghc-options: -fwarn-unused-imports - if os(windows) - ghc-options: -optl-mwindows - else - build-depends: unix - -executable pgf-fcgi - main-is: pgf-fcgi.hs - other-modules: URLEncoding Cache CGIUtils PGFService - ghc-options: -threaded -fwarn-unused-imports - if impl(ghc>=7.0) - ghc-options: -rtsopts - if flag(fastcgi) - build-depends: fastcgi >= 3001.0.2.2 - -- Install it in Ubuntu with: apt-get install libghc-fastcgi-dev - else - Buildable: False - build-depends: base >=4.2 && <5, pgf-service, - time, - directory, - filepath, - containers, - process, - pgf2 >= 2, - cgi >= 3001.1.7.3, - exceptions, - json >= 0.3.3, - utf8-string >= 0.3.1.1, - bytestring - if os(windows) - ghc-options: -optl-mwindows - else - build-depends: unix