From 97a1501bf41db3e303ac28b4a1678de0188de498 Mon Sep 17 00:00:00 2001
From: "Michael.X" <xxnet.dev@gmail.com>
Date: Thu, 9 Nov 2017 15:52:55 +0800
Subject: [PATCH] 3.7.14, disable ipv6_tunnel on status page.

---
 README.md                                   | 2 +-
 code/default/download.md                    | 2 +-
 code/default/gae_proxy/local/web_control.py | 2 +-
 code/default/gae_proxy/web_ui/status.html   | 8 ++------
 code/default/update_version.txt             | 2 +-
 code/default/version.txt                    | 2 +-
 6 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index d4e9a23bd3..d4ca80dbee 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@
  2017-11-9
 * X-Tunnel 稳定. （[使用教程](https://github.com/XX-net/XX-Net/wiki/x-tunnel%E4%BD%BF%E7%94%A8%E6%95%99%E7%A8%8B)）  
 
-* GAE:  请升级到 3.7.13， 扫不到ip，请开启ipv6，请参考：
+* GAE:  请升级到 3.7.14， 扫不到ip，请开启ipv6，请参考：
   [如何开启IPv6](https://github.com/XX-net/XX-Net/wiki/%E5%A6%82%E4%BD%95%E5%BC%80%E5%90%AFIPv6)
 
   
diff --git a/code/default/download.md b/code/default/download.md
index 6830061f19..ebf2e5429e 100644
--- a/code/default/download.md
+++ b/code/default/download.md
@@ -5,7 +5,7 @@ https://codeload.github.com/XX-net/XX-Net/zip/3.7.9
 
 
 测试版(Test)：  
-https://codeload.github.com/XX-net/XX-Net/zip/3.7.13
+https://codeload.github.com/XX-net/XX-Net/zip/3.7.14
 
 
 Android:  
diff --git a/code/default/gae_proxy/local/web_control.py b/code/default/gae_proxy/local/web_control.py
index d05a0cb73b..f5e6241420 100644
--- a/code/default/gae_proxy/local/web_control.py
+++ b/code/default/gae_proxy/local/web_control.py
@@ -427,7 +427,7 @@ def req_status_handler(self):
 
                    "ipv4_state": check_local_network.IPv4.get_stat(),
                    "ipv6_state": check_local_network.IPv6.get_stat(),
-                   "ipv6_tunnel": ipv6_tunnel.state(),
+                   # "ipv6_tunnel": ipv6_tunnel.state(),
                    "ip_num": len(google_ip.gws_ip_list),
                    "good_ipv4_num": google_ip.good_ipv4_num,
                    "good_ipv6_num": google_ip.good_ipv6_num,
diff --git a/code/default/gae_proxy/web_ui/status.html b/code/default/gae_proxy/web_ui/status.html
index abc31d5c5e..c7a82ebb5d 100644
--- a/code/default/gae_proxy/web_ui/status.html
+++ b/code/default/gae_proxy/web_ui/status.html
@@ -17,10 +17,6 @@ <h4>{{ _( "Status" ) }}</h4>
             </tr>
         </thead>
         <tbody>
-            <tr>
-                <td>{{ _( "IPv6 Tunnel" ) }}</td>
-                <td id="ipv6-tunnel"></td>
-            </tr>
             <tr>
                 <td>{{ _( "IPv4 Status" ) }}</td>
                 <td id="ipv4-status"></td>
@@ -232,7 +228,7 @@ <h3>{{ _( "Diagnostic Info" ) }}</h3>
                     'python-version: ' + result['python_version'],
                     'openssl-version: ' + result['openssl_version'],
 
-                    'ipv6-tunnel: ' + result['ipv6_tunnel'],
+                    //'ipv6-tunnel: ' + result['ipv6_tunnel'],
                     'use-ipv6: ' + result['use_ipv6'],
                     'gws-ip-num: ' + 'total:' + result['ip_num'] + ' ipv4:' + result['good_ipv4_num'] + ' ipv6:' + result['good_ipv6_num'],
                     'ipv4-status: ' + result['ipv4_state'],
@@ -331,7 +327,7 @@ <h3>{{ _( "Diagnostic Info" ) }}</h3>
 
                     'td#ipv4-status': result['ipv4_state'],
                     'td#ipv6-status': result['ipv6_state'],
-                    'td#ipv6-tunnel': result['ipv6_tunnel'],
+                    // 'td#ipv6-tunnel': result['ipv6_tunnel'],
                     'td#ipv4-num': result['good_ipv4_num'],
                     'td#ipv6-num': result['good_ipv6_num'],
                     'td#is-idle': result['is_idle'],
diff --git a/code/default/update_version.txt b/code/default/update_version.txt
index a467647d87..e91835c194 100644
--- a/code/default/update_version.txt
+++ b/code/default/update_version.txt
@@ -1,7 +1,7 @@
 
 ## 升级(Update)：
 测试版(Test)：
-https://codeload.github.com/XX-net/XX-Net/zip/3.7.13 589c062fb59cdcd0c9aa1c74f52a71c9b1061bc3593d99d98a2c54fd64c86e29
+https://codeload.github.com/XX-net/XX-Net/zip/3.7.9 256d754dd365d31d9c5d189d01f7ead92c712c43f110d2359dac6b6a23c3d94d
 
 稳定版(Stable)：
 https://codeload.github.com/XX-net/XX-Net/zip/3.7.9 256d754dd365d31d9c5d189d01f7ead92c712c43f110d2359dac6b6a23c3d94d
diff --git a/code/default/version.txt b/code/default/version.txt
index 2504e042a0..50c9b5fea1 100644
--- a/code/default/version.txt
+++ b/code/default/version.txt
@@ -1 +1 @@
-3.7.13
\ No newline at end of file
+3.7.14
\ No newline at end of file