external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

add keyword XCORE for coredump to identify the version. 2.0.207

Browse source
This commit is contained in:
winlin 2016-01-05 16:49:27 +08:00
parent dc38ae1687
commit 8155e97b84
4 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -338,6 +338,7 @@ Remark:
## History ## History
* v2.0, 2016-01-05, add keyword XCORE for coredump to identify the version. 2.0.207
* <strong>v2.0, 2015-12-23, [2.0 alpha3(2.0.205)][r2.0a3] released. 89544 lines.</strong> * <strong>v2.0, 2015-12-23, [2.0 alpha3(2.0.205)][r2.0a3] released. 89544 lines.</strong>
* v2.0, 2015-12-22, for [#509][bug #509] always alloc big object at heap. 2.0.205 * v2.0, 2015-12-22, for [#509][bug #509] always alloc big object at heap. 2.0.205
* v2.0, 2015-12-22, for [#418][bug #418] ignore null connect props to make RED5 happy. 2.0.204 * v2.0, 2015-12-22, for [#418][bug #418] ignore null connect props to make RED5 happy. 2.0.204

5
trunk/src/app/srs_app_config.cpp
View file

@ -49,6 +49,9 @@ using namespace std;
using namespace _srs_internal; using namespace _srs_internal;
// the version to identify the core.
const char* _srs_version = "XCORE-"RTMP_SIG_SRS_SERVER;
#define SRS_WIKI_URL_LOG "https://github.com/ossrs/srs/wiki/v1_CN_SrsLog" #define SRS_WIKI_URL_LOG "https://github.com/ossrs/srs/wiki/v1_CN_SrsLog"
// when user config an invalid value, macros to perfer true or false. // when user config an invalid value, macros to perfer true or false.
@ -1360,7 +1363,7 @@ int SrsConfig::parse_options(int argc, char** argv)
} }
// first hello message. // first hello message.
srs_trace(RTMP_SIG_SRS_SERVER); srs_trace(_srs_version);
if (config_file.empty()) { if (config_file.empty()) {
ret = ERROR_SYSTEM_CONFIG_INVALID; ret = ERROR_SYSTEM_CONFIG_INVALID;

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 2 #define VERSION_MAJOR 2
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#define VERSION_REVISION 206 #define VERSION_REVISION 207
// generated by configure, only macros. // generated by configure, only macros.
#include <srs_auto_headers.hpp> #include <srs_auto_headers.hpp>

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

@ -54,6 +54,8 @@ ISrsThreadContext* _srs_context = new SrsThreadContext();
// app module. // app module.
SrsConfig* _srs_config = new SrsConfig(); SrsConfig* _srs_config = new SrsConfig();
SrsServer* _srs_server = new SrsServer(); SrsServer* _srs_server = new SrsServer();
// version of srs, which can grep keyword "XCORE"
extern const char* _srs_version;
/** /**
* show the features by macro, the actual macro values. * show the features by macro, the actual macro values.