[Ttssh2-commit] [6462] プロキシを無効化するのが -proxy =none:// というのが判り辛いので、

svnno****@sourc***** svnno****@sourc*****
2016年 8月 10日 (水) 18:44:46 JST


Revision: 6462
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6462
Author:   doda
Date:     2016-08-10 18:44:45 +0900 (Wed, 10 Aug 2016)
Log Message:
-----------
プロキシを無効化するのが -proxy=none:// というのが判り辛いので、
同様の効果を持つ -noproxy オプションを追加する。

Modified Paths:
--------------
    trunk/TTProxy/TTProxy.h
    trunk/doc/en/html/about/history.html
    trunk/doc/en/html/commandline/ttproxy.html
    trunk/doc/ja/html/about/history.html
    trunk/doc/ja/html/commandline/ttproxy.html

-------------- next part --------------
Modified: trunk/TTProxy/TTProxy.h
===================================================================
--- trunk/TTProxy/TTProxy.h	2016-08-02 17:33:48 UTC (rev 6461)
+++ trunk/TTProxy/TTProxy.h	2016-08-10 09:44:45 UTC (rev 6462)
@@ -147,6 +147,11 @@
 						option[6] = '=';
 					}
 				}
+				else if (_stricmp(option+1, "noproxy") == 0) {
+					// -noproxy \x82\xCD -proxy=none:// \x82̕ʖ\xBC
+					ProxyWSockHook::parseURL("none://", TRUE);
+					action = OPTION_CLEAR;
+				}
 			}else{
 				String realhost = ProxyWSockHook::parseURL(option, FALSE);
 				if (realhost != NULL) {

Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2016-08-02 17:33:48 UTC (rev 6461)
+++ trunk/doc/en/html/about/history.html	2016-08-10 09:44:45 UTC (rev 6462)
@@ -4149,6 +4149,7 @@
 
 <h3><a name="ttproxy_1.0.0.23">2016.xx.xx (Ver 1.0.0.23)</a></h3>
 <ul class="history">
+      <!-- li><a href="../commandline/ttproxy.html">\x83R\x83}\x83\x93\x83h\x83\x89\x83C\x83\x93\x83I\x83v\x83V\x83\x87\x83\x93</a>\x82\xC9 -noproxy \x82\xF0\x92lj\xC1\x82\xB5\x82\xBD\x81B-proxy=none:// \x82Ɠ\xAF>\x97l\x82Ƀf\x83t\x83H\x83\x8B\x83g\x82̃v\x83\x8D\x83L\x83V\x90ݒ\xE8\x82𖳌\x{27B0B7}\x82\xE9\x81B</li -->
       <li>The priority(order) of loading TTX plugin is changed from 0 to 10.</li>
 </ul>
 

Modified: trunk/doc/en/html/commandline/ttproxy.html
===================================================================
--- trunk/doc/en/html/commandline/ttproxy.html	2016-08-02 17:33:48 UTC (rev 6461)
+++ trunk/doc/en/html/commandline/ttproxy.html	2016-08-10 09:44:45 UTC (rev 6462)
@@ -19,6 +19,7 @@
 <pre class="syntax">
 -proxy=protocol://&lt;user&lt;:password&gt;@&gt;proxyserver:proxyport
 protocol://&lt;user&lt;:password&gt;@&gt;proxyserver:proxyport/realhost
+-noproxy
 </pre>
 
 <dl>
@@ -51,6 +52,9 @@
 
   <dt id="password">password</dt>
   <dd>Password for proxy authentication</dd>
+
+  <dt id="noproxy">-noproxy</dt>
+  <dd>Disable proxy setting. Same as "-proxy=none://"</dd>
 </dl>
 
 <h2 id="example">Example</h2>
@@ -58,6 +62,7 @@
 ttermpro.exe -proxy=socks5://user:pass@proxy:1080 sshserver /ssh
 ttermpro.exe -proxy=telnet://proxy:8023 telnetserver:23 /nossh
 ttermpro.exe -proxy=none:// sshserver /ssh
+ttermpro.exe -noproxy sshserver /ssh
 </pre>
 
 <h2 id="notes">Note</h2>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2016-08-02 17:33:48 UTC (rev 6461)
+++ trunk/doc/ja/html/about/history.html	2016-08-10 09:44:45 UTC (rev 6462)
@@ -4153,6 +4153,7 @@
 
 <h3><a name="ttproxy_1.0.0.23">2016.xx.xx (Ver 1.0.0.23)</a></h3>
 <ul class="history">
+      <li><a href="../commandline/ttproxy.html">\x83R\x83}\x83\x93\x83h\x83\x89\x83C\x83\x93\x83I\x83v\x83V\x83\x87\x83\x93</a>\x82\xC9 -noproxy \x82\xF0\x92lj\xC1\x82\xB5\x82\xBD\x81B-proxy=none:// \x82Ɠ\xAF\x97l\x82Ƀf\x83t\x83H\x83\x8B\x83g\x82̃v\x83\x8D\x83L\x83V\x90ݒ\xE8\x82𖳌\x{27B0B7}\x82\xE9\x81B</li>
       <li>TTX \x83\x8D\x81[\x83h\x8E\x9E\x82̗D\x90揇\x88\xCA (order) \x82\xF0 0 \x82\xA9\x82\xE7 10 \x82ɕύX\x82\xB5\x82\xBD\x81B</li>
 </ul>
 

Modified: trunk/doc/ja/html/commandline/ttproxy.html
===================================================================
--- trunk/doc/ja/html/commandline/ttproxy.html	2016-08-02 17:33:48 UTC (rev 6461)
+++ trunk/doc/ja/html/commandline/ttproxy.html	2016-08-10 09:44:45 UTC (rev 6462)
@@ -19,6 +19,7 @@
 <pre class="syntax">
 -proxy=protocol://&lt;user&lt;:password&gt;@&gt;proxyserver:proxyport
 protocol://&lt;user&lt;:password&gt;@&gt;proxyserver:proxyport/realhost
+-noproxy
 </pre>
 
 <dl>
@@ -51,6 +52,9 @@
 
   <dt id="password">password</dt>
   <dd>\x83v\x83\x8D\x83L\x83V\x82ŔF\x8F؂\xAA\x95K\x97v\x82ȏꍇ\x82̃p\x83X\x83\x8F\x81[\x83h</dd>
+
+  <dt id="noproxy">-noproxy</dt>
+  <dd>\x83v\x83\x8D\x83L\x83V\x90ݒ\xE8\x82𖳌\x{27B0B7}\x82\xE9\x81B-proxy=none:// \x82Ɠ\xAF\x82\xB6\x81B</dd>
 </dl>
 
 <h2 id="example">\x8Eg\x97p\x97\xE1</h2>
@@ -58,6 +62,7 @@
 ttermpro.exe -proxy=socks5://user:pass@proxy:1080 sshserver /ssh
 ttermpro.exe -proxy=telnet://proxy:8023 telnetserver:23 /nossh
 ttermpro.exe -proxy=none:// sshserver /ssh
+ttermpro.exe -noproxy sshserver /ssh
 </pre>
 
 <h2 id="notes">\x92\x8D\x88\xD3</h2>



Ttssh2-commit メーリングリストの案内