From b577ed9974561577c0517e34140460fba083027f Mon Sep 17 00:00:00 2001
From: rageJune <xmu_maomao@163.com>
Date: Fri, 18 Jan 2019 16:15:16 +0800
Subject: [PATCH] =?UTF-8?q?#1300=20=E6=8B=89=E5=8F=96=E4=B8=8D=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E7=9A=84http-flv=E6=B5=81=E6=97=B6fd=E6=B3=84?=
 =?UTF-8?q?=E6=BC=8F=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 trunk/src/app/srs_app_recv_thread.cpp | 4 +++-
 trunk/src/app/srs_app_recv_thread.hpp | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/trunk/src/app/srs_app_recv_thread.cpp b/trunk/src/app/srs_app_recv_thread.cpp
index cf7e77fd49..620dd03d3f 100644
--- a/trunk/src/app/srs_app_recv_thread.cpp
+++ b/trunk/src/app/srs_app_recv_thread.cpp
@@ -562,6 +562,7 @@ void SrsPublishRecvThread::set_socket_buffer(int sleep_ms)
 
 SrsHttpRecvThread::SrsHttpRecvThread(SrsResponseOnlyHttpConn* c)
 {
+    trd_err = srs_success;
     conn = c;
     trd = new SrsSTCoroutine("http-receive", this, _srs_context->get_id());
 }
@@ -584,7 +585,7 @@ srs_error_t SrsHttpRecvThread::start()
 
 srs_error_t SrsHttpRecvThread::pull()
 {
-    return trd->pull();
+    return srs_error_copy(trd_err);
 }
 
 srs_error_t SrsHttpRecvThread::cycle()
@@ -596,6 +597,7 @@ srs_error_t SrsHttpRecvThread::cycle()
         SrsAutoFree(ISrsHttpMessage, req);
         
         if ((err = conn->pop_message(&req)) != srs_success) {
+	    trd_err = err;
             return srs_error_wrap(err, "pop message");
         }
     }
diff --git a/trunk/src/app/srs_app_recv_thread.hpp b/trunk/src/app/srs_app_recv_thread.hpp
index c7d5221839..1dcaa056a6 100644
--- a/trunk/src/app/srs_app_recv_thread.hpp
+++ b/trunk/src/app/srs_app_recv_thread.hpp
@@ -232,6 +232,7 @@ class SrsPublishRecvThread : virtual public ISrsMessagePumper, virtual public IS
 class SrsHttpRecvThread : public ISrsCoroutineHandler
 {
 private:
+    srs_error_t trd_err;
     SrsResponseOnlyHttpConn* conn;
     SrsCoroutine* trd;
 public: