From b7d1a5059a88b0870348757150ae73a8b525808f Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Sun, 13 Dec 2020 09:51:08 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=8F=90=E9=AB=98rtmp=E5=8D=8F=E8=AE=AE?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Rtmp/RtmpProtocol.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Rtmp/RtmpProtocol.cpp b/src/Rtmp/RtmpProtocol.cpp
index 55f45092..427510a1 100644
--- a/src/Rtmp/RtmpProtocol.cpp
+++ b/src/Rtmp/RtmpProtocol.cpp
@@ -601,7 +601,9 @@ const char* RtmpProtocol::handle_rtmp(const char *data, uint64_t len) {
             //need more data
             return ptr;
         }
-        chunk_data.buffer.append(ptr + header_len + offset, more);
+        if (more) {
+            chunk_data.buffer.append(ptr + header_len + offset, more);
+        }
         ptr += header_len + offset + more;
         len -= header_len + offset + more;
         if (chunk_data.buffer.size() == chunk_data.body_size) {

From f1c9b7b09cd145556688102874d910527c4ae381 Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Sun, 13 Dec 2020 09:52:00 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=92=AD=E6=94=BE?=
 =?UTF-8?q?=E5=99=A8=E7=BA=BF=E7=A8=8B=E5=AE=89=E5=85=A8=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=9A#611?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Player/MediaPlayer.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Player/MediaPlayer.cpp b/src/Player/MediaPlayer.cpp
index d766bf77..694b656e 100644
--- a/src/Player/MediaPlayer.cpp
+++ b/src/Player/MediaPlayer.cpp
@@ -26,7 +26,14 @@ MediaPlayer::~MediaPlayer() {
 static void setOnCreateSocket_l(const std::shared_ptr<PlayerBase> &delegate, const Socket::onCreateSocket &cb){
     auto helper = dynamic_pointer_cast<SocketHelper>(delegate);
     if (helper) {
-        helper->setOnCreateSocket(cb);
+        if (cb) {
+            helper->setOnCreateSocket(cb);
+        } else {
+            //客户端，确保开启互斥锁
+            helper->setOnCreateSocket([](const EventPoller::Ptr &poller) {
+                return Socket::createSocket(poller, true);
+            });
+        }
     }
 }
 

From 1397399589529696a724a88a8c4cb0b82bf3298f Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Sun, 13 Dec 2020 09:52:16 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0zltoolkit?=
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 42139e18..7ae5f547 160000
--- a/3rdpart/ZLToolKit
+++ b/3rdpart/ZLToolKit
@@ -1 +1 @@
-Subproject commit 42139e18ce46869760cc29f77ad6ce5de1f5dcee
+Subproject commit 7ae5f547c17ddc7bee7b82ebc114248df99de620