From 1a4f54d0861b651e25888923cfe33b02d05e7e00 Mon Sep 17 00:00:00 2001
From: L <l-codes@qq.com>
Date: Sat, 30 Jan 2021 09:20:35 +0800
Subject: [PATCH] push v2.5.0

---
 CHANGELOG-en.md |  7 +++++++
 CHANGELOG.md    |  7 +++++++
 README-en.md    | 11 +++++++++--
 README.md       | 11 +++++++++--
 neoreg.py       |  2 +-
 5 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG-en.md b/CHANGELOG-en.md
index cfd74fe..6680774 100644
--- a/CHANGELOG-en.md
+++ b/CHANGELOG-en.md
@@ -1,5 +1,12 @@
 # Change Log
 
+### v2.5.0
+    Client: When detecting that the socks connection is closed, the session is automatically ended, reducing a lot of request traffic
+    Client: Optimized the output of exception information, and has been able to capture exceptions caused by high concurrency
+    Client: The document adds operating suggestions for the Mac OSX environment
+    Client: Adjust the default settings, the network traffic is reduced by about 46%
+    Client: Fix `--file` read complex file encoding escape problem 
+
 ### v2.4.1
     Added session expiration reminder
     Adjust `askGeorg` detection request, timeout is 10 seconds
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bbac93f..1c60f5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log
 
+### v2.5.0
+    Client: 检测 socks 连接已关闭，则自动结束会话，减少大量请求流量
+    Client: 优化了异常信息输出，已能捕获高并发产生的异常
+    Client: 文档新增 Mac OSX 环境的运行建议
+    Client: 调整默认设置，流量减少约 46%
+    Client: 修复 `--file` 读取复杂文件编码转义问题
+
 ### v2.4.1
     添加 Session 过期提示
     调整 `askGeorg` 检测请求，timeout 为 10 秒
diff --git a/README-en.md b/README-en.md
index 665ad46..b713b1e 100644
--- a/README-en.md
+++ b/README-en.md
@@ -15,7 +15,7 @@ Neo-reGeorg
 Version
 ----
 
-2.4.1 - [Change Log](CHANGELOG-en.md)
+2.5.0 - [Change Log](CHANGELOG-en.md)
 
 
 Features
@@ -155,7 +155,7 @@ $ python neoreg.py -h
       --local-dns           Use local resolution DNS
       --read-buff Bytes     Local read buffer, max data to be sent per
                             POST.(default: 2048 max: 2600)
-      --read-interval MS    Read data interval in milliseconds.(default: 100)
+      --read-interval MS    Read data interval in milliseconds.(default: 500)
       --max-threads N       Proxy max threads.(default: 1000)
       -v                    Increase verbosity level (use -vv or more for greater
                             effect)
@@ -163,6 +163,13 @@ $ python neoreg.py -h
 
 
 
+Remind
+----
+
+* When running `neoreg.py` with high concurrency on Mac OSX, a large number of network requests will be lost. You can use `ulimit -n 2560` to modify the "maximum number of open files" of the current shell.
+
+
+
 TODO
 ----
 
diff --git a/README.md b/README.md
index a8c917d..40ce265 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Neo-reGeorg
 Version
 ----
 
-2.4.1 - [版本修改日志](CHANGELOG.md)
+2.5.0 - [版本修改日志](CHANGELOG.md)
 
 
 
@@ -155,13 +155,20 @@ $ python neoreg.py -h
       --local-dns           Use local resolution DNS
       --read-buff Bytes     Local read buffer, max data to be sent per
                             POST.(default: 2048 max: 2600)
-      --read-interval MS    Read data interval in milliseconds.(default: 100)
+      --read-interval MS    Read data interval in milliseconds.(default: 500)
       --max-threads N       Proxy max threads.(default: 1000)
       -v                    Increase verbosity level (use -vv or more for greater
                             effect)
 ```
 
 
+Remind
+----
+
+* Mac OSX 运行 `neoreg.py` 高并发会出现掉包情况，可通过 `ulimit -n 2560` 修改当前 shell 的 "最大文件打开数"
+
+
+
 TODO
 ----
 
diff --git a/neoreg.py b/neoreg.py
index e29a6a8..c9ec7d6 100755
--- a/neoreg.py
+++ b/neoreg.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 __author__  = 'L'
-__version__ = '2.4.1'
+__version__ = '2.5.0'
 
 import sys
 import os