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

rename the config_query to query

Browse source
This commit is contained in:
winlin 2015-08-28 13:01:04 +08:00
parent 75ca759e5d
commit f167616379
5 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1831,7 +1831,7 @@ int SrsConfig::raw_to_json(SrsAmf0Object* obj)
ssobj->set(ssdir->name, ssdir->dumps_arg0_to_boolean());
} else if (ssdir->name == "allow_reload") {
ssobj->set(ssdir->name, ssdir->dumps_arg0_to_boolean());
} else if (ssdir->name == "allow_config_query") {
} else if (ssdir->name == "allow_query") {
ssobj->set(ssdir->name, ssdir->dumps_arg0_to_boolean());
}
}
@ -2019,7 +2019,7 @@ int SrsConfig::check_config()
if (n == "raw_api") {
for (int j = 0; j < (int)obj->directives.size(); j++) {
string m = obj->at(j)->name;
if (m != "enabled" && m != "allow_reload" && m != "allow_config_query") {
if (m != "enabled" && m != "allow_reload" && m != "allow_query") {
ret = ERROR_SYSTEM_CONFIG_INVALID;
srs_error("unsupported http_api.raw_api directive %s, ret=%d", m.c_str(), ret);
return ret;
@ -4647,7 +4647,7 @@ bool SrsConfig::get_raw_api_allow_reload()
return SRS_CONF_PERFER_FALSE(conf->arg0());
}
bool SrsConfig::get_raw_api_allow_config_query()
bool SrsConfig::get_raw_api_allow_query()
{
static bool DEFAULT = false;
@ -4661,7 +4661,7 @@ bool SrsConfig::get_raw_api_allow_config_query()
return DEFAULT;
}
conf = conf->get("allow_config_query");
conf = conf->get("allow_query");
if (!conf || conf->arg0().empty()) {
return DEFAULT;
}