Mercurial > hg > nginx
comparison auto/sources @ 4169:432243531ce3 stable-1.0
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 |
---|---|
461 | 461 |
462 HTTP_FLV_MODULE=ngx_http_flv_module | 462 HTTP_FLV_MODULE=ngx_http_flv_module |
463 HTTP_FLV_SRCS=src/http/modules/ngx_http_flv_module.c | 463 HTTP_FLV_SRCS=src/http/modules/ngx_http_flv_module.c |
464 | 464 |
465 | 465 |
466 HTTP_MP4_MODULE=ngx_http_mp4_module | |
467 HTTP_MP4_SRCS=src/http/modules/ngx_http_mp4_module.c | |
468 | |
469 | |
466 HTTP_GZIP_STATIC_MODULE=ngx_http_gzip_static_module | 470 HTTP_GZIP_STATIC_MODULE=ngx_http_gzip_static_module |
467 HTTP_GZIP_STATIC_SRCS=src/http/modules/ngx_http_gzip_static_module.c | 471 HTTP_GZIP_STATIC_SRCS=src/http/modules/ngx_http_gzip_static_module.c |
468 | 472 |
469 | 473 |
470 HTTP_UPSTREAM_IP_HASH_MODULE=ngx_http_upstream_ip_hash_module | 474 HTTP_UPSTREAM_IP_HASH_MODULE=ngx_http_upstream_ip_hash_module |