OSDN > Developer > ycjing90 > Chambre > opengate > Commit

opengate
Fork

Commit

Ver1.5.25 Fixed small bugs in termination button and page movement.

--- a/opengate/doc/Changes.html

+++ b/opengate/doc/Changes.html

		@@ -733,6 +733,10 @@ Opengate History</H3>
733	733	Ver.1.5.24 at 2012.11.29
734	734	</DT><DD>
735	735	Modified string at address conversion error in opengatefwd.
	736	+ </DD><DT>
	737	+ Ver.1.5.25 at 2012.12.14
	738	+ </DT><DD>
	739	+ Fixed small bugs in http header and parameter[contributed by M.Tagawa].
736	740	</DD>
737	741	</DL>
738	742	<P>

--- a/opengate/javahtml/en/index-ssl.html

+++ b/opengate/javahtml/en/index-ssl.html

		@@ -12,7 +12,7 @@
12	12
13	13	<H2>Network User Authentication</H2>
14	14	<hr>
15		-[<a href="https://%%AUTHCGIURL%%?addr=%%ADDR4%%&lang=ja">Japanese version</a>]
	15	+[<a href="https://%%AUTHCGIURL%%?addr=%%ADDR4%%&lang=ja&redirectedurl=%%REDIRECTEDURL%%">Japanese version</a>]
16	16	<hr SIZE=4 WIDTH="100%">
17	17
18	18	<P><font size=+1>You are requested to be authenticated

--- a/opengate/javahtml/en/index.html

+++ b/opengate/javahtml/en/index.html

		@@ -13,7 +13,7 @@
13	13	<H2 align=center>Network User Authentication</H2>
14	14
15	15	<hr>
16		-[<a href="http://%%AUTHCGIURL%%?addr=%%ADDR4%%&lang=ja">Japanese version</a>]
	16	+[<a href="http://%%AUTHCGIURL%%?addr=%%ADDR4%%&lang=ja&redirectedurl=%%REDIRECTEDURL%%">Japanese version</a>]
17	17	<hr>
18	18	<div align=center>
19	19	<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.
29	29	Please enter your user ID and password in the box below, then press SEND.
30	30	Please use SSL Authentication as far as possible for security.
31	31	</P>
32		-<P><A HREF="https://%%AUTHCGIURL%%?addr=%%ADDR4%%&lang=%%LANGUAGE%%">SSL Authentication</A></P>
	32	+<P><A HREF="https://%%AUTHCGIURL%%?addr=%%ADDR4%%&lang=%%LANGUAGE%%&redirectedurl=%%REDIRECTEDURL%%">SSL Authentication</A></P>
33	33
34	34	<P>
35	35	<FORM METHOD="POST" ACTION="http://%%CGIURL%%">

--- a/opengate/javahtml/ja/index-ssl.html

+++ b/opengate/javahtml/ja/index-ssl.html

		@@ -13,7 +13,7 @@
13	13
14	14	<H2>ネットワーク利用者認証</H2>
15	15	<hr>
16		-[<a href="https://%%AUTHCGIURL%%?addr=%%ADDR4%%&lang=en">English version</a>]
	16	+[<a href="https://%%AUTHCGIURL%%?addr=%%ADDR4%%&lang=en&redirectedurl=%%REDIRECTEDURL%%">English version</a>]
17	17	<hr SIZE=4 WIDTH="100%">
18	18
19	19	<P><font size=+1>ネットワークの利用を始める前に、利用資格の確認を行ってください。</font></P>

--- a/opengate/javahtml/ja/index.html

+++ b/opengate/javahtml/ja/index.html

		@@ -13,7 +13,7 @@
13	13
14	14	<H2>ネットワーク利用者認証</H2>
15	15	<hr>
16		-[<a href="http://%%AUTHCGIURL%%?addr=%%ADDR4%%&lang=en">English version</a>]
	16	+[<a href="http://%%AUTHCGIURL%%?addr=%%ADDR4%%&lang=en&redirectedurl=%%REDIRECTEDURL%%">English version</a>]
17	17	<hr>
18	18	<div align=center>
19	19

		@@ -26,7 +26,7 @@
26	26	パスワードの盗聴を防ぐために、できるだけSSL対応認証を利用して下さい。
27	27	</P>
28	28
29		-<P><A HREF="https://%%AUTHCGIURL%%?addr=%%ADDR4%%&lang=%%LANGUAGE%%">
	29	+<P><A HREF="https://%%AUTHCGIURL%%?addr=%%ADDR4%%&lang=%%LANGUAGE%%&redirectedurl=%%REDIRECTEDURL%%">
30	30	SSL対応認証</A></P>
31	31
32	32	<P>

--- a/opengate/opengatesrv/watch-client.c

+++ b/opengate/opengatesrv/watch-client.c

		@@ -497,6 +497,13 @@ void getPeerAddr(int sockfd, char *peerAddr)
497	497	/***************************************************/
498	498	void sendTerminateReply(void)
499	499	{
	500	+ /* send HTTP headers */
	501	+ Writefmt(connfd,"HTTP/1.1 200 OK\r\n");
	502	+ Writefmt(connfd,"Connection: Close\r\n");
	503	+ Writefmt(connfd,"Content-Type: text/html\r\n");
	504	+ Writefmt(connfd,"Content-Length: 92\r\n");
	505	+ Writefmt(connfd,"\r\n");
	506	+
500	507	Writefmt(connfd,"<META HTTP-EQUIV=Pragma CONTENT=no-cache>");
501	508	Writefmt(connfd,"<HTML><BODY> Network is closed. </BODY></HTML> \r\n\r\n");
502	509	Close(connfd);