Tera TermRevision: 8052
https://osdn.net/projects/ttssh2/scm/svn/commits/8052
Author: yutakapon
Date: 2019-08-31 18:01:49 +0900 (Sat, 31 Aug 2019)
Log Message:
-----------
HTTPプロキシ接続がエラーとなり、ステータスコードが400,401,403,405,406,407以外だった場合、
メッセージボックスにゴミが表示される問題を修正した。
branches/ttproxy_improvedからリビジョン8041をマージ:
branches/ttssh_improvedからリビジョン8040をマージ:
HTTPプロキシ接続がエラーとなり、ステータスコードが401,407,400,405,406,403以外だった場合、
メッセージボックスにゴミが表示される問題を修正した。
........
........
Modified Paths:
--------------
trunk/TTProxy/ProxyWSockHook.h
trunk/doc/en/html/about/history.html
trunk/doc/ja/html/about/history.html
Property Changed:
----------------
trunk/
trunk/TTProxy/
-------------- next part --------------
Index: trunk
===================================================================
--- trunk 2019-08-31 08:29:39 UTC (rev 8051)
+++ trunk 2019-08-31 09:01:49 UTC (rev 8052)
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -3,5 +3,7 ##
/branches/openssl_1_1_1_v2:7888
/branches/portfwd_memleak:7732,7736-7737,7764
/branches/ssh_ed25519:5495-5544
+/branches/ttproxy_improved:8041
+/branches/ttssh_improved:8040
/branches/vs2015_warn:6194-6285
/tags/teraterm-4_89:6182
\ No newline at end of property
Index: trunk/TTProxy
===================================================================
--- trunk/TTProxy 2019-08-31 08:29:39 UTC (rev 8051)
+++ trunk/TTProxy 2019-08-31 09:01:49 UTC (rev 8052)
Property changes on: trunk/TTProxy
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1,3 ##
+/branches/ttproxy_improved/TTProxy:8041
+/branches/ttssh_improved/TTProxy:8040
/branches/vs2015_warn/TTProxy:6194-6285
\ No newline at end of property
Modified: trunk/TTProxy/ProxyWSockHook.h
===================================================================
--- trunk/TTProxy/ProxyWSockHook.h 2019-08-31 08:29:39 UTC (rev 8051)
+++ trunk/TTProxy/ProxyWSockHook.h 2019-08-31 09:01:49 UTC (rev 8052)
@@ -1363,7 +1363,9 @@
}
} while (strcmp(buf,"\r\n") != 0);
if (status_code != 200) {
- char uimsg[MAX_UIMSG];
+ char uimsg[MAX_UIMSG] = {0};
+ char tmp[MAX_UIMSG + 32];
+
switch (status_code) {
case 401:
case 407:
@@ -1374,8 +1376,13 @@
case 405:
case 406:
case 403:
- UTIL_get_lang_msg("MSG_PROXY_BAD_REQUEST", uimsg, sizeof(uimsg),
+ // \x8AY\x93\x96\x82\xB5\x82Ȃ\xA2\x83X\x83e\x81[\x83^\x83X\x83R\x81[\x83h\x82\xBE\x82\xC1\x82\xBD\x8Fꍇ\x81A\x95s\x92\xE8\x82ȓ\xE0\x97e\x82\xCCuimsg[]\x82\xAA
+ // MessageBox\x82ɕ\\x8E\xA6\x82\xB3\x82\xEA\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B
+ default:
+ UTIL_get_lang_msg("MSG_PROXY_BAD_REQUEST", tmp, sizeof(tmp),
"Proxy prevent this connection!");
+ _snprintf_s(uimsg, sizeof(uimsg), _TRUNCATE, "%s(HTTP: status code %d)",
+ tmp, status_code);
break;
}
return setError(s, uimsg);
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2019-08-31 08:29:39 UTC (rev 8051)
+++ trunk/doc/en/html/about/history.html 2019-08-31 09:01:49 UTC (rev 8052)
@@ -50,7 +50,7 @@
<li>Misc
<ul>
- <li></li>
+ <li>upgraded TTProxy to <a href="#ttproxy_1.0.0.26">1.0.0.26</a>.</li>
</ul>
</li>
</ul>
@@ -4817,6 +4817,21 @@
<h2 id="ttproxy">TTProxy</h2>
+<h3 id="ttproxy_1.0.0.26">2019.xx.xx (Ver 1.0.0.26)</h3>
+<ul class="history">
+ <li>Changes
+ <ul>
+ <li></li>
+ </ul>
+ </li>
+
+ <li>Bug fixes
+ <ul>
+ <li>When the HTTP proxy connection fails and the status code is other than 400,401,403,405,406,407, invalid string are shown in the message box.</li>
+ </ul>
+ </li>
+</ul>
+
<h3 id="ttproxy_1.0.0.25">2019.08.31 (Ver 1.0.0.25)</h3>
<ul class="history">
<li>Changes
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2019-08-31 08:29:39 UTC (rev 8051)
+++ trunk/doc/ja/html/about/history.html 2019-08-31 09:01:49 UTC (rev 8052)
@@ -51,7 +51,7 @@
<li>\x82\xBB\x82̑\xBC
<ul>
- <li></li>
+ <li><a href="#ttproxy_1.0.0.26">TTProxy(1.0.0.26)</a>\x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD\x81B</li>
</ul>
</li>
</ul>
@@ -4823,6 +4823,21 @@
<h2 id="ttproxy">TTProxy</h2>
+<h3 id="ttproxy_1.0.0.26">2019.xx.xx (Ver 1.0.0.26)</h3>
+<ul class="history">
+ <li>\x95ύX
+ <ul>
+ <li></li>
+ </ul>
+ </li>
+
+ <li>\x83o\x83O\x8FC\x90\xB3
+ <ul>
+ <li>HTTP\x83v\x83\x8D\x83L\x83V\x90ڑ\xB1\x82\xAA\x83G\x83\x89\x81[\x82ƂȂ\xE8\x81A\x83X\x83e\x81[\x83^\x83X\x83R\x81[\x83h\x82\xAA400,401,403,405,406,407\x88ȊO\x82\xBE\x82\xC1\x82\xBD\x8Fꍇ\x81A\x83\x81\x83b\x83Z\x81[\x83W\x83{\x83b\x83N\x83X\x82ɃS\x83~\x82\xAA\x95\\x8E\xA6\x82\xB3\x82\xEA\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
+ </ul>
+ </li>
+</ul>
+
<h3 id="ttproxy_1.0.0.25">2019.08.31 (Ver 1.0.0.25)</h3>
<ul class="history">
<li>\x95ύX