From cfee761899ea3902c935a4f55efd2c54f469a5b8 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sun, 13 Apr 2014 13:35:03 +0800
Subject: [PATCH] support full reload. change to 0.9.60

---
 trunk/src/app/srs_app_config.cpp | 10 +++++++---
 trunk/src/core/srs_core.hpp      |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp
index 7883ebe86..b697a9f98 100644
--- a/trunk/src/app/srs_app_config.cpp
+++ b/trunk/src/app/srs_app_config.cpp
@@ -493,6 +493,13 @@ int SrsConfig::reload()
     // merge config.
     std::vector<ISrsReloadHandler*>::iterator it;
 
+    // never support reload:
+    //      daemon
+    //
+    // always support reload without additional code:
+    //      chunk_size, ff_log_dir, max_connections,
+    //      bandcheck, http_hooks
+
     // merge config: listen
     if (!srs_directive_equals(root->get("listen"), old_root->get("listen"))) {
         for (it = subscribes.begin(); it != subscribes.end(); ++it) {
@@ -552,9 +559,6 @@ int SrsConfig::reload()
         }
         srs_trace("reload srs_log_file success.");
     }
-
-    // directly supported for reload:
-    // chunk_size, ff_log_dir, max_connections
     
     // merge config: pithy_print
     if (!srs_directive_equals(root->get("pithy_print"), old_root->get("pithy_print"))) {
diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp
index 7bee1a90b..401542e44 100644
--- a/trunk/src/core/srs_core.hpp
+++ b/trunk/src/core/srs_core.hpp
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // current release version
 #define VERSION_MAJOR "0"
 #define VERSION_MINOR "9"
-#define VERSION_REVISION "59"
+#define VERSION_REVISION "60"
 #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
 // server info.
 #define RTMP_SIG_SRS_KEY "srs"