diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2011-09-30 15:13:47 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2011-09-30 15:13:47 +0000 |
| commit | 9855e45c2c7b807c2b1e53ee35ef4fac2ac2f02b (patch) | |
| tree | c0fc3d769067d7356e5b266858aa71e4c2978bd8 /auto | |
| parent | f358278a69d049dc7b5d034005837d08435627ea (diff) | |
| download | nginx-9855e45c2c7b807c2b1e53ee35ef4fac2ac2f02b.tar.gz nginx-9855e45c2c7b807c2b1e53ee35ef4fac2ac2f02b.tar.bz2 | |
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.
Diffstat (limited to 'auto')
| -rw-r--r-- | auto/modules | 5 | ||||
| -rw-r--r-- | auto/options | 3 | ||||
| -rw-r--r-- | auto/sources | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/auto/modules b/auto/modules index 80c557c2b..b13bcb25b 100644 --- a/auto/modules +++ b/auto/modules @@ -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" diff --git a/auto/options b/auto/options index 20233eb52..f30917c89 100644 --- a/auto/options +++ b/auto/options @@ -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 diff --git a/auto/sources b/auto/sources index 0ab99440c..00ec7b3d4 100644 --- a/auto/sources +++ b/auto/sources @@ -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 |