Merge pull request #122 from massinger/master

去除ip校验（可以添加hostname，方便docker环境），修复ssl连接下SSL Renegotiation问题

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 "

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>
+</script>

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>
+</script>