From 868fb6e5876e8ae324af1f085c6ab89150500826 Mon Sep 17 00:00:00 2001
From: ziyue <1213642868@qq.com>
Date: Tue, 8 Jun 2021 17:33:23 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0zltoolkit,=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8DRtpServer=E5=9C=A8tcp=E6=A8=A1=E5=BC=8F=E4=B8=8B?=
 =?UTF-8?q?=E5=B4=A9=E6=BA=83=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 3rdpart/ZLToolKit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3rdpart/ZLToolKit b/3rdpart/ZLToolKit
index 0c371464..8a626d37 160000
--- a/3rdpart/ZLToolKit
+++ b/3rdpart/ZLToolKit
@@ -1 +1 @@
-Subproject commit 0c37146426d8fb0a6d98472739ec3bcc683922db
+Subproject commit 8a626d37bec6a3748595a5b4e00b93b007ca0e4b

From 9c3ec4b4ed6c3ba5973edf6f506ec202c7de5145 Mon Sep 17 00:00:00 2001
From: ziyue <1213642868@qq.com>
Date: Tue, 8 Jun 2021 17:45:59 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0zltoolkit,=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8DWindows=E4=B8=8B=E7=BC=96=E8=AF=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 3rdpart/ZLToolKit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3rdpart/ZLToolKit b/3rdpart/ZLToolKit
index 8a626d37..3b333274 160000
--- a/3rdpart/ZLToolKit
+++ b/3rdpart/ZLToolKit
@@ -1 +1 @@
-Subproject commit 8a626d37bec6a3748595a5b4e00b93b007ca0e4b
+Subproject commit 3b333274b6595bb0d09576e9a2c1e4603129b64a

From 6ccf512367d1aac2ec46e21f2db67c4c4c9e9133 Mon Sep 17 00:00:00 2001
From: ziyue <1213642868@qq.com>
Date: Tue, 8 Jun 2021 17:48:52 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=86=85=E5=AD=98?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Common/config.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Common/config.cpp b/src/Common/config.cpp
index 0cd509b4..46cdd412 100644
--- a/src/Common/config.cpp
+++ b/src/Common/config.cpp
@@ -405,6 +405,10 @@ void operator delete(void *ptr) {
     free(ptr);
 }
 
+void operator delete(void *ptr, std::size_t) {
+    free(ptr);
+}
+
 void *operator new[](std::size_t size) {
     auto ret = malloc(size);
     if (ret) {
@@ -416,4 +420,8 @@ void *operator new[](std::size_t size) {
 void operator delete[](void *ptr) {
     free(ptr);
 }
+
+void operator delete[](void *ptr, std::size_t) {
+    free(ptr);
+}
 #endif