OSDN Git Service

(root) / opengate / opengate.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: dafed11)
Ver.1.4.17: Refine the bug fix of favicon.ico error.
authorwatanaby <>
Tue, 17 Apr 2007 10:21:13 +0000 (10:21 +0000)
committerwatanaby <>
Tue, 17 Apr 2007 10:21:13 +0000 (10:21 +0000)
opengate/conf/opengatesrv.conf.sample patch | blob | history
opengate/doc/Changes.html patch | blob | history
opengate/javahtml/en/httpkeep.html patch | blob | history
opengate/javahtml/httpkeep.js patch | blob | history
opengate/javahtml/ja/httpkeep.html patch | blob | history
opengate/opengatesrv/get-param.c patch | blob | history
opengate/opengatesrv/utilities.c patch | blob | history
opengate/opengatesrv/watch-client.c patch | blob | history

diff --git a/opengate/conf/opengatesrv.conf.sample b/opengate/conf/opengatesrv.conf.sample
index e63b62a..4b2b05a 100644 (file)
--- a/opengate/conf/opengatesrv.conf.sample
+++ b/opengate/conf/opengatesrv.conf.sample
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<Opengate ConfigVersion="1.4.16">
+<Opengate ConfigVersion="1.4.11">
 
 <!-- ################################################# 
 #    ####### NEED TO MODIFY FOLLOWING PARAMETERS #####  -->
@@ -93,13 +93,13 @@
        </ListenPort>
 
        <!-- communication reply timeout(second) -->
-       <CommWaitTimeout>30</CommWaitTimeout>
+       <CommWaitTimeout>10</CommWaitTimeout>
 
        <!-- Java connection timeout(second) -->
        <JavaWaitTimeout>600</JavaWaitTimeout>
 
        <!-- http reconnect timeout(second) -->
-       <ReconnectTimeout>30</ReconnectTimeout>
+       <ReconnectTimeout>10</ReconnectTimeout>
 
        <!-- ipfw exclusive exec lock timeout (second) -->
        <LockTimeout>10</LockTimeout>
diff --git a/opengate/doc/Changes.html b/opengate/doc/Changes.html
index 8fe0dac..9d2005b 100644 (file)
--- a/opengate/doc/Changes.html
+++ b/opengate/doc/Changes.html
@@ -559,10 +559,15 @@ Ver.1.4.15 at 2007.3.22</DT>
 Fix bug at dumping micro-second time information. \r
 </DD>\r
 <DT>\r
-Ver.1.4.16 at 2007.4.15</DT>\r
+Ver.1.4.16 at 2007.4.16</DT>\r
 <DD>\r
 Fix bug for delayed favicon.ico request occured on Vista PC and others.\r
 </DD>\r
+<DT>\r
+Ver.1.4.17 at 2007.4.17</DT>\r
+<DD>\r
+Refine the bug fix of favicon.ico error.\r
+</DD>\r
 \r
 </DL>\r
 <b>Please see CVS in SourceForge.net to check the file difference between versions.</b>\r
diff --git a/opengate/javahtml/en/httpkeep.html b/opengate/javahtml/en/httpkeep.html
index 022ea72..e2c539e 100644 (file)
--- a/opengate/javahtml/en/httpkeep.html
+++ b/opengate/javahtml/en/httpkeep.html
@@ -1,5 +1,7 @@
 <html>
 <head>
+<link rel="shortcut icon" href="http://%%OPENGATESERVERNAME%%/favicon.ico" type="image/x-icon">
+<link rel="icon" href="http://%%OPENGATESERVERNAME%%/favicon.ico" type="image/x-icon">
 <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <META HTTP-EQUIV="Pragma" CONTENT="no-cache">
 <title>Http Keep-Alive</title>
diff --git a/opengate/javahtml/httpkeep.js b/opengate/javahtml/httpkeep.js
index 43a0fc6..33e4e28 100644 (file)
--- a/opengate/javahtml/httpkeep.js
+++ b/opengate/javahtml/httpkeep.js
@@ -5,7 +5,6 @@ var httpObj;
 var nextKey;
 var nowKey;
 var sessionId;
-var initial;
 
 function createXMLHttpRequest() {
   try { return new ActiveXObject("Msxml2.XMLHTTP");    } catch(e) {}
@@ -46,14 +45,7 @@ function displayResponse()
         hh=today.getHours();  mm=today.getMinutes();
         if(hh<10)hh='0'+hh;   if(mm<10)mm='0'+mm;
         document.getElementById("dispmsg").innerHTML = hh+':'+mm;
-        if(httpObj.responseText=="hello"){
-          if(initial==1){
-            setTimeout('sendHello()',10000); 
-            initial=0;
-          }else{
-            sendHello();
-          }
-        }
+        if(httpObj.responseText=="hello") sendHello();
       }else{
         document.getElementById("dispmsg").innerHTML = "Error!";
       }
@@ -72,9 +64,8 @@ function initHttpkeep(urlArg, appletArg, sid)
   sessionId=sid;
   rand=Math.random();
   nextKey=hex_md5(String(rand));
-  initial=1;
 
-  // send hello 
+  // set timeout and send hello 
   sendHello();
 }
 //-->
diff --git a/opengate/javahtml/ja/httpkeep.html b/opengate/javahtml/ja/httpkeep.html
index 999107e..c788610 100644 (file)
--- a/opengate/javahtml/ja/httpkeep.html
+++ b/opengate/javahtml/ja/httpkeep.html
@@ -1,5 +1,7 @@
 <html>
 <head>
+<link rel="shortcut icon" href="http://%%OPENGATESERVERNAME%%/favicon.ico" type="image/x-icon">
+<link rel="icon" href="http://%%OPENGATESERVERNAME%%/favicon.ico" type="image/x-icon">
 <meta http-equiv="Content-Type" content="text/html;charset=iso-2022-jp">
 <META HTTP-EQUIV="Pragma" CONTENT="no-cache">
 <title>Http Keep-Alive</title>
diff --git a/opengate/opengatesrv/get-param.c b/opengate/opengatesrv/get-param.c
index 15c9e20..2459c7f 100644 (file)
--- a/opengate/opengatesrv/get-param.c
+++ b/opengate/opengatesrv/get-param.c
@@ -28,7 +28,7 @@ Programmed by Yoshiaki WATANABE
 #include "opengatesrv.h"
 #include "../ezxml/ezxml.h"
 
-#define CONFIG_VERSION "1.4.16"
+#define CONFIG_VERSION "1.4.11"
 #define SEPARATOR "/"
 
 int debug=0;
diff --git a/opengate/opengatesrv/utilities.c b/opengate/opengatesrv/utilities.c
index 804c631..c7118c8 100644 (file)
--- a/opengate/opengatesrv/utilities.c
+++ b/opengate/opengatesrv/utilities.c
@@ -114,7 +114,6 @@ readln(int fd, void *vptr, size_t maxlen)
   }
   /* null terminate string */  
   *ptr++ = 0;
-
   return(n);
 }
 
diff --git a/opengate/opengatesrv/watch-client.c b/opengate/opengatesrv/watch-client.c
index 34b025b..d234fe2 100644 (file)
--- a/opengate/opengatesrv/watch-client.c
+++ b/opengate/opengatesrv/watch-client.c
@@ -674,7 +674,6 @@ void waitHttpClose(struct clientAddr *pClientAddr, char *userid, char *userPrope
        SendHttpNotFound();
       }
     }
-
     else{
       /*abnormal read */
       /* some alarm is ringed or connecion is closed */
@@ -873,6 +872,7 @@ void sendHttpKeepPage(char *userid, char *sessionId, char *language, int port)
 {
   char buff[BUFFMAXLN];             /* read in buffer */
   FILE *fp;
+  char opengateServerName[BUFFMAXLN];
   char httpKeepDoc[BUFFMAXLN];
   char httpHelloUrl[BUFFMAXLN];
   char terminateUrl[BUFFMAXLN];
@@ -885,6 +885,10 @@ void sendHttpKeepPage(char *userid, char *sessionId, char *language, int port)
   char portStr[WORDMAXLN];
 
 
+  /* create opengate server name string */
+  snprintf(opengateServerName, BUFFMAXLN, 
+          "%s",GetConfValue("OpengateServerName"));
+
   /* create path to accept2 doc */
   snprintf(acceptDoc2Url, BUFFMAXLN, 
          "http://%s%s/%s/%s",GetConfValue("OpengateServerName"),
@@ -942,6 +946,7 @@ void sendHttpKeepPage(char *userid, char *sessionId, char *language, int port)
     }
 
     /* replace mark */
+    htmlReplace(buff, "%%OPENGATESERVERNAME%%", opengateServerName);
     htmlReplace(buff, "%%HTTPHELLOURL%%", httpHelloUrl);
     htmlReplace(buff, "%%USERID%%", userid);
     htmlReplace(buff, "%%SESSIONID%%", sessionId);
@@ -1178,9 +1183,10 @@ void SendHttpReply(char *reply){
 }
 
 
-
 void SendHttpNotFound(void){
   if(debug>1) err_msg("DEBUG:=>sendHttpNotFound()");
   sendHttpNotFound();
   if(debug>1) err_msg("DEBUG:<=sendHttpNotFound()");
 }
+
+
Opengate Source Repository
About OSDN
Find Software
Develop Software
Help