From 967de9d2e7f4d8dfb3ef6adc0244b81b63d92fe2 Mon Sep 17 00:00:00 2001 From: winlin Date: Tue, 30 Sep 2014 16:34:46 +0800 Subject: [PATCH] for bug #159: postpone the http server bug to 2.0+ --- trunk/src/core/srs_core.hpp | 2 +- trunk/src/main/srs_main_server.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 2271d486a..e0ed138b6 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 "220" +#define VERSION_REVISION "221" #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION // server info. #define RTMP_SIG_SRS_KEY "SRS" diff --git a/trunk/src/main/srs_main_server.cpp b/trunk/src/main/srs_main_server.cpp index 1e82ed8ec..ab0a0deb9 100644 --- a/trunk/src/main/srs_main_server.cpp +++ b/trunk/src/main/srs_main_server.cpp @@ -190,6 +190,12 @@ int main(int argc, char** argv) // features show_macro_features(); + + // for special features. +#ifdef SRS_AUTO_HTTP_SERVER + srs_warn("http server is dev feature, " + "@see https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPServer#feature"); +#endif /** * we do nothing in the constructor of server,