From bc84e440b7c02b0294973dd4783983f589d05772 Mon Sep 17 00:00:00 2001
From: massinger <10529946+massinger@users.noreply.github.com>
Date: Mon, 3 Jun 2019 22:13:04 +0800
Subject: [PATCH 1/3] Update add.html

---
 proxy-server/webpages/lanproxy-config/html/lan/add.html | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/proxy-server/webpages/lanproxy-config/html/lan/add.html b/proxy-server/webpages/lanproxy-config/html/lan/add.html
index ac29111..2f8fa2f 100644
--- a/proxy-server/webpages/lanproxy-config/html/lan/add.html
+++ b/proxy-server/webpages/lanproxy-config/html/lan/add.html
@@ -59,10 +59,6 @@ $(".add").click(function(){
         layer.alert($.i18n.prop('lan.notice.inputlan'), {title:"Tips"});
         return;
     }
-    if(!check_lan(lan)){
-        layer.alert($.i18n.prop('lan.notice.errorlan'), {title:"Tips"});
-        return;
-    }
 
     clientList[clientIndex].proxyMappings.push({
     	name:name,
@@ -83,4 +79,4 @@ $(".add").click(function(){
 $(".back").click(function(){
 	load_page("html/lan/list.html");
 });
-</script>
\ No newline at end of file
+</script>

From 13b1d2391a245c7e5eac4274f913684ed177f309 Mon Sep 17 00:00:00 2001
From: massinger <10529946+massinger@users.noreply.github.com>
Date: Mon, 3 Jun 2019 22:13:48 +0800
Subject: [PATCH 2/3] Update edit.html

---
 proxy-server/webpages/lanproxy-config/html/lan/edit.html | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/proxy-server/webpages/lanproxy-config/html/lan/edit.html b/proxy-server/webpages/lanproxy-config/html/lan/edit.html
index 9096d22..8c223a5 100644
--- a/proxy-server/webpages/lanproxy-config/html/lan/edit.html
+++ b/proxy-server/webpages/lanproxy-config/html/lan/edit.html
@@ -64,10 +64,6 @@ $(".update").click(function(){
     	layer.alert($.i18n.prop('lan.notice.inputlan'), {title:"Tips"});
         return;
     }
-    if(!check_lan(lan)){
-    	layer.alert($.i18n.prop('lan.notice.errorlan'), {title:"Tips"});
-        return;
-    }
 
     clientList[clientIndex].proxyMappings[mappingIndex]= {
     	name:name,
@@ -88,4 +84,4 @@ $(".update").click(function(){
 $(".back").click(function(){
 	load_page("html/lan/list.html");
 });
-</script>
\ No newline at end of file
+</script>

From f28a9816ef4ab43c6414059d94a7f682e554f401 Mon Sep 17 00:00:00 2001
From: xiemeng_MG <xiemeng@migu.cn>
Date: Tue, 23 Jul 2019 13:46:18 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix(sprint1):=20=E4=BF=AE=E5=A4=8DSSL=20ren?=
 =?UTF-8?q?egotiation=E6=94=BB=E5=87=BB=E6=BC=8F=E6=B4=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 proxy-server/src/main/resources/startup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proxy-server/src/main/resources/startup.sh b/proxy-server/src/main/resources/startup.sh
index 15a77f8..e327806 100644
--- a/proxy-server/src/main/resources/startup.sh
+++ b/proxy-server/src/main/resources/startup.sh
@@ -23,7 +23,7 @@ CLOG_FILE=$LOGS_DIR/gc.log
 LIB_DIR=$DEPLOY_DIR/lib
 LIB_JARS=`ls $LIB_DIR|grep .jar|awk '{print "'$LIB_DIR'/"$0}'| xargs | sed "s/ /:/g"`
 
-JAVA_OPTS=" -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true "
+JAVA_OPTS=" -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true  -Djdk.tls.rejectClientInitiatedRenegotiation=true"
 JAVA_DEBUG_OPTS=""
 if [ "$1" = "debug" ]; then
     JAVA_DEBUG_OPTS=" -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n "