external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

for bug #159: postpone the http server bug to 2.0+

Browse source
This commit is contained in:
winlin 2014-09-30 16:34:46 +08:00
parent 67188dcee7
commit 967de9d2e7
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
trunk/src/core/srs_core.hpp
View file

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version // current release version
#define VERSION_MAJOR "0" #define VERSION_MAJOR "0"
#define VERSION_MINOR "9" #define VERSION_MINOR "9"
#define VERSION_REVISION "220" #define VERSION_REVISION "221"
#define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
// server info. // server info.
#define RTMP_SIG_SRS_KEY "SRS" #define RTMP_SIG_SRS_KEY "SRS"

6
trunk/src/main/srs_main_server.cpp
View file

@ -191,6 +191,12 @@ int main(int argc, char** argv)
// features // features
show_macro_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, * we do nothing in the constructor of server,
* and use initialize to create members, set hooks for instance the reload handler, * and use initialize to create members, set hooks for instance the reload handler,