diff --git a/trunk/conf/compatible.conf b/trunk/conf/compatible.conf index a8e2a56f0..91632df12 100644 --- a/trunk/conf/compatible.conf +++ b/trunk/conf/compatible.conf @@ -7,7 +7,7 @@ daemon off; http_api { enabled on; listen 1985; - crossdomain on; + #crossdomain on; raw_api { enabled on; allow_reload on; diff --git a/trunk/conf/full.conf b/trunk/conf/full.conf index 76a2be853..1882b754e 100644 --- a/trunk/conf/full.conf +++ b/trunk/conf/full.conf @@ -180,12 +180,18 @@ stream_caster { caster mpegts_over_udp; # the output rtmp url. # for mpegts_over_udp caster, the typically output url: - # rtmp://127.0.0.1/live/livestream + # rtmp://127.0.0.1/live/livestream # for rtsp caster, the typically output url: - # rtmp://127.0.0.1/[app]/[stream] + # rtmp://127.0.0.1/[app]/[stream] # for example, the rtsp url: # rtsp://192.168.1.173:8544/live/livestream.sdp - # where the [app] is "live" and [stream] is "livestream", output is: + # where the [app] is "live" and [stream] is "livestream", output is: + # rtmp://127.0.0.1/live/livestream + # for flv caster, the typically output url: + # rtmp://127.0.0.1/[app]/[stream] + # for example, POST to url: + # http://127.0.0.1:8936/live/livestream.flv + # where the [app] is "live" and [stream] is "livestream", output is: # rtmp://127.0.0.1/live/livestream output rtmp://127.0.0.1/live/livestream; # the listen port for stream caster. diff --git a/trunk/conf/full.one.vhost.conf b/trunk/conf/full.one.vhost.conf index 820dc875f..5e0a21c13 100644 --- a/trunk/conf/full.one.vhost.conf +++ b/trunk/conf/full.one.vhost.conf @@ -1,4 +1,4 @@ -listen 1935; +listen 1935 1936; pid ./objs/srs.pid; chunk_size 60000; ff_log_dir ./objs; diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp index f5424f3ad..7b87884f4 100644 --- a/trunk/src/app/srs_app_config.cpp +++ b/trunk/src/app/srs_app_config.cpp @@ -1509,7 +1509,19 @@ int SrsConfig::global_to_json(SrsAmf0Object* obj) } else if (sdir->name == "crossdomain") { sobj->set(sdir->name, sdir->dumps_arg0_to_boolean()); } else if (sdir->name == "raw_api") { - sobj->set(sdir->name, SrsAmf0Any::boolean(get_raw_api())); + SrsAmf0Object* ssobj = SrsAmf0Any::object(); + sobj->set(sdir->name, ssobj); + + for (int j = 0; j < (int)sdir->directives.size(); j++) { + SrsConfDirective* ssdir = sdir->directives.at(j); + if (ssdir->name == "enabled") { + 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_query") { + ssobj->set(ssdir->name, ssdir->dumps_arg0_to_boolean()); + } + } } } obj->set(dir->name, sobj);