Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2013-12-26 09:50:10 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
b6280f3804c4d915648b4d023f119f7a42a02542
b6280f38
1 parent
c23b133f
jump nginx index to api-server, for ie crossdomain.
隐藏空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
5 行增加
和
6 行删除
trunk/auto/depends.sh
trunk/auto/depends.sh
查看文件 @
b6280f3
...
...
@@ -261,11 +261,8 @@ if [ $SRS_HLS = YES ]; then
ln -sf
`
pwd
`
/research/players/crossdomain.xml
${
SRS_OBJS
}
/nginx/html/crossdomain.xml
# override the default index.
cat
<<END > ${SRS_OBJS}/nginx/html/index.html
<script type="text/javascript">
window.location.href = "players/index.html";
</script>
END
rm -f
${
SRS_OBJS
}
/nginx/html/index.html
&&
ln -sf
`
pwd
`
/research/players/nginx_index.html
${
SRS_OBJS
}
/nginx/html/index.html
fi
if
[
$SRS_HLS
=
YES
]
;
then
...
...
@@ -302,7 +299,9 @@ fi
echo
"link players to cherrypy static-dir"
rm -f research/api-server/static-dir/players
&&
ln -sf
`
pwd
`
/research/players research/api-server/static-dir/players
ln -sf
`
pwd
`
/research/players research/api-server/static-dir/players
&&
rm -f research/api-server/static-dir/crossdomain.xml
&&
ln -sf
`
pwd
`
/research/players/crossdomain.xml research/api-server/static-dir/crossdomain.xml
#####################################################################################
# openssl, for rtmp complex handshake
...
...
请
注册
或
登录
后发表评论