From 9cf3ba62ff216c43d50feda763ae5ae8c339cdb5 Mon Sep 17 00:00:00 2001
From: watanaby <>
Date: Fri, 14 Dec 2012 09:19:44 +0000
Subject: [PATCH] Ver1.5.25 Fixed small bugs in termination button and page
 movement.

---
 opengate/doc/Changes.html           | 4 ++++
 opengate/javahtml/en/index-ssl.html | 2 +-
 opengate/javahtml/en/index.html     | 4 ++--
 opengate/javahtml/ja/index-ssl.html | 2 +-
 opengate/javahtml/ja/index.html     | 4 ++--
 opengate/opengatesrv/watch-client.c | 7 +++++++
 6 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/opengate/doc/Changes.html b/opengate/doc/Changes.html
index 39e0dc5..4b65dbb 100644
--- a/opengate/doc/Changes.html
+++ b/opengate/doc/Changes.html
@@ -733,6 +733,10 @@ Opengate History</H3>
 	Ver.1.5.24 at 2012.11.29
 	</DT><DD>
 	Modified string at address conversion error in opengatefwd.
+	</DD><DT>
+	Ver.1.5.25 at 2012.12.14
+	</DT><DD>
+	Fixed small bugs in http header and parameter[contributed by M.Tagawa]. 
 	</DD>
 	</DL>
 <P>
diff --git a/opengate/javahtml/en/index-ssl.html b/opengate/javahtml/en/index-ssl.html
index da5449f..ddcc565 100644
--- a/opengate/javahtml/en/index-ssl.html
+++ b/opengate/javahtml/en/index-ssl.html
@@ -12,7 +12,7 @@
 
 <H2>Network User Authentication</H2>
 <hr>
-[<a href="https://%%AUTHCGIURL%%?addr=%%ADDR4%%&lang=ja">Japanese version</a>]
+[<a href="https://%%AUTHCGIURL%%?addr=%%ADDR4%%&lang=ja&redirectedurl=%%REDIRECTEDURL%%">Japanese version</a>]
 <hr SIZE=4 WIDTH="100%">
 
 <P><font size=+1>You are requested to be authenticated 
diff --git a/opengate/javahtml/en/index.html b/opengate/javahtml/en/index.html
index 449981a..82eb5be 100644
--- a/opengate/javahtml/en/index.html
+++ b/opengate/javahtml/en/index.html
@@ -13,7 +13,7 @@
 <H2 align=center>Network User Authentication</H2>
 
 <hr>
-[<a href="http://%%AUTHCGIURL%%?addr=%%ADDR4%%&lang=ja">Japanese version</a>]
+[<a href="http://%%AUTHCGIURL%%?addr=%%ADDR4%%&lang=ja&redirectedurl=%%REDIRECTEDURL%%">Japanese version</a>]
 <hr>
 <div align=center>
 <P><font size=+1>You are requested to be authenticated
@@ -29,7 +29,7 @@ not know your user ID and/or password, please consult CNC.
 Please enter your user ID and password in the box below, then press SEND.
 Please use SSL Authentication as far as possible for security.
 </P>
-<P><A HREF="https://%%AUTHCGIURL%%?addr=%%ADDR4%%&lang=%%LANGUAGE%%">SSL Authentication</A></P>
+<P><A HREF="https://%%AUTHCGIURL%%?addr=%%ADDR4%%&lang=%%LANGUAGE%%&redirectedurl=%%REDIRECTEDURL%%">SSL Authentication</A></P>
 
 <P>
 <FORM METHOD="POST" ACTION="http://%%CGIURL%%">
diff --git a/opengate/javahtml/ja/index-ssl.html b/opengate/javahtml/ja/index-ssl.html
index e21671e..93280b4 100644
--- a/opengate/javahtml/ja/index-ssl.html
+++ b/opengate/javahtml/ja/index-ssl.html
@@ -13,7 +13,7 @@
 
 <H2>ネットワーク利用者認証</H2>
 <hr>
-[<a href="https://%%AUTHCGIURL%%?addr=%%ADDR4%%&lang=en">English version</a>]
+[<a href="https://%%AUTHCGIURL%%?addr=%%ADDR4%%&lang=en&redirectedurl=%%REDIRECTEDURL%%">English version</a>]
 <hr SIZE=4 WIDTH="100%">
 
 <P><font size=+1>ネットワークの利用を始める前に、 利用資格の確認を行ってください。</font></P>
diff --git a/opengate/javahtml/ja/index.html b/opengate/javahtml/ja/index.html
index 7cacbd0..7b74d4e 100644
--- a/opengate/javahtml/ja/index.html
+++ b/opengate/javahtml/ja/index.html
@@ -13,7 +13,7 @@
 
 <H2>ネットワーク利用者認証</H2>
 <hr>
-[<a href="http://%%AUTHCGIURL%%?addr=%%ADDR4%%&lang=en">English version</a>]
+[<a href="http://%%AUTHCGIURL%%?addr=%%ADDR4%%&lang=en&redirectedurl=%%REDIRECTEDURL%%">English version</a>]
 <hr>
 <div align=center>
 
@@ -26,7 +26,7 @@
 パスワードの盗聴を防ぐために、できるだけSSL対応認証を利用して下さい。
 </P>
 
-<P><A HREF="https://%%AUTHCGIURL%%?addr=%%ADDR4%%&lang=%%LANGUAGE%%">
+<P><A HREF="https://%%AUTHCGIURL%%?addr=%%ADDR4%%&lang=%%LANGUAGE%%&redirectedurl=%%REDIRECTEDURL%%">
 SSL対応認証</A></P>
 
 <P>
diff --git a/opengate/opengatesrv/watch-client.c b/opengate/opengatesrv/watch-client.c
index 73a8916..ba024e4 100644
--- a/opengate/opengatesrv/watch-client.c
+++ b/opengate/opengatesrv/watch-client.c
@@ -497,6 +497,13 @@ void getPeerAddr(int sockfd, char *peerAddr)
 /***************************************************/
 void sendTerminateReply(void)
 {
+  /* send HTTP headers */
+  Writefmt(connfd,"HTTP/1.1 200 OK\r\n");
+  Writefmt(connfd,"Connection: Close\r\n");
+  Writefmt(connfd,"Content-Type: text/html\r\n");
+  Writefmt(connfd,"Content-Length: 92\r\n");
+  Writefmt(connfd,"\r\n");
+  
   Writefmt(connfd,"<META HTTP-EQUIV=Pragma CONTENT=no-cache>");
   Writefmt(connfd,"<HTML><BODY> Network is closed. </BODY></HTML> \r\n\r\n");
   Close(connfd);
-- 
2.11.0