for #319, merge from 2.0release

10 years ago · a88f321d8b
parent c4feb8f6ed abd7ee227c
commit a88f321d8b
2 changed files with 3 additions and 3 deletions
--- a/trunk/src/app/srs_app_reload.cpp
+++ b/trunk/src/app/srs_app_reload.cpp
@ -40,12 +40,12 @@ int ISrsReloadHandler::on_reload_listen()
    return ERROR_SUCCESS;
 }

-int ISrsReloadHandler::on_reload_max_conns()
+int ISrsReloadHandler::on_reload_utc_time()
 {
    return ERROR_SUCCESS;
 }

-int ISrsReloadHandler::on_reload_utc_time()
+int ISrsReloadHandler::on_reload_max_conns()
 {
    return ERROR_SUCCESS;
 }
--- a/trunk/src/app/srs_app_reload.hpp
+++ b/trunk/src/app/srs_app_reload.hpp
@ -44,8 +44,8 @@ public:
    ISrsReloadHandler();
    virtual ~ISrsReloadHandler();
 public:
-    virtual int on_reload_max_conns();
    virtual int on_reload_utc_time();
+    virtual int on_reload_max_conns();
    virtual int on_reload_listen();
    virtual int on_reload_pid();
    virtual int on_reload_log_tank();