Mercurial > hg > nginx

comparison auto/modules @ 4169:432243531ce3 stable-1.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Igor Sysoev <igor@sysoev.ru>
date Fri, 30 Sep 2011 15:13:47 +0000
parents 9c057d5e1c27
children b2e21a39307c 4919fb357a5d
comparison
equal deleted inserted replaced
4168:795761886688 4169:432243531ce3
332 if [ $HTTP_FLV = YES ]; then 332 if [ $HTTP_FLV = YES ]; then
333 HTTP_MODULES="$HTTP_MODULES $HTTP_FLV_MODULE" 333 HTTP_MODULES="$HTTP_MODULES $HTTP_FLV_MODULE"
334 HTTP_SRCS="$HTTP_SRCS $HTTP_FLV_SRCS" 334 HTTP_SRCS="$HTTP_SRCS $HTTP_FLV_SRCS"
335 fi 335 fi
336 336
337 if [ $HTTP_MP4 = YES ]; then
338 HTTP_MODULES="$HTTP_MODULES $HTTP_MP4_MODULE"
339 HTTP_SRCS="$HTTP_SRCS $HTTP_MP4_SRCS"
340 fi
341
337 if [ $HTTP_UPSTREAM_IP_HASH = YES ]; then 342 if [ $HTTP_UPSTREAM_IP_HASH = YES ]; then
338 HTTP_MODULES="$HTTP_MODULES $HTTP_UPSTREAM_IP_HASH_MODULE" 343 HTTP_MODULES="$HTTP_MODULES $HTTP_UPSTREAM_IP_HASH_MODULE"
339 HTTP_SRCS="$HTTP_SRCS $HTTP_UPSTREAM_IP_HASH_SRCS" 344 HTTP_SRCS="$HTTP_SRCS $HTTP_UPSTREAM_IP_HASH_SRCS"
340 fi 345 fi
341 346