From 387ac3c3f83d8fbd7d2d8d38ac22b94b1e6b8403 Mon Sep 17 00:00:00 2001
From: mysticbbs <mysticbbs@gmail.com>
Date: Sat, 11 May 2013 23:20:19 -0400
Subject: [PATCH] Initial A34 import

---
 mystic/bbs_msgbase.pas    | 2 ++
 mystic/mis_client_ftp.pas | 6 +++---
 mystic/mis_server.pas     | 2 +-
 mystic/records.pas        | 2 +-
 mystic/whatsnew.txt       | 9 +++++++++
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/mystic/bbs_msgbase.pas b/mystic/bbs_msgbase.pas
index 908d38c..5ffdc12 100644
--- a/mystic/bbs_msgbase.pas
+++ b/mystic/bbs_msgbase.pas
@@ -3242,6 +3242,8 @@ Var
 
       If Not Found Then
         MsgBase^.SetLastRead(Session.User.UserNum, MsgBase^.GetHighMsgNum);
+
+      MsgBase^.CloseMsgBase;
     End;
 
     Dispose (MsgBase, Done);
diff --git a/mystic/mis_client_ftp.pas b/mystic/mis_client_ftp.pas
index 7859e68..47ddd5a 100644
--- a/mystic/mis_client_ftp.pas
+++ b/mystic/mis_client_ftp.pas
@@ -284,7 +284,7 @@ Begin
 
     WaitSock.WaitInit(bbsConfig.inetInterface, DataPort);
 
-    DataSocket := WaitSock.WaitConnection;
+    DataSocket := WaitSock.WaitConnection(10000);
 
     If Not Assigned(DataSocket) Then Begin
       WaitSock.Free;
@@ -467,7 +467,7 @@ Begin
 
     {$IFDEF FTPDEBUG} LOG('PASV Wait'); {$ENDIF}
 
-    DataSocket := WaitSock.WaitConnection;
+    DataSocket := WaitSock.WaitConnection(10000);
 
     {$IFDEF FTPDEBUG} LOG('PASV WaitDone'); {$ENDIF}
 
@@ -771,7 +771,7 @@ Begin
 
       WaitSock.WaitInit(bbsConfig.inetInterface, DataPort);
 
-      DataSocket := WaitSock.WaitConnection;
+      DataSocket := WaitSock.WaitConnection(10000);
 
       If Not Assigned(DataSocket) Then Begin
         WaitSock.Free;
diff --git a/mystic/mis_server.pas b/mystic/mis_server.pas
index 4bb947a..2a9caa2 100644
--- a/mystic/mis_server.pas
+++ b/mystic/mis_server.pas
@@ -211,7 +211,7 @@ Begin
   Status('Opening server socket on port ' + strI2S(Port));
 
   Repeat
-    NewClient := Server.WaitConnection;
+    NewClient := Server.WaitConnection(0);
 
     If NewClient = NIL Then Break; // time to shutdown the server...
 
diff --git a/mystic/records.pas b/mystic/records.pas
index 80c15cd..03a4f12 100644
--- a/mystic/records.pas
+++ b/mystic/records.pas
@@ -23,7 +23,7 @@
 Const
   mysSoftwareID  = 'Mystic BBS';
   mysCopyYear    = '1997-2013';                                 // its been a long time!
-  mysVersion     = '1.10 A33';                                  // current version
+  mysVersion     = '1.10 A34';                                  // current version
   mysDataChanged = '1.10 A11';                                  // version of last records change
 
   {$IFDEF WIN32}
diff --git a/mystic/whatsnew.txt b/mystic/whatsnew.txt
index 6117138..b3c4fef 100644
--- a/mystic/whatsnew.txt
+++ b/mystic/whatsnew.txt
@@ -3363,3 +3363,12 @@
    for your telnet server.
 
    <ALPHA 33 RELEASED>
+
+ ! Mystic was not properly closing some files when resetting the message
+   base new scan pointer date.
+
+ ! The FTP server will now gracefully handle data session timeouts (after
+   10 seconds) which should prevent FTP ghost users when there is a firewall
+   or network adapter configuration issue.
+
+   <ALPHA 34 RELEASED>