--- Merging r24884 into '.':

U    rtl/objpas/dateutil.inc
--- Merging r24947 into '.':
U    rtl/objpas/classes/reader.inc
--- Merging r25187 into '.':
U    packages/fcl-net/src/ssockets.pp
--- Merging r25197 into '.':
G    packages/fcl-net/src/ssockets.pp
U    packages/fcl-net/src/fpsock.pp
--- Merging r25198 into '.':
U    rtl/inc/socketsh.inc
--- Merging r25202 into '.':
G    packages/fcl-net/src/fpsock.pp
--- Merging r25204 into '.':
U    packages/fcl-web/src/base/fphttpserver.pp
--- Merging r25205 into '.':
G    packages/fcl-web/src/base/fphttpserver.pp

# revisions: 24884,24947,25187,25197,25198,25202,25204,25205
r24884 | sergei | 2013-06-12 16:33:23 +0200 (Wed, 12 Jun 2013) | 1 line
Changed paths:
   M /trunk/rtl/objpas/dateutil.inc

* Removed redundant assignments to result in UniversalTimeToLocal and LocalTimeToUniversal, Mantis #24582.
r24947 | paul | 2013-06-23 13:18:25 +0200 (Sun, 23 Jun 2013) | 1 line
Changed paths:
   M /trunk/rtl/objpas/classes/reader.inc

rtl: fix loading of long integer values to float properties
r25187 | marco | 2013-07-30 15:38:16 +0200 (Tue, 30 Jul 2013) | 2 lines
Changed paths:
   M /trunk/packages/fcl-net/src/ssockets.pp

 * call closesocket for mswindows instead of fileclose. Probably needs to be checked for Amiga and OS/2 too.
r25197 | hajny | 2013-07-31 02:32:25 +0200 (Wed, 31 Jul 2013) | 1 line
Changed paths:
   M /trunk/packages/fcl-net/src/fpsock.pp
   M /trunk/packages/fcl-net/src/ssockets.pp

  * more complete fix for bug #24802 (use SocketClose instead of FileClose on all platforms)
r25198 | marco | 2013-07-31 09:54:58 +0200 (Wed, 31 Jul 2013) | 2 lines
Changed paths:
   M /trunk/rtl/inc/socketsh.inc

 * old comment removed. closesocket is considered stable now.
r25202 | hajny | 2013-07-31 20:39:41 +0200 (Wed, 31 Jul 2013) | 1 line
Changed paths:
   M /trunk/packages/fcl-net/src/fpsock.pp

  * fix for a typo in previous commit (SocketClose->CloseSocket)
r25204 | michael | 2013-08-02 09:17:36 +0200 (Fri, 02 Aug 2013) | 1 line
Changed paths:
   M /trunk/packages/fcl-web/src/base/fphttpserver.pp

* Fixed bug 28
r25205 | michael | 2013-08-02 09:21:32 +0200 (Fri, 02 Aug 2013) | 1 line
Changed paths:
   M /trunk/packages/fcl-web/src/base/fphttpserver.pp

* Fixed bug #24813

git-svn-id: branches/fixes_2_6@25472 -

packages/fcl-net/src/fpsock.pp

@@ -209,7 +209,7 @@ Const
 
 destructor TSocketStream.Destroy;
 begin
-  FileClose(Handle);
+  CloseSocket(Handle);
   inherited Destroy;
 end;
 

packages/fcl-net/src/ssockets.pp

@@ -246,11 +246,7 @@ end;
 destructor TSocketStream.Destroy;
 begin
   if FSocketInitialized then
-  {$ifdef netware}
   CloseSocket(Handle);
-  {$else}
-  FileClose(Handle);
-  {$endif}
   inherited Destroy;
 end;
 
@@ -340,11 +336,7 @@ Procedure TSocketServer.Close;
 
 begin
   If FSocket<>-1 Then
-    {$ifdef netware}
     CloseSocket(FSocket);
-    {$else}
-    FileClose(FSocket);
-    {$endif}
   FSocket:=-1;
 end;
 

packages/fcl-web/src/base/fphttpserver.pp

@@ -249,11 +249,6 @@ begin
   end;
 end;
 
-procedure HandleRequestError(Sender: TObject; E: Exception);
-begin
-
-end;
-
 procedure TFPHTTPConnectionRequest.InitRequestVars;
 Var
   P : Integer;
@@ -637,8 +632,6 @@ begin
     except
       // Do not let errors in user code escape.
     end
-  else
-    Writeln('Unhandled exception : ',E.ClassName,' : ',E.Message);
 end;
 
 function TFPCustomHttpServer.GetActive: Boolean;

rtl/inc/socketsh.inc

@@ -174,7 +174,7 @@ function  fpgetsockopt  (s:cint; level:cint; optname:cint; optval:pointer; optle
 function  fpsetsockopt  (s:cint; level:cint; optname:cint; optval:pointer; optlen : tsocklen):cint;
 function  fpsocketpair  (d:cint; xtype:cint; protocol:cint; sv:pcint):cint;
 
-Function CloseSocket(Sock:Longint):Longint; // vote is still out on this one
+Function CloseSocket(Sock:Longint):Longint;
 
 {Basic Socket Functions}
 {$ifdef legacysocket}

rtl/objpas/classes/reader.inc

@@ -993,7 +993,7 @@ begin
     ReadValue;
     Result := FDriver.ReadFloat
   end else
-    Result := ReadInteger;
+    Result := ReadInt64;
 end;
 
 function TReader.ReadSingle: Single;

rtl/objpas/dateutil.inc

@@ -2480,13 +2480,12 @@ end;
 function UniversalTimeToLocal(UT: TDateTime; TZOffset : Integer): TDateTime;
 
 begin
-  Result := UT;
   if (TZOffset > 0) then
     Result := UT - EncodeTime(TZOffset div 60, TZOffset mod 60, 0, 0)
-  else if (TZOffset = 0) then
-    Result := UT
   else if (TZOffset < 0) then
-    Result := UT + EncodeTime(Abs(TZOffset) div 60, Abs(TZOffset) mod 60, 0, 0);
+    Result := UT + EncodeTime(Abs(TZOffset) div 60, Abs(TZOffset) mod 60, 0, 0)
+  else
+    Result := UT;
 end;
  
 Function LocalTimeToUniversal(LT: TDateTime): TDateTime;
@@ -2498,13 +2497,12 @@ end;
 Function LocalTimeToUniversal(LT: TDateTime;TZOffset: Integer): TDateTime;
 
 begin
-  Result := LT;
   if (TZOffset > 0) then
     Result := LT + EncodeTime(TZOffset div 60, TZOffset mod 60, 0, 0)
-  else if (TZOffset = 0) then
-    Result := LT
   else if (TZOffset < 0) then
-    Result := LT - EncodeTime(Abs(TZOffset) div 60, Abs(TZOffset) mod 60, 0, 0);
+    Result := LT - EncodeTime(Abs(TZOffset) div 60, Abs(TZOffset) mod 60, 0, 0)
+  else
+    Result := LT;
 end;
 
 {$else}