From 4456a275b68813baa161d874dcd4579fe312733e Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Fri, 17 Sep 2021 14:20:35 +0800
Subject: [PATCH] PushFLV: Fix bug, add stat

---
 trunk/src/app/srs_app_caster_flv.cpp     | 7 ++++---
 trunk/src/app/srs_app_latest_version.cpp | 4 ++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/trunk/src/app/srs_app_caster_flv.cpp b/trunk/src/app/srs_app_caster_flv.cpp
index 0339f4541..81bd43f7a 100644
--- a/trunk/src/app/srs_app_caster_flv.cpp
+++ b/trunk/src/app/srs_app_caster_flv.cpp
@@ -96,8 +96,9 @@ void SrsAppCasterFlv::remove(ISrsResource* c)
 srs_error_t SrsAppCasterFlv::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r)
 {
     SrsHttpMessage* msg = dynamic_cast<SrsHttpMessage*>(r);
-    SrsDynamicHttpConn* conn = dynamic_cast<SrsDynamicHttpConn*>(msg->connection());
-    srs_assert(conn);
+    SrsHttpConn* hconn = dynamic_cast<SrsHttpConn*>(msg->connection());
+    SrsDynamicHttpConn* dconn = dynamic_cast<SrsDynamicHttpConn*>(hconn->handler());
+    srs_assert(dconn);
     
     std::string app = srs_path_dirname(r->path());
     app = srs_string_trim_start(app, "/");
@@ -116,7 +117,7 @@ srs_error_t SrsAppCasterFlv::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessa
         o = o.substr(0, o.length() - 4);
     }
     
-    srs_error_t err = conn->proxy(w, r, o);
+    srs_error_t err = dconn->proxy(w, r, o);
     if (err != srs_success) {
         return srs_error_wrap(err, "proxy");
     }
diff --git a/trunk/src/app/srs_app_latest_version.cpp b/trunk/src/app/srs_app_latest_version.cpp
index 11f6f58bf..9d172cb1b 100644
--- a/trunk/src/app/srs_app_latest_version.cpp
+++ b/trunk/src/app/srs_app_latest_version.cpp
@@ -68,6 +68,7 @@ void srs_build_features(stringstream& ss)
     int nn_vhosts = 0;
     bool rtsp = false, forward = false, ingest = false, edge = false, hls = false, dvr = false, flv = false;
     bool hooks = false, dash = false, hds = false, exec = false, transcode = false, security = false;
+    bool flv2 = false;
 
     SrsConfDirective* root = _srs_config->get_root();
     // Note that we limit the loop, never detect all configs.
@@ -78,6 +79,8 @@ void srs_build_features(stringstream& ss)
             string engine = _srs_config->get_stream_caster_engine(conf);
             if (engine == "rtsp") {
                 rtsp = true;
+            } else if (engine == "flv") {
+                flv2 = true;
             }
         }
 
@@ -134,6 +137,7 @@ void srs_build_features(stringstream& ss)
 
     SRS_CHECK_FEATURE2(nn_vhosts, "vhosts", ss);
     SRS_CHECK_FEATURE(rtsp, ss);
+    SRS_CHECK_FEATURE(flv2, ss);
     SRS_CHECK_FEATURE(forward, ss);
     SRS_CHECK_FEATURE(ingest, ss);
     SRS_CHECK_FEATURE(edge, ss);