From 9f8fcf5d38da540994203aebb5a575681267cf28 Mon Sep 17 00:00:00 2001 From: mattias Date: Fri, 2 Nov 2018 22:16:36 +0000 Subject: [PATCH] demo: fixed restserver on darwin --- demo/fcldb/restserver.pas | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/demo/fcldb/restserver.pas b/demo/fcldb/restserver.pas index a4251f7..4f0967d 100644 --- a/demo/fcldb/restserver.pas +++ b/demo/fcldb/restserver.pas @@ -2,6 +2,10 @@ program restserver; uses sysutils,custhttpapp, fpwebfile, httproute, restdata; +{$IF FPC_FULLVERSION<30101} + {$ERROR You need at least fpc 3.1.1} +{$ENDIF} + Type { THTTPApplication } @@ -63,9 +67,13 @@ begin if D='' then D:=GetCurrentDir; Log(etInfo,'Listening on port %d, serving files from directory: %s',[Port,D]); -{$ifdef unix} - MimeTypesFile:='/etc/mime.types'; -{$endif} + {$IFDEF darwin} + MimeTypesFile:='/private/etc/apache2/mime.types'; + {$else} + {$ifdef unix} + MimeTypesFile:='/etc/mime.types'; + {$endif} + {$endif} TSimpleFileModule.BaseDir:=IncludeTrailingPathDelimiter(D); TSimpleFileModule.OnLog:=@Log; If not HasOption('n','noindexpage') then