release 8.0

2026-06-14 12:05:58 +08:00 · 2023-12-09 16:23:51 +08:00
parent 44c82752b3
commit bbe8f4a018
346 changed files with 2529 additions and 3435 deletions
--- a/src/Http/HlsParser.cpp
+++ b/src/Http/HlsParser.cpp
@@ -1,9 +1,9 @@
 /*
 * Copyright (c) 2020 The ZLMediaKit project authors. All Rights Reserved.
 *
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
--- a/src/Http/HlsParser.h
+++ b/src/Http/HlsParser.h
@@ -1,9 +1,9 @@
 /*
 * Copyright (c) 2020 The ZLMediaKit project authors. All Rights Reserved.
 *
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
@@ -36,9 +36,6 @@ typedef struct{

 class HlsParser {
 public:
-    HlsParser() = default;
-    ~HlsParser() = default;
-
    bool parse(const std::string &http_url,const std::string &m3u8);

    /**
--- a/src/Http/HlsPlayer.cpp
+++ b/src/Http/HlsPlayer.cpp
@@ -1,9 +1,9 @@
 /*
 * Copyright (c) 2020 The ZLMediaKit project authors. All Rights Reserved.
 *
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
--- a/src/Http/HlsPlayer.h
+++ b/src/Http/HlsPlayer.h
@@ -1,9 +1,9 @@
 /*
 * Copyright (c) 2020 The ZLMediaKit project authors. All Rights Reserved.
 *
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
@@ -25,7 +25,6 @@ namespace mediakit {

 class HlsDemuxer : public MediaSinkInterface , public TrackSource, public std::enable_shared_from_this<HlsDemuxer> {
 public:
-    HlsDemuxer() = default;
    ~HlsDemuxer() override { _timer = nullptr; }

    void start(const toolkit::EventPoller::Ptr &poller, TrackListener *listener);
@@ -53,7 +52,6 @@ private:
 class HlsPlayer : public  HttpClientImp , public PlayerBase , public HlsParser{
 public:
    HlsPlayer(const toolkit::EventPoller::Ptr &poller);
-    ~HlsPlayer() override = default;

    /**
     * 开始播放
@@ -120,7 +118,6 @@ class HlsPlayerImp : public PlayerImp<HlsPlayer, PlayerBase>, private TrackListe
 public:
    using Ptr = std::shared_ptr<HlsPlayerImp>;
    HlsPlayerImp(const toolkit::EventPoller::Ptr &poller = nullptr);
-    ~HlsPlayerImp() override = default;

 private:
    //// HlsPlayer override////
--- a/src/Http/HttpBody.cpp
+++ b/src/Http/HttpBody.cpp
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
+ * Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 *
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
@@ -189,7 +189,6 @@ public:
        _data = map_addr.get() + offset;
        _size = size;
    }
-    ~BufferMmap() override = default;
    //返回数据长度
    char *data() const override { return _data; }
    size_t size() const override { return _size; }
--- a/src/Http/HttpBody.h
+++ b/src/Http/HttpBody.h
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
+ * Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 *
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
@@ -30,8 +30,6 @@ namespace mediakit {
 class HttpBody : public std::enable_shared_from_this<HttpBody>{
 public:
    using Ptr = std::shared_ptr<HttpBody>;
-    HttpBody() = default;
-
    virtual ~HttpBody() = default;

    /**
@@ -75,7 +73,6 @@ class HttpStringBody : public HttpBody{
 public:
    using Ptr = std::shared_ptr<HttpStringBody>;
    HttpStringBody(std::string str);
-    ~HttpStringBody() override = default;

    int64_t remainSize() override;
    toolkit::Buffer::Ptr readData(size_t size) override ;
@@ -92,7 +89,6 @@ class HttpBufferBody : public HttpBody{
 public:
    using Ptr = std::shared_ptr<HttpBufferBody>;
    HttpBufferBody(toolkit::Buffer::Ptr buffer);
-    ~HttpBufferBody() override = default;

    int64_t remainSize() override;
    toolkit::Buffer::Ptr readData(size_t size) override;
@@ -114,7 +110,6 @@ public:
     * @param use_mmap 是否使用mmap方式访问文件
     */
    HttpFileBody(const std::string &file_path, bool use_mmap = true);
-    ~HttpFileBody() override = default;

    /**
     * 设置读取范围
@@ -151,7 +146,6 @@ public:
     * @param boundary boundary字符串
     */
    HttpMultiFormBody(const HttpArgs &args,const std::string &filePath,const std::string &boundary = "0xKhTmLbOuNdArY");
-    virtual ~HttpMultiFormBody() = default;
    int64_t remainSize() override ;
    toolkit::Buffer::Ptr readData(size_t size) override;

--- a/src/Http/HttpChunkedSplitter.cpp
+++ b/src/Http/HttpChunkedSplitter.cpp
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
+ * Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 *
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
--- a/src/Http/HttpChunkedSplitter.h
+++ b/src/Http/HttpChunkedSplitter.h
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
+ * Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 *
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
--- a/src/Http/HttpClient.cpp
+++ b/src/Http/HttpClient.cpp
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
+ * Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 *
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
@@ -235,7 +235,7 @@ ssize_t HttpClient::onRecvHeader(const char *data, size_t len) {
                _total_body_size = _recved_body_size;
                if (_recved_body_size > 0) {
                    onResponseCompleted_l(SockException(Err_success, "success"));
-                }else{
+                } else {
                    onResponseCompleted_l(SockException(Err_other, "no body"));
                }
            }
--- a/src/Http/HttpClient.h
+++ b/src/Http/HttpClient.h
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
+ * Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 *
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
@@ -29,9 +29,6 @@ namespace mediakit {

 class HttpArgs : public std::map<std::string, toolkit::variant, StrCaseCompare> {
 public:
-    HttpArgs() = default;
-    ~HttpArgs() = default;
-
    std::string make() const {
        std::string ret;
        for (auto &pr : *this) {
@@ -52,9 +49,6 @@ public:
    using HttpHeader = StrCaseMap;
    using Ptr = std::shared_ptr<HttpClient>;

-    HttpClient() = default;
-    ~HttpClient() override = default;
-
    /**
     * 发送http[s]请求
     * @param url 请求url
--- a/src/Http/HttpClientImp.cpp
+++ b/src/Http/HttpClientImp.cpp
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
+ * Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 *
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
--- a/src/Http/HttpClientImp.h
+++ b/src/Http/HttpClientImp.h
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
+ * Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 *
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
@@ -19,8 +19,6 @@ namespace mediakit {
 class HttpClientImp : public toolkit::TcpClientWithSSL<HttpClient> {
 public:
    using Ptr = std::shared_ptr<HttpClientImp>;
-    HttpClientImp() = default;
-    ~HttpClientImp() override = default;

 protected:
    void onConnect(const toolkit::SockException &ex) override;
--- a/src/Http/HttpConst.cpp
+++ b/src/Http/HttpConst.cpp
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
+ * Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 *
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
--- a/src/Http/HttpConst.h
+++ b/src/Http/HttpConst.h
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
+ * Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 *
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
--- a/src/Http/HttpCookie.cpp
+++ b/src/Http/HttpCookie.cpp
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
+ * Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 *
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
--- a/src/Http/HttpCookie.h
+++ b/src/Http/HttpCookie.h
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
+ * Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 *
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
@@ -27,8 +27,6 @@ class HttpCookie {
 public:
    using Ptr = std::shared_ptr<HttpCookie>;
    friend class HttpCookieStorage;
-    HttpCookie() = default;
-    ~HttpCookie() = default;

    void setPath(const std::string &path);
    void setHost(const std::string &host);
@@ -52,7 +50,6 @@ private:
 */
 class HttpCookieStorage{
 public:
-    ~HttpCookieStorage() = default;
    static HttpCookieStorage &Instance();
    void set(const HttpCookie::Ptr &cookie);
    std::vector<HttpCookie::Ptr> get(const std::string &host,const std::string &path);
--- a/src/Http/HttpCookieManager.cpp
+++ b/src/Http/HttpCookieManager.cpp
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
+ * Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 *
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
--- a/src/Http/HttpCookieManager.h
+++ b/src/Http/HttpCookieManager.h
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
+ * Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 *
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
@@ -113,8 +113,6 @@ private:
 */
 class RandStrGenerator {
 public:
-    RandStrGenerator() = default;
-    ~RandStrGenerator() = default;

    /**
     * 获取不碰撞的随机字符串
--- a/src/Http/HttpDownloader.cpp
+++ b/src/Http/HttpDownloader.cpp
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
+ * Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 *
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
--- a/src/Http/HttpDownloader.h
+++ b/src/Http/HttpDownloader.h
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
+ * Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 *
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
@@ -20,7 +20,6 @@ public:
    using Ptr = std::shared_ptr<HttpDownloader>;
    using onDownloadResult = std::function<void(const toolkit::SockException &ex, const std::string &filePath)>;

-    HttpDownloader() = default;
    ~HttpDownloader() override;

    /**
--- a/src/Http/HttpFileManager.cpp
+++ b/src/Http/HttpFileManager.cpp
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
+ * Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 *
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
@@ -300,8 +300,6 @@ static bool emitHlsPlayed(const Parser &parser, const MediaInfo &media_info, con
 class SockInfoImp : public SockInfo{
 public:
    using Ptr = std::shared_ptr<SockInfoImp>;
-    SockInfoImp() = default;
-    ~SockInfoImp() override = default;

    string get_local_ip() override {
        return _local_ip;
--- a/src/Http/HttpFileManager.h
+++ b/src/Http/HttpFileManager.h
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
+ * Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 *
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
@@ -24,8 +24,6 @@ public:
    typedef std::function<void(int code, const StrCaseMap &headerOut, const HttpBody::Ptr &body)> HttpResponseInvokerLambda0;
    typedef std::function<void(int code, const StrCaseMap &headerOut, const std::string &body)> HttpResponseInvokerLambda1;

-    HttpResponseInvokerImp() = default;
-    ~HttpResponseInvokerImp() = default;
    template<typename C>
    HttpResponseInvokerImp(const C &c):HttpResponseInvokerImp(typename toolkit::function_traits<C>::stl_function_type(c)) {}
    HttpResponseInvokerImp(const HttpResponseInvokerLambda0 &lambda);
--- a/src/Http/HttpRequestSplitter.cpp
+++ b/src/Http/HttpRequestSplitter.cpp
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
+ * Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 *
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
@@ -22,7 +22,7 @@ namespace mediakit {
 void HttpRequestSplitter::input(const char *data,size_t len) {
    {
        auto size = remainDataSize();
-        if (size > kMaxCacheSize) {
+        if (size > _max_cache_size) {
            //缓存太多数据无法处理则上抛异常
            reset();
            throw std::out_of_range("remain data size is too huge, now cleared:" + to_string(size));
@@ -142,6 +142,16 @@ const char *HttpRequestSplitter::remainData() const {
    return _remain_data.data();
 }

+void HttpRequestSplitter::setMaxCacheSize(size_t max_cache_size) {
+    if (!max_cache_size) {
+        max_cache_size = kMaxCacheSize;
+    }
+    _max_cache_size = max_cache_size;
+}
+
+HttpRequestSplitter::HttpRequestSplitter() {
+    setMaxCacheSize(0);
+}

 } /* namespace mediakit */

--- a/src/Http/HttpRequestSplitter.h
+++ b/src/Http/HttpRequestSplitter.h
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
+ * Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 *
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
@@ -18,7 +18,7 @@ namespace mediakit {

 class HttpRequestSplitter {
 public:
-    HttpRequestSplitter() = default;
+    HttpRequestSplitter();
    virtual ~HttpRequestSplitter() = default;

    /**
@@ -44,6 +44,11 @@ public:
     */
    const char *remainData() const;

+    /**
+     * 设置最大缓存大小
+     */
+    void setMaxCacheSize(size_t max_cache_size);
+
 protected:
    /**
     * 收到请求头
@@ -80,6 +85,7 @@ protected:

 private:
    ssize_t _content_len = 0;
+    size_t _max_cache_size = 0;
    size_t _remain_data_size = 0;
    toolkit::BufferLikeString _remain_data;
 };
--- a/src/Http/HttpRequester.cpp
+++ b/src/Http/HttpRequester.cpp
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
+ * Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 *
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
--- a/src/Http/HttpRequester.h
+++ b/src/Http/HttpRequester.h
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
+ * Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 *
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
@@ -20,9 +20,6 @@ public:
    using Ptr = std::shared_ptr<HttpRequester>;
    using HttpRequesterResult = std::function<void(const toolkit::SockException &ex, const Parser &response)>;

-    HttpRequester() = default;
-    ~HttpRequester() override = default;
-
    void setOnResult(const HttpRequesterResult &onResult);
    void startRequester(const std::string &url, const HttpRequesterResult &on_result, float timeout_sec = 10);
    void setRetry(size_t count, size_t delay);
--- a/src/Http/HttpSession.cpp
+++ b/src/Http/HttpSession.cpp
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
+ * Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 *
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
@@ -24,12 +24,11 @@ using namespace toolkit;
 namespace mediakit {

 HttpSession::HttpSession(const Socket::Ptr &pSock) : Session(pSock) {
-    GET_CONFIG(uint32_t, keep_alive_sec, Http::kKeepAliveSecond);
-    pSock->setSendTimeOutSecond(keep_alive_sec);
+    //设置默认参数
+    setMaxReqSize(0);
+    setTimeoutSec(0);
 }

-HttpSession::~HttpSession() = default;
-
 void HttpSession::onHttpRequest_HEAD() {
    // 暂时全部返回200 OK，因为HTTP GET存在按需生成流的操作，所以不能按照HTTP GET的流程返回
    // 如果直接返回404，那么又会导致按需生成流的逻辑失效，所以HTTP HEAD在静态文件或者已存在资源时才有效
@@ -99,11 +98,10 @@ ssize_t HttpSession::onRecvHeader(const char *header, size_t len) {
        return _on_recv_body ? -1 : 0;
    }

-    GET_CONFIG(size_t, maxReqSize, Http::kMaxReqSize);
-    if (content_len > maxReqSize) {
+    if (content_len > _max_req_size) {
        //// 不定长body或超大body ////
        if (content_len != SIZE_MAX) {
-            WarnL << "Http body size is too huge: " << content_len << " > " << maxReqSize
+            WarnL << "Http body size is too huge: " << content_len << " > " << _max_req_size
                  << ", please set " << Http::kMaxReqSize << " in config.ini file.";
        }

@@ -176,11 +174,27 @@ void HttpSession::onError(const SockException &err) {
    }
 }

-void HttpSession::onManager() {
-    GET_CONFIG(uint32_t, keepAliveSec, Http::kKeepAliveSecond);
+void HttpSession::setTimeoutSec(size_t keep_alive_sec) {
+    if (!keep_alive_sec) {
+        GET_CONFIG(size_t, s_keep_alive_sec, Http::kKeepAliveSecond);
+        keep_alive_sec = s_keep_alive_sec;
+    }
+    _keep_alive_sec = keep_alive_sec;
+    getSock()->setSendTimeOutSecond(keep_alive_sec);
+}

-    if (_ticker.elapsedTime() > keepAliveSec * 1000) {
-        // 1分钟超时
+void HttpSession::setMaxReqSize(size_t max_req_size) {
+    if (!max_req_size) {
+        GET_CONFIG(size_t, s_max_req_size, Http::kMaxReqSize);
+        max_req_size = s_max_req_size;
+    }
+    _max_req_size = max_req_size;
+    setMaxCacheSize(max_req_size);
+}
+
+void HttpSession::onManager() {
+    if (_ticker.elapsedTime() > _keep_alive_sec * 1000) {
+        //http超时
        shutdown(SockException(Err_timeout, "session timeout"));
    }
 }
@@ -509,7 +523,6 @@ public:
        _body = body;
        _close_when_complete = close_when_complete;
    }
-    ~AsyncSenderData() = default;

 private:
    std::weak_ptr<HttpSession> _session;
--- a/src/Http/HttpSession.h
+++ b/src/Http/HttpSession.h
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
+ * Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 *
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
@@ -40,12 +40,13 @@ public:
    using HttpAccessPathInvoker = std::function<void(const std::string &errMsg,const std::string &accessPath, int cookieLifeSecond)>;

    HttpSession(const toolkit::Socket::Ptr &pSock);
-    ~HttpSession() override;

    void onRecv(const toolkit::Buffer::Ptr &) override;
    void onError(const toolkit::SockException &err) override;
    void onManager() override;
    static std::string urlDecode(const std::string &str);
+    void setTimeoutSec(size_t second);
+    void setMaxReqSize(size_t max_req_size);

 protected:
    //FlvMuxer override
@@ -129,6 +130,10 @@ protected:
 private:
    bool _is_live_stream = false;
    bool _live_over_websocket = false;
+    //超时时间
+    size_t _keep_alive_sec = 0;
+    //最大http请求字节大小
+    size_t _max_req_size = 0;
    //消耗的总流量
    uint64_t _total_bytes_usage = 0;
    Parser _parser;
--- a/src/Http/HttpTSPlayer.cpp
+++ b/src/Http/HttpTSPlayer.cpp
@@ -1,9 +1,9 @@
 /*
 * Copyright (c) 2020 The ZLMediaKit project authors. All Rights Reserved.
 *
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
--- a/src/Http/HttpTSPlayer.h
+++ b/src/Http/HttpTSPlayer.h
@@ -1,9 +1,9 @@
 /*
 * Copyright (c) 2020 The ZLMediaKit project authors. All Rights Reserved.
 *
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
@@ -24,7 +24,6 @@ public:
    using onComplete = std::function<void(const toolkit::SockException &)>;

    HttpTSPlayer(const toolkit::EventPoller::Ptr &poller = nullptr);
-    ~HttpTSPlayer() override = default;

    /**
     * 设置下载完毕或异常断开回调
--- a/src/Http/TsPlayer.cpp
+++ b/src/Http/TsPlayer.cpp
@@ -1,9 +1,9 @@
 /*
 * Copyright (c) 2020 The ZLMediaKit project authors. All Rights Reserved.
 * Created by alex on 2021/4/6.
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
--- a/src/Http/TsPlayer.h
+++ b/src/Http/TsPlayer.h
@@ -1,9 +1,9 @@
 /*
 * Copyright (c) 2020 The ZLMediaKit project authors. All Rights Reserved.
 * Created by alex on 2021/4/6.
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
@@ -19,7 +19,6 @@ namespace mediakit {
 class TsPlayer : public HttpTSPlayer, public PlayerBase {
 public:
    TsPlayer(const toolkit::EventPoller::Ptr &poller);
-    ~TsPlayer() override = default;

    /**
     * 开始播放
--- a/src/Http/TsPlayerImp.h
+++ b/src/Http/TsPlayerImp.h
@@ -1,9 +1,9 @@
 /*
 * Copyright (c) 2020 The ZLMediaKit project authors. All Rights Reserved.
 * Created by alex on 2021/4/6.
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
@@ -21,7 +21,6 @@ public:
    using Ptr = std::shared_ptr<TsPlayerImp>;

    TsPlayerImp(const toolkit::EventPoller::Ptr &poller = nullptr);
-    ~TsPlayerImp() override = default;

 private:
    //// TsPlayer override////
--- a/src/Http/TsplayerImp.cpp
+++ b/src/Http/TsplayerImp.cpp
@@ -1,9 +1,9 @@
 /*
 * Copyright (c) 2020 The ZLMediaKit project authors. All Rights Reserved.
 * Created by alex on 2021/4/6.
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
--- a/src/Http/WebSocketClient.h
+++ b/src/Http/WebSocketClient.h
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
+ * Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 *
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
@@ -37,9 +37,7 @@ public:

    template <typename... ArgsType>
    ClientTypeImp(ArgsType &&...args) : ClientType(std::forward<ArgsType>(args)...) {}
-    ~ClientTypeImp() override  = default;

-protected:
    /**
     * 发送前拦截并打包为websocket协议
     */
@@ -50,6 +48,7 @@ protected:
        return ClientType::send(std::move(buf));
    }

+protected:
    /**
     * 设置发送数据截取回调函数
     * @param cb 截取回调函数
@@ -74,7 +73,6 @@ public:
        _Sec_WebSocket_Key = encodeBase64(toolkit::makeRandStr(16, false));
        setPoller(delegate->getPoller());
    }
-    ~HttpWsClient() = default;

    /**
     * 发起ws握手
--- a/src/Http/WebSocketSession.h
+++ b/src/Http/WebSocketSession.h
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
+ * Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 *
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
@@ -21,7 +21,6 @@ class SendInterceptor{
 public:
    using onBeforeSendCB =std::function<ssize_t (const toolkit::Buffer::Ptr &buf)>;

-    SendInterceptor() = default;
    virtual ~SendInterceptor() = default;
    virtual void setOnBeforeSendCB(const onBeforeSendCB &cb) = 0;
 };
@@ -38,8 +37,6 @@ public:
    SessionTypeImp(const mediakit::Parser &header, const mediakit::HttpSession &parent, const toolkit::Socket::Ptr &pSock) :
            SessionType(pSock) {}

-    ~SessionTypeImp() = default;
-
    /**
     * 设置发送数据截取回调函数
     * @param cb 截取回调函数
@@ -82,7 +79,6 @@ template<typename Creator, typename HttpSessionType = mediakit::HttpSession, med
 class WebSocketSessionBase : public HttpSessionType {
 public:
    WebSocketSessionBase(const toolkit::Socket::Ptr &pSock) : HttpSessionType(pSock){}
-    virtual ~WebSocketSessionBase() = default;

    //收到eof或其他导致脱离TcpServer事件的回调
    void onError(const toolkit::SockException &err) override{
@@ -249,7 +245,6 @@ template<typename SessionType,typename HttpSessionType = mediakit::HttpSession,
 class WebSocketSession : public WebSocketSessionBase<SessionCreator<SessionType>,HttpSessionType,DataType>{
 public:
    WebSocketSession(const toolkit::Socket::Ptr &pSock) : WebSocketSessionBase<SessionCreator<SessionType>,HttpSessionType,DataType>(pSock){}
-    virtual ~WebSocketSession() = default;
 };

 #endif //ZLMEDIAKIT_WEBSOCKETSESSION_H
--- a/src/Http/WebSocketSplitter.cpp
+++ b/src/Http/WebSocketSplitter.cpp
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
+ * Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 *
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
--- a/src/Http/WebSocketSplitter.h
+++ b/src/Http/WebSocketSplitter.h
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
+ * Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 *
- * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
 *
- * Use of this source code is governed by MIT license that can be found in the
+ * Use of this source code is governed by MIT-like license that can be found in the
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
@@ -51,6 +51,7 @@ public:
        //根据内存地址设置掩码随机数
        _mask.assign((uint8_t*)(&ptr), (uint8_t*)(&ptr) + 4);
    }
+
    virtual ~WebSocketHeader() = default;

 public:
@@ -71,8 +72,6 @@ public:
    WebSocketBuffer(WebSocketHeader::Type headType, bool fin, ARGS &&...args)
            :  toolkit::BufferString(std::forward<ARGS>(args)...), _fin(fin), _head_type(headType){}

-    ~WebSocketBuffer() override = default;
-
    WebSocketHeader::Type headType() const { return _head_type; }

    bool isFinished() const { return _fin; };
@@ -84,9 +83,6 @@ private:

 class WebSocketSplitter : public WebSocketHeader{
 public:
-    WebSocketSplitter() = default;
-    virtual ~WebSocketSplitter() = default;
-
    /**
     * 输入数据以便解包webSocket数据以及处理粘包问题
     * 可能触发onWebSocketDecodeHeader和onWebSocketDecodePayload回调