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

move wiki images to srs.release

Browse source
This commit is contained in:
winlin 2014-03-31 11:35:00 +08:00
parent 27029679e9
commit c7a4dd8863
5 changed files with 65 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/3rdparty/gprof/build_gprof2dot.sh vendored
View file

@ -10,7 +10,7 @@ fi
sudo echo "ok" > /dev/null 2>&1; sudo echo "ok" > /dev/null 2>&1;
ret=$?; if [[ 0 -ne ${ret} ]]; then echo "you must be sudoer"; exit 1; fi 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 cd graphviz-2.36.0 && ./configure && make && sudo make install
ret=$?; if [[ $ret -ne 0 ]]; then echo "build gprof2dot failed."; exit $ret; fi ret=$?; if [[ $ret -ne 0 ]]; then echo "build gprof2dot failed."; exit $ret; fi

BIN
trunk/3rdparty/gprof/winlin.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 120 KiB

8
trunk/conf/console.conf Normal file → Executable file
View file

@ -4,5 +4,13 @@
listen 1935; listen 1935;
daemon off; daemon off;
srs_log_tank console; srs_log_tank console;
http_api {
enabled on;
listen 1985;
}
http_stream {
enabled on;
listen 8080;
}
vhost __defaultVhost__ { vhost __defaultVhost__ {
} }

BIN
trunk/doc/wiki/FMLE.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 40 KiB

7
trunk/src/app/srs_app_http_conn.cpp Normal file → Executable file
View file

@ -45,5 +45,12 @@ int SrsHttpConn::do_cycle()
} }
srs_trace("http get peer ip success. ip=%s", ip); 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; return ret;
} }