diff --git a/trunk/3rdparty/gprof/build_gprof2dot.sh b/trunk/3rdparty/gprof/build_gprof2dot.sh index 43c143710..c8a53ff6d 100755 --- a/trunk/3rdparty/gprof/build_gprof2dot.sh +++ b/trunk/3rdparty/gprof/build_gprof2dot.sh @@ -10,7 +10,7 @@ fi sudo echo "ok" > /dev/null 2>&1; ret=$?; if [[ 0 -ne ${ret} ]]; then echo "you must be sudoer"; exit 1; fi -tar xf graphviz-2.36.0.zip +unzip -q graphviz-2.36.0.zip cd graphviz-2.36.0 && ./configure && make && sudo make install ret=$?; if [[ $ret -ne 0 ]]; then echo "build gprof2dot failed."; exit $ret; fi diff --git a/trunk/3rdparty/gprof/winlin.png b/trunk/3rdparty/gprof/winlin.png deleted file mode 100644 index 23a629d74..000000000 Binary files a/trunk/3rdparty/gprof/winlin.png and /dev/null differ diff --git a/trunk/conf/console.conf b/trunk/conf/console.conf old mode 100644 new mode 100755 index 5cff76564..ad5ddcc1a --- a/trunk/conf/console.conf +++ b/trunk/conf/console.conf @@ -4,5 +4,13 @@ listen 1935; daemon off; srs_log_tank console; +http_api { + enabled on; + listen 1985; +} +http_stream { + enabled on; + listen 8080; +} vhost __defaultVhost__ { } diff --git a/trunk/doc/wiki/FMLE.png b/trunk/doc/wiki/FMLE.png deleted file mode 100644 index 6c12f3d7b..000000000 Binary files a/trunk/doc/wiki/FMLE.png and /dev/null differ diff --git a/trunk/src/app/srs_app_http_conn.cpp b/trunk/src/app/srs_app_http_conn.cpp old mode 100644 new mode 100755 index 529aa1f53..d3f07b581 --- a/trunk/src/app/srs_app_http_conn.cpp +++ b/trunk/src/app/srs_app_http_conn.cpp @@ -1,49 +1,56 @@ -/* -The MIT License (MIT) - -Copyright (c) 2013-2014 winlin - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*/ - -#include - -#include -#include - -SrsHttpConn::SrsHttpConn(SrsServer* srs_server, st_netfd_t client_stfd) - : SrsConnection(srs_server, client_stfd) -{ -} - -SrsHttpConn::~SrsHttpConn() -{ -} - -int SrsHttpConn::do_cycle() -{ - int ret = ERROR_SUCCESS; - - if ((ret = get_peer_ip()) != ERROR_SUCCESS) { - srs_error("get peer ip failed. ret=%d", ret); - return ret; - } - srs_trace("http get peer ip success. ip=%s", ip); - - return ret; -} +/* +The MIT License (MIT) + +Copyright (c) 2013-2014 winlin + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +*/ + +#include + +#include +#include + +SrsHttpConn::SrsHttpConn(SrsServer* srs_server, st_netfd_t client_stfd) + : SrsConnection(srs_server, client_stfd) +{ +} + +SrsHttpConn::~SrsHttpConn() +{ +} + +int SrsHttpConn::do_cycle() +{ + int ret = ERROR_SUCCESS; + + if ((ret = get_peer_ip()) != ERROR_SUCCESS) { + srs_error("get peer ip failed. ret=%d", ret); + return ret; + } + srs_trace("http get peer ip success. ip=%s", ip); + + char data[] = "HTTP/1.1 200 OK\r\n" + "Server: SRS/"RTMP_SIG_SRS_VERSION"\r\n" + "Content-Length: 11\r\n" + "Content-Type: text/html;charset=utf-8\r\n\r\n" + "hello http~"; + st_write(stfd, data, sizeof(data), -1); + + return ret; +}