Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
r4106, r4107, r4108, r4113, r4156, r4157: *) ngx_http_mp4_module. *) "video/mp4" mime type added.
This commit is contained in:
parent
a92fa3b1db
commit
1ab2343cc4
|
@ -334,6 +334,11 @@ if [ $HTTP_FLV = YES ]; then
|
|||
HTTP_SRCS="$HTTP_SRCS $HTTP_FLV_SRCS"
|
||||
fi
|
||||
|
||||
if [ $HTTP_MP4 = YES ]; then
|
||||
HTTP_MODULES="$HTTP_MODULES $HTTP_MP4_MODULE"
|
||||
HTTP_SRCS="$HTTP_SRCS $HTTP_MP4_SRCS"
|
||||
fi
|
||||
|
||||
if [ $HTTP_UPSTREAM_IP_HASH = YES ]; then
|
||||
HTTP_MODULES="$HTTP_MODULES $HTTP_UPSTREAM_IP_HASH_MODULE"
|
||||
HTTP_SRCS="$HTTP_SRCS $HTTP_UPSTREAM_IP_HASH_SRCS"
|
||||
|
|
|
@ -92,6 +92,7 @@ HTTP_BROWSER=YES
|
|||
HTTP_SECURE_LINK=NO
|
||||
HTTP_DEGRADATION=NO
|
||||
HTTP_FLV=NO
|
||||
HTTP_MP4=NO
|
||||
HTTP_GZIP_STATIC=NO
|
||||
HTTP_UPSTREAM_IP_HASH=YES
|
||||
|
||||
|
@ -201,6 +202,7 @@ do
|
|||
--with-http_sub_module) HTTP_SUB=YES ;;
|
||||
--with-http_dav_module) HTTP_DAV=YES ;;
|
||||
--with-http_flv_module) HTTP_FLV=YES ;;
|
||||
--with-http_mp4_module) HTTP_MP4=YES ;;
|
||||
--with-http_gzip_static_module) HTTP_GZIP_STATIC=YES ;;
|
||||
--with-http_random_index_module) HTTP_RANDOM_INDEX=YES ;;
|
||||
--with-http_secure_link_module) HTTP_SECURE_LINK=YES ;;
|
||||
|
@ -336,6 +338,7 @@ cat << END
|
|||
--with-http_sub_module enable ngx_http_sub_module
|
||||
--with-http_dav_module enable ngx_http_dav_module
|
||||
--with-http_flv_module enable ngx_http_flv_module
|
||||
--with-http_mp4_module enable ngx_http_mp4_module
|
||||
--with-http_gzip_static_module enable ngx_http_gzip_static_module
|
||||
--with-http_random_index_module enable ngx_http_random_index_module
|
||||
--with-http_secure_link_module enable ngx_http_secure_link_module
|
||||
|
|
|
@ -463,6 +463,10 @@ HTTP_FLV_MODULE=ngx_http_flv_module
|
|||
HTTP_FLV_SRCS=src/http/modules/ngx_http_flv_module.c
|
||||
|
||||
|
||||
HTTP_MP4_MODULE=ngx_http_mp4_module
|
||||
HTTP_MP4_SRCS=src/http/modules/ngx_http_mp4_module.c
|
||||
|
||||
|
||||
HTTP_GZIP_STATIC_MODULE=ngx_http_gzip_static_module
|
||||
HTTP_GZIP_STATIC_SRCS=src/http/modules/ngx_http_gzip_static_module.c
|
||||
|
||||
|
|
|
@ -65,6 +65,7 @@ types {
|
|||
audio/x-realaudio ra;
|
||||
|
||||
video/3gpp 3gpp 3gp;
|
||||
video/mp4 mp4;
|
||||
video/mpeg mpeg mpg;
|
||||
video/quicktime mov;
|
||||
video/x-flv flv;
|
||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue