胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
d631882d 1 parent c78baedf

use nginx-1.5.7 for security hole fixed

内嵌 并排对比
正在显示 3 个修改的文件 包含 7 行增加 和 7 行删除
不能预览此文件类型
不能预览此文件类型
@@ -47,20 +47,20 @@ if [[ ! -f ${GLOBAL_DIR_OBJS}/http-parser-2.1/http_parser.h ]]; then echo "build @@ -47,20 +47,20 @@ if [[ ! -f ${GLOBAL_DIR_OBJS}/http-parser-2.1/http_parser.h ]]; then echo "build
47 if [[ ! -f ${GLOBAL_DIR_OBJS}/http-parser-2.1/libhttp_parser.a ]]; then echo "build http-parser-2.1 failed"; exit -1; fi 47 if [[ ! -f ${GLOBAL_DIR_OBJS}/http-parser-2.1/libhttp_parser.a ]]; then echo "build http-parser-2.1 failed"; exit -1; fi
48 48
49 # nginx for HLS, nginx-1.5.0 49 # nginx for HLS, nginx-1.5.0
50 -if [[ -f ${GLOBAL_DIR_OBJS}/nginx-1.5.0/_release/sbin/nginx ]]; then  
51 - echo "nginx-1.5.0 is ok."; 50 +if [[ -f ${GLOBAL_DIR_OBJS}/nginx-1.5.7/_release/sbin/nginx ]]; then
  51 + echo "nginx-1.5.7 is ok.";
52 else 52 else
53 - echo "build nginx-1.5.0"; 53 + echo "build nginx-1.5.7";
54 ( 54 (
55 - rm -rf ${GLOBAL_DIR_OBJS}/nginx-1.5.0 && cd ${GLOBAL_DIR_OBJS} &&  
56 - unzip -q ../3rdparty/nginx-1.5.0.zip && cd nginx-1.5.0 && 55 + rm -rf ${GLOBAL_DIR_OBJS}/nginx-1.5.7 && cd ${GLOBAL_DIR_OBJS} &&
  56 + unzip -q ../3rdparty/nginx-1.5.7.zip && cd nginx-1.5.7 &&
57 ./configure --prefix=`pwd`/_release && make && make install && 57 ./configure --prefix=`pwd`/_release && make && make install &&
58 ln -sf `pwd`/_release ../nginx 58 ln -sf `pwd`/_release ../nginx
59 ) 59 )
60 fi 60 fi
61 # check status 61 # check status
62 -ret=$?; if [[ $ret -ne 0 ]]; then echo "build nginx-1.5.0 failed, ret=$ret"; exit $ret; fi  
63 -if [ ! -f ${GLOBAL_DIR_OBJS}/nginx-1.5.0/_release/sbin/nginx ]; then echo "build nginx-1.5.0 failed."; exit -1; fi 62 +ret=$?; if [[ $ret -ne 0 ]]; then echo "build nginx-1.5.7 failed, ret=$ret"; exit $ret; fi
  63 +if [ ! -f ${GLOBAL_DIR_OBJS}/nginx-1.5.7/_release/sbin/nginx ]; then echo "build nginx-1.5.7 failed."; exit -1; fi
64 64
65 # use current user to config nginx, 65 # use current user to config nginx,
66 # srs will write ts/m3u8 file use current user, 66 # srs will write ts/m3u8 file use current user,