Ver.1.5.12: Fixed error on reconnecting.

diff --git a/opengate/doc/Changes.html b/opengate/doc/Changes.html
index 9ca64e1..f49b7bb 100644 (file)
--- a/opengate/doc/Changes.html
+++ b/opengate/doc/Changes.html
@@ -679,6 +679,10 @@ Opengate History</H3>
        Ver.1.5.11 at 2011.5.27
        </DT><DD>
         Fixed error on requesting favicon [contributed by S.Horikawa]. 
+       </DD><DT>
+       Ver.1.5.12 at 2011.6.16
+       </DT><DD>
+        Fixed error on reconnecting [contributed by S.Horikawa]. 
        </DD>
        </DL>
 <P>

diff --git a/opengate/opengatesrv/watch-client.c b/opengate/opengatesrv/watch-client.c
index f5745e0..fb2e5a6 100644 (file)
--- a/opengate/opengatesrv/watch-client.c
+++ b/opengate/opengatesrv/watch-client.c
@@ -602,11 +602,16 @@ void acceptHttpReConnect(void){
   /* connection wait */
   connfd = SelectAccept();
 
-  if(connfd<0) connectMode=ENDCONNECT; /* timeout or abnormal */
-  else         connectMode=HTTPCONNECT; /* reconnected */
-
   /* receive request */
   RemoveAlarm("ReadWaitAlarm");
+
+  if(connfd<0){  /* timeout or abnormal */
+    connectMode=ENDCONNECT;
+  }else{         /* reconnected */
+    connectMode=HTTPCONNECT;
+    RemoveAlarm("CheckHttpAlarm");
+    AddAlarm("CheckHttpAlarm", alarmArg.checkInterval, FALSE, OnCheckHttpAlarm);
+  }
 }
 
 /*****************************************************************/