diff --git a/packages/fcl-web/src/base/fphttpserver.pp b/packages/fcl-web/src/base/fphttpserver.pp
index ed4ee068c3..a9f100b26e 100644
--- a/packages/fcl-web/src/base/fphttpserver.pp
+++ b/packages/fcl-web/src/base/fphttpserver.pp
@@ -569,7 +569,7 @@ begin
   Try
     if FSetupSocket then
       begin
-      SetupSocket;
+    SetupSocket;
       FSetupSocket:=False;
       end;
     // Read headers.
@@ -644,8 +644,8 @@ begin
         and not Connection.Socket.CanRead(Connection.KeepAliveTimeout) then
           break;
 
-        FConnection.HandleRequest;
-      until not (Terminated and FConnection.EnableKeepAlive and FConnection.KeepAlive and (FConnection.Socket.LastError=0));
+      FConnection.HandleRequest;
+      until not (not Terminated and FConnection.EnableKeepAlive and FConnection.KeepAlive and (FConnection.Socket.LastError=0));
     finally
       FreeAndNil(FConnection);
       if Assigned(FThreadList) then
@@ -973,7 +973,7 @@ begin
     try
       for I:= ThreadList.Count-1 downto 0 do
         try
-          CloseSocket(TFPHTTPConnectionThread(ThreadList[I]).Connection.Socket.Handle);
+        CloseSocket(TFPHTTPConnectionThread(ThreadList[I]).Connection.Socket.Handle);
         except
           // ignore exceptions during CloseSocket
         end