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/modules | |
| 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/modules')
| -rw-r--r-- | auto/modules | 5 |
1 files changed, 5 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" |