Kouhei Sutou
null+****@clear*****
Tue Jan 26 10:27:00 JST 2016
Kouhei Sutou 2016-01-26 10:27:00 +0900 (Tue, 26 Jan 2016) New Revision: ae58fe4c9c07a09fbd72529123ba043653e8d4ac https://github.com/groonga/groonga/commit/ae58fe4c9c07a09fbd72529123ba043653e8d4ac Message: Update nginx 1.9.7 -> 1.9.9 ^ Added files: vendor/nginx-1.9.9/src/http/modules/ngx_http_slice_filter_module.c Modified files: nginx_version Renamed files: vendor/nginx-1.9.9/auto/cc/acc (from vendor/nginx-1.9.7/auto/cc/acc) vendor/nginx-1.9.9/auto/cc/bcc (from vendor/nginx-1.9.7/auto/cc/bcc) vendor/nginx-1.9.9/auto/cc/ccc (from vendor/nginx-1.9.7/auto/cc/ccc) vendor/nginx-1.9.9/auto/cc/clang (from vendor/nginx-1.9.7/auto/cc/clang) vendor/nginx-1.9.9/auto/cc/conf (from vendor/nginx-1.9.7/auto/cc/conf) vendor/nginx-1.9.9/auto/cc/gcc (from vendor/nginx-1.9.7/auto/cc/gcc) vendor/nginx-1.9.9/auto/cc/icc (from vendor/nginx-1.9.7/auto/cc/icc) vendor/nginx-1.9.9/auto/cc/msvc (from vendor/nginx-1.9.7/auto/cc/msvc) vendor/nginx-1.9.9/auto/cc/name (from vendor/nginx-1.9.7/auto/cc/name) vendor/nginx-1.9.9/auto/cc/owc (from vendor/nginx-1.9.7/auto/cc/owc) vendor/nginx-1.9.9/auto/cc/sunc (from vendor/nginx-1.9.7/auto/cc/sunc) vendor/nginx-1.9.9/auto/configure (from vendor/nginx-1.9.7/auto/configure) vendor/nginx-1.9.9/auto/define (from vendor/nginx-1.9.7/auto/define) vendor/nginx-1.9.9/auto/endianness (from vendor/nginx-1.9.7/auto/endianness) vendor/nginx-1.9.9/auto/feature (from vendor/nginx-1.9.7/auto/feature) vendor/nginx-1.9.9/auto/have (from vendor/nginx-1.9.7/auto/have) vendor/nginx-1.9.9/auto/have_headers (from vendor/nginx-1.9.7/auto/have_headers) vendor/nginx-1.9.9/auto/headers (from vendor/nginx-1.9.7/auto/headers) vendor/nginx-1.9.9/auto/include (from vendor/nginx-1.9.7/auto/include) vendor/nginx-1.9.9/auto/init (from vendor/nginx-1.9.7/auto/init) vendor/nginx-1.9.9/auto/install (from vendor/nginx-1.9.7/auto/install) vendor/nginx-1.9.9/auto/lib/conf (from vendor/nginx-1.9.7/auto/lib/conf) vendor/nginx-1.9.9/auto/lib/geoip/conf (from vendor/nginx-1.9.7/auto/lib/geoip/conf) vendor/nginx-1.9.9/auto/lib/google-perftools/conf (from vendor/nginx-1.9.7/auto/lib/google-perftools/conf) vendor/nginx-1.9.9/auto/lib/libatomic/conf (from vendor/nginx-1.9.7/auto/lib/libatomic/conf) vendor/nginx-1.9.9/auto/lib/libatomic/make (from vendor/nginx-1.9.7/auto/lib/libatomic/make) vendor/nginx-1.9.9/auto/lib/libgd/conf (from vendor/nginx-1.9.7/auto/lib/libgd/conf) vendor/nginx-1.9.9/auto/lib/libxslt/conf (from vendor/nginx-1.9.7/auto/lib/libxslt/conf) vendor/nginx-1.9.9/auto/lib/make (from vendor/nginx-1.9.7/auto/lib/make) vendor/nginx-1.9.9/auto/lib/md5/conf (from vendor/nginx-1.9.7/auto/lib/md5/conf) vendor/nginx-1.9.9/auto/lib/md5/make (from vendor/nginx-1.9.7/auto/lib/md5/make) vendor/nginx-1.9.9/auto/lib/md5/makefile.bcc (from vendor/nginx-1.9.7/auto/lib/md5/makefile.bcc) vendor/nginx-1.9.9/auto/lib/md5/makefile.msvc (from vendor/nginx-1.9.7/auto/lib/md5/makefile.msvc) vendor/nginx-1.9.9/auto/lib/md5/makefile.owc (from vendor/nginx-1.9.7/auto/lib/md5/makefile.owc) vendor/nginx-1.9.9/auto/lib/openssl/conf (from vendor/nginx-1.9.7/auto/lib/openssl/conf) vendor/nginx-1.9.9/auto/lib/openssl/make (from vendor/nginx-1.9.7/auto/lib/openssl/make) vendor/nginx-1.9.9/auto/lib/openssl/makefile.bcc (from vendor/nginx-1.9.7/auto/lib/openssl/makefile.bcc) vendor/nginx-1.9.9/auto/lib/openssl/makefile.msvc (from vendor/nginx-1.9.7/auto/lib/openssl/makefile.msvc) vendor/nginx-1.9.9/auto/lib/pcre/conf (from vendor/nginx-1.9.7/auto/lib/pcre/conf) vendor/nginx-1.9.9/auto/lib/pcre/make (from vendor/nginx-1.9.7/auto/lib/pcre/make) vendor/nginx-1.9.9/auto/lib/pcre/makefile.bcc (from vendor/nginx-1.9.7/auto/lib/pcre/makefile.bcc) vendor/nginx-1.9.9/auto/lib/pcre/makefile.msvc (from vendor/nginx-1.9.7/auto/lib/pcre/makefile.msvc) vendor/nginx-1.9.9/auto/lib/pcre/makefile.owc (from vendor/nginx-1.9.7/auto/lib/pcre/makefile.owc) vendor/nginx-1.9.9/auto/lib/perl/conf (from vendor/nginx-1.9.7/auto/lib/perl/conf) vendor/nginx-1.9.9/auto/lib/perl/make (from vendor/nginx-1.9.7/auto/lib/perl/make) vendor/nginx-1.9.9/auto/lib/sha1/conf (from vendor/nginx-1.9.7/auto/lib/sha1/conf) vendor/nginx-1.9.9/auto/lib/sha1/make (from vendor/nginx-1.9.7/auto/lib/sha1/make) vendor/nginx-1.9.9/auto/lib/sha1/makefile.bcc (from vendor/nginx-1.9.7/auto/lib/sha1/makefile.bcc) vendor/nginx-1.9.9/auto/lib/sha1/makefile.msvc (from vendor/nginx-1.9.7/auto/lib/sha1/makefile.msvc) vendor/nginx-1.9.9/auto/lib/sha1/makefile.owc (from vendor/nginx-1.9.7/auto/lib/sha1/makefile.owc) vendor/nginx-1.9.9/auto/lib/test (from vendor/nginx-1.9.7/auto/lib/test) vendor/nginx-1.9.9/auto/lib/zlib/conf (from vendor/nginx-1.9.7/auto/lib/zlib/conf) vendor/nginx-1.9.9/auto/lib/zlib/make (from vendor/nginx-1.9.7/auto/lib/zlib/make) vendor/nginx-1.9.9/auto/lib/zlib/makefile.bcc (from vendor/nginx-1.9.7/auto/lib/zlib/makefile.bcc) vendor/nginx-1.9.9/auto/lib/zlib/makefile.msvc (from vendor/nginx-1.9.7/auto/lib/zlib/makefile.msvc) vendor/nginx-1.9.9/auto/lib/zlib/makefile.owc (from vendor/nginx-1.9.7/auto/lib/zlib/makefile.owc) vendor/nginx-1.9.9/auto/make (from vendor/nginx-1.9.7/auto/make) vendor/nginx-1.9.9/auto/modules (from vendor/nginx-1.9.7/auto/modules) vendor/nginx-1.9.9/auto/nohave (from vendor/nginx-1.9.7/auto/nohave) vendor/nginx-1.9.9/auto/options (from vendor/nginx-1.9.7/auto/options) vendor/nginx-1.9.9/auto/os/conf (from vendor/nginx-1.9.7/auto/os/conf) vendor/nginx-1.9.9/auto/os/darwin (from vendor/nginx-1.9.7/auto/os/darwin) vendor/nginx-1.9.9/auto/os/freebsd (from vendor/nginx-1.9.7/auto/os/freebsd) vendor/nginx-1.9.9/auto/os/linux (from vendor/nginx-1.9.7/auto/os/linux) vendor/nginx-1.9.9/auto/os/solaris (from vendor/nginx-1.9.7/auto/os/solaris) vendor/nginx-1.9.9/auto/os/win32 (from vendor/nginx-1.9.7/auto/os/win32) vendor/nginx-1.9.9/auto/sources (from vendor/nginx-1.9.7/auto/sources) vendor/nginx-1.9.9/auto/stubs (from vendor/nginx-1.9.7/auto/stubs) vendor/nginx-1.9.9/auto/summary (from vendor/nginx-1.9.7/auto/summary) vendor/nginx-1.9.9/auto/threads (from vendor/nginx-1.9.7/auto/threads) vendor/nginx-1.9.9/auto/types/sizeof (from vendor/nginx-1.9.7/auto/types/sizeof) vendor/nginx-1.9.9/auto/types/typedef (from vendor/nginx-1.9.7/auto/types/typedef) vendor/nginx-1.9.9/auto/types/uintptr_t (from vendor/nginx-1.9.7/auto/types/uintptr_t) vendor/nginx-1.9.9/auto/types/value (from vendor/nginx-1.9.7/auto/types/value) vendor/nginx-1.9.9/auto/unix (from vendor/nginx-1.9.7/auto/unix) vendor/nginx-1.9.9/conf/fastcgi.conf (from vendor/nginx-1.9.7/conf/fastcgi.conf) vendor/nginx-1.9.9/conf/fastcgi_params (from vendor/nginx-1.9.7/conf/fastcgi_params) vendor/nginx-1.9.9/conf/koi-utf (from vendor/nginx-1.9.7/conf/koi-utf) vendor/nginx-1.9.9/conf/koi-win (from vendor/nginx-1.9.7/conf/koi-win) vendor/nginx-1.9.9/conf/mime.types (from vendor/nginx-1.9.7/conf/mime.types) vendor/nginx-1.9.9/conf/nginx.conf (from vendor/nginx-1.9.7/conf/nginx.conf) vendor/nginx-1.9.9/conf/scgi_params (from vendor/nginx-1.9.7/conf/scgi_params) vendor/nginx-1.9.9/conf/uwsgi_params (from vendor/nginx-1.9.7/conf/uwsgi_params) vendor/nginx-1.9.9/conf/win-utf (from vendor/nginx-1.9.7/conf/win-utf) vendor/nginx-1.9.9/contrib/README (from vendor/nginx-1.9.7/contrib/README) vendor/nginx-1.9.9/contrib/geo2nginx.pl (from vendor/nginx-1.9.7/contrib/geo2nginx.pl) vendor/nginx-1.9.9/contrib/unicode2nginx/koi-utf (from vendor/nginx-1.9.7/contrib/unicode2nginx/koi-utf) vendor/nginx-1.9.9/contrib/unicode2nginx/unicode-to-nginx.pl (from vendor/nginx-1.9.7/contrib/unicode2nginx/unicode-to-nginx.pl) vendor/nginx-1.9.9/contrib/unicode2nginx/win-utf (from vendor/nginx-1.9.7/contrib/unicode2nginx/win-utf) vendor/nginx-1.9.9/contrib/vim/ftdetect/nginx.vim (from vendor/nginx-1.9.7/contrib/vim/ftdetect/nginx.vim) vendor/nginx-1.9.9/contrib/vim/indent/nginx.vim (from vendor/nginx-1.9.7/contrib/vim/indent/nginx.vim) vendor/nginx-1.9.9/contrib/vim/syntax/nginx.vim (from vendor/nginx-1.9.7/contrib/vim/syntax/nginx.vim) vendor/nginx-1.9.9/docs/GNUmakefile (from vendor/nginx-1.9.7/docs/GNUmakefile) vendor/nginx-1.9.9/docs/dtd/change_log_conf.dtd (from vendor/nginx-1.9.7/docs/dtd/change_log_conf.dtd) vendor/nginx-1.9.9/docs/dtd/changes.dtd (from vendor/nginx-1.9.7/docs/dtd/changes.dtd) vendor/nginx-1.9.9/docs/html/50x.html (from vendor/nginx-1.9.7/docs/html/50x.html) vendor/nginx-1.9.9/docs/html/index.html (from vendor/nginx-1.9.7/docs/html/index.html) vendor/nginx-1.9.9/docs/man/nginx.8 (from vendor/nginx-1.9.7/docs/man/nginx.8) vendor/nginx-1.9.9/docs/text/LICENSE (from vendor/nginx-1.9.7/docs/text/LICENSE) vendor/nginx-1.9.9/docs/text/README (from vendor/nginx-1.9.7/docs/text/README) vendor/nginx-1.9.9/docs/xml/change_log_conf.xml (from vendor/nginx-1.9.7/docs/xml/change_log_conf.xml) vendor/nginx-1.9.9/docs/xml/nginx/changes.xml (from vendor/nginx-1.9.7/docs/xml/nginx/changes.xml) vendor/nginx-1.9.9/docs/xsls/changes.xsls (from vendor/nginx-1.9.7/docs/xsls/changes.xsls) vendor/nginx-1.9.9/docs/xslt/changes.xslt (from vendor/nginx-1.9.7/docs/xslt/changes.xslt) vendor/nginx-1.9.9/misc/GNUmakefile (from vendor/nginx-1.9.7/misc/GNUmakefile) vendor/nginx-1.9.9/misc/README (from vendor/nginx-1.9.7/misc/README) vendor/nginx-1.9.9/src/core/nginx.c (from vendor/nginx-1.9.7/src/core/nginx.c) vendor/nginx-1.9.9/src/core/nginx.h (from vendor/nginx-1.9.7/src/core/nginx.h) vendor/nginx-1.9.9/src/core/ngx_array.c (from vendor/nginx-1.9.7/src/core/ngx_array.c) vendor/nginx-1.9.9/src/core/ngx_array.h (from vendor/nginx-1.9.7/src/core/ngx_array.h) vendor/nginx-1.9.9/src/core/ngx_buf.c (from vendor/nginx-1.9.7/src/core/ngx_buf.c) vendor/nginx-1.9.9/src/core/ngx_buf.h (from vendor/nginx-1.9.7/src/core/ngx_buf.h) vendor/nginx-1.9.9/src/core/ngx_conf_file.c (from vendor/nginx-1.9.7/src/core/ngx_conf_file.c) vendor/nginx-1.9.9/src/core/ngx_conf_file.h (from vendor/nginx-1.9.7/src/core/ngx_conf_file.h) vendor/nginx-1.9.9/src/core/ngx_config.h (from vendor/nginx-1.9.7/src/core/ngx_config.h) vendor/nginx-1.9.9/src/core/ngx_connection.c (from vendor/nginx-1.9.7/src/core/ngx_connection.c) vendor/nginx-1.9.9/src/core/ngx_connection.h (from vendor/nginx-1.9.7/src/core/ngx_connection.h) vendor/nginx-1.9.9/src/core/ngx_core.h (from vendor/nginx-1.9.7/src/core/ngx_core.h) vendor/nginx-1.9.9/src/core/ngx_cpuinfo.c (from vendor/nginx-1.9.7/src/core/ngx_cpuinfo.c) vendor/nginx-1.9.9/src/core/ngx_crc.h (from vendor/nginx-1.9.7/src/core/ngx_crc.h) vendor/nginx-1.9.9/src/core/ngx_crc32.c (from vendor/nginx-1.9.7/src/core/ngx_crc32.c) vendor/nginx-1.9.9/src/core/ngx_crc32.h (from vendor/nginx-1.9.7/src/core/ngx_crc32.h) vendor/nginx-1.9.9/src/core/ngx_crypt.c (from vendor/nginx-1.9.7/src/core/ngx_crypt.c) vendor/nginx-1.9.9/src/core/ngx_crypt.h (from vendor/nginx-1.9.7/src/core/ngx_crypt.h) vendor/nginx-1.9.9/src/core/ngx_cycle.c (from vendor/nginx-1.9.7/src/core/ngx_cycle.c) vendor/nginx-1.9.9/src/core/ngx_cycle.h (from vendor/nginx-1.9.7/src/core/ngx_cycle.h) vendor/nginx-1.9.9/src/core/ngx_file.c (from vendor/nginx-1.9.7/src/core/ngx_file.c) vendor/nginx-1.9.9/src/core/ngx_file.h (from vendor/nginx-1.9.7/src/core/ngx_file.h) vendor/nginx-1.9.9/src/core/ngx_hash.c (from vendor/nginx-1.9.7/src/core/ngx_hash.c) vendor/nginx-1.9.9/src/core/ngx_hash.h (from vendor/nginx-1.9.7/src/core/ngx_hash.h) vendor/nginx-1.9.9/src/core/ngx_inet.c (from vendor/nginx-1.9.7/src/core/ngx_inet.c) vendor/nginx-1.9.9/src/core/ngx_inet.h (from vendor/nginx-1.9.7/src/core/ngx_inet.h) vendor/nginx-1.9.9/src/core/ngx_list.c (from vendor/nginx-1.9.7/src/core/ngx_list.c) vendor/nginx-1.9.9/src/core/ngx_list.h (from vendor/nginx-1.9.7/src/core/ngx_list.h) vendor/nginx-1.9.9/src/core/ngx_log.c (from vendor/nginx-1.9.7/src/core/ngx_log.c) vendor/nginx-1.9.9/src/core/ngx_log.h (from vendor/nginx-1.9.7/src/core/ngx_log.h) vendor/nginx-1.9.9/src/core/ngx_md5.c (from vendor/nginx-1.9.7/src/core/ngx_md5.c) vendor/nginx-1.9.9/src/core/ngx_md5.h (from vendor/nginx-1.9.7/src/core/ngx_md5.h) vendor/nginx-1.9.9/src/core/ngx_murmurhash.c (from vendor/nginx-1.9.7/src/core/ngx_murmurhash.c) vendor/nginx-1.9.9/src/core/ngx_murmurhash.h (from vendor/nginx-1.9.7/src/core/ngx_murmurhash.h) vendor/nginx-1.9.9/src/core/ngx_open_file_cache.c (from vendor/nginx-1.9.7/src/core/ngx_open_file_cache.c) vendor/nginx-1.9.9/src/core/ngx_open_file_cache.h (from vendor/nginx-1.9.7/src/core/ngx_open_file_cache.h) vendor/nginx-1.9.9/src/core/ngx_output_chain.c (from vendor/nginx-1.9.7/src/core/ngx_output_chain.c) vendor/nginx-1.9.9/src/core/ngx_palloc.c (from vendor/nginx-1.9.7/src/core/ngx_palloc.c) vendor/nginx-1.9.9/src/core/ngx_palloc.h (from vendor/nginx-1.9.7/src/core/ngx_palloc.h) vendor/nginx-1.9.9/src/core/ngx_parse.c (from vendor/nginx-1.9.7/src/core/ngx_parse.c) vendor/nginx-1.9.9/src/core/ngx_parse.h (from vendor/nginx-1.9.7/src/core/ngx_parse.h) vendor/nginx-1.9.9/src/core/ngx_parse_time.c (from vendor/nginx-1.9.7/src/core/ngx_parse_time.c) vendor/nginx-1.9.9/src/core/ngx_parse_time.h (from vendor/nginx-1.9.7/src/core/ngx_parse_time.h) vendor/nginx-1.9.9/src/core/ngx_proxy_protocol.c (from vendor/nginx-1.9.7/src/core/ngx_proxy_protocol.c) vendor/nginx-1.9.9/src/core/ngx_proxy_protocol.h (from vendor/nginx-1.9.7/src/core/ngx_proxy_protocol.h) vendor/nginx-1.9.9/src/core/ngx_queue.c (from vendor/nginx-1.9.7/src/core/ngx_queue.c) vendor/nginx-1.9.9/src/core/ngx_queue.h (from vendor/nginx-1.9.7/src/core/ngx_queue.h) vendor/nginx-1.9.9/src/core/ngx_radix_tree.c (from vendor/nginx-1.9.7/src/core/ngx_radix_tree.c) vendor/nginx-1.9.9/src/core/ngx_radix_tree.h (from vendor/nginx-1.9.7/src/core/ngx_radix_tree.h) vendor/nginx-1.9.9/src/core/ngx_rbtree.c (from vendor/nginx-1.9.7/src/core/ngx_rbtree.c) vendor/nginx-1.9.9/src/core/ngx_rbtree.h (from vendor/nginx-1.9.7/src/core/ngx_rbtree.h) vendor/nginx-1.9.9/src/core/ngx_regex.c (from vendor/nginx-1.9.7/src/core/ngx_regex.c) vendor/nginx-1.9.9/src/core/ngx_regex.h (from vendor/nginx-1.9.7/src/core/ngx_regex.h) vendor/nginx-1.9.9/src/core/ngx_resolver.c (from vendor/nginx-1.9.7/src/core/ngx_resolver.c) vendor/nginx-1.9.9/src/core/ngx_resolver.h (from vendor/nginx-1.9.7/src/core/ngx_resolver.h) vendor/nginx-1.9.9/src/core/ngx_rwlock.c (from vendor/nginx-1.9.7/src/core/ngx_rwlock.c) vendor/nginx-1.9.9/src/core/ngx_rwlock.h (from vendor/nginx-1.9.7/src/core/ngx_rwlock.h) vendor/nginx-1.9.9/src/core/ngx_sha1.h (from vendor/nginx-1.9.7/src/core/ngx_sha1.h) vendor/nginx-1.9.9/src/core/ngx_shmtx.c (from vendor/nginx-1.9.7/src/core/ngx_shmtx.c) vendor/nginx-1.9.9/src/core/ngx_shmtx.h (from vendor/nginx-1.9.7/src/core/ngx_shmtx.h) vendor/nginx-1.9.9/src/core/ngx_slab.c (from vendor/nginx-1.9.7/src/core/ngx_slab.c) vendor/nginx-1.9.9/src/core/ngx_slab.h (from vendor/nginx-1.9.7/src/core/ngx_slab.h) vendor/nginx-1.9.9/src/core/ngx_spinlock.c (from vendor/nginx-1.9.7/src/core/ngx_spinlock.c) vendor/nginx-1.9.9/src/core/ngx_string.c (from vendor/nginx-1.9.7/src/core/ngx_string.c) vendor/nginx-1.9.9/src/core/ngx_string.h (from vendor/nginx-1.9.7/src/core/ngx_string.h) vendor/nginx-1.9.9/src/core/ngx_syslog.c (from vendor/nginx-1.9.7/src/core/ngx_syslog.c) vendor/nginx-1.9.9/src/core/ngx_syslog.h (from vendor/nginx-1.9.7/src/core/ngx_syslog.h) vendor/nginx-1.9.9/src/core/ngx_thread_pool.c (from vendor/nginx-1.9.7/src/core/ngx_thread_pool.c) vendor/nginx-1.9.9/src/core/ngx_thread_pool.h (from vendor/nginx-1.9.7/src/core/ngx_thread_pool.h) vendor/nginx-1.9.9/src/core/ngx_times.c (from vendor/nginx-1.9.7/src/core/ngx_times.c) vendor/nginx-1.9.9/src/core/ngx_times.h (from vendor/nginx-1.9.7/src/core/ngx_times.h) vendor/nginx-1.9.9/src/event/modules/ngx_devpoll_module.c (from vendor/nginx-1.9.7/src/event/modules/ngx_devpoll_module.c) vendor/nginx-1.9.9/src/event/modules/ngx_epoll_module.c (from vendor/nginx-1.9.7/src/event/modules/ngx_epoll_module.c) vendor/nginx-1.9.9/src/event/modules/ngx_eventport_module.c (from vendor/nginx-1.9.7/src/event/modules/ngx_eventport_module.c) vendor/nginx-1.9.9/src/event/modules/ngx_iocp_module.c (from vendor/nginx-1.9.7/src/event/modules/ngx_iocp_module.c) vendor/nginx-1.9.9/src/event/modules/ngx_iocp_module.h (from vendor/nginx-1.9.7/src/event/modules/ngx_iocp_module.h) vendor/nginx-1.9.9/src/event/modules/ngx_kqueue_module.c (from vendor/nginx-1.9.7/src/event/modules/ngx_kqueue_module.c) vendor/nginx-1.9.9/src/event/modules/ngx_poll_module.c (from vendor/nginx-1.9.7/src/event/modules/ngx_poll_module.c) vendor/nginx-1.9.9/src/event/modules/ngx_select_module.c (from vendor/nginx-1.9.7/src/event/modules/ngx_select_module.c) vendor/nginx-1.9.9/src/event/modules/ngx_win32_select_module.c (from vendor/nginx-1.9.7/src/event/modules/ngx_win32_select_module.c) vendor/nginx-1.9.9/src/event/ngx_event.c (from vendor/nginx-1.9.7/src/event/ngx_event.c) vendor/nginx-1.9.9/src/event/ngx_event.h (from vendor/nginx-1.9.7/src/event/ngx_event.h) vendor/nginx-1.9.9/src/event/ngx_event_accept.c (from vendor/nginx-1.9.7/src/event/ngx_event_accept.c) vendor/nginx-1.9.9/src/event/ngx_event_acceptex.c (from vendor/nginx-1.9.7/src/event/ngx_event_acceptex.c) vendor/nginx-1.9.9/src/event/ngx_event_connect.c (from vendor/nginx-1.9.7/src/event/ngx_event_connect.c) vendor/nginx-1.9.9/src/event/ngx_event_connect.h (from vendor/nginx-1.9.7/src/event/ngx_event_connect.h) vendor/nginx-1.9.9/src/event/ngx_event_connectex.c (from vendor/nginx-1.9.7/src/event/ngx_event_connectex.c) vendor/nginx-1.9.9/src/event/ngx_event_openssl.c (from vendor/nginx-1.9.7/src/event/ngx_event_openssl.c) vendor/nginx-1.9.9/src/event/ngx_event_openssl.h (from vendor/nginx-1.9.7/src/event/ngx_event_openssl.h) vendor/nginx-1.9.9/src/event/ngx_event_openssl_stapling.c (from vendor/nginx-1.9.7/src/event/ngx_event_openssl_stapling.c) vendor/nginx-1.9.9/src/event/ngx_event_pipe.c (from vendor/nginx-1.9.7/src/event/ngx_event_pipe.c) vendor/nginx-1.9.9/src/event/ngx_event_pipe.h (from vendor/nginx-1.9.7/src/event/ngx_event_pipe.h) vendor/nginx-1.9.9/src/event/ngx_event_posted.c (from vendor/nginx-1.9.7/src/event/ngx_event_posted.c) vendor/nginx-1.9.9/src/event/ngx_event_posted.h (from vendor/nginx-1.9.7/src/event/ngx_event_posted.h) vendor/nginx-1.9.9/src/event/ngx_event_timer.c (from vendor/nginx-1.9.7/src/event/ngx_event_timer.c) vendor/nginx-1.9.9/src/event/ngx_event_timer.h (from vendor/nginx-1.9.7/src/event/ngx_event_timer.h) vendor/nginx-1.9.9/src/http/modules/ngx_http_access_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_access_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_addition_filter_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_addition_filter_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_auth_basic_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_auth_basic_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_auth_request_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_auth_request_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_autoindex_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_autoindex_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_browser_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_browser_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_charset_filter_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_charset_filter_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_chunked_filter_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_chunked_filter_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_dav_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_dav_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_degradation_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_degradation_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_empty_gif_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_empty_gif_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_fastcgi_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_fastcgi_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_flv_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_flv_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_geo_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_geo_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_geoip_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_geoip_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_gunzip_filter_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_gunzip_filter_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_gzip_filter_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_gzip_filter_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_gzip_static_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_gzip_static_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_headers_filter_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_headers_filter_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_image_filter_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_image_filter_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_index_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_index_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_limit_conn_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_limit_conn_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_limit_req_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_limit_req_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_log_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_log_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_map_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_map_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_memcached_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_memcached_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_mp4_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_mp4_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_not_modified_filter_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_not_modified_filter_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_proxy_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_proxy_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_random_index_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_random_index_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_range_filter_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_range_filter_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_realip_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_realip_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_referer_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_referer_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_rewrite_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_rewrite_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_scgi_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_scgi_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_secure_link_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_secure_link_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_split_clients_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_split_clients_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_ssi_filter_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_ssi_filter_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_ssi_filter_module.h (from vendor/nginx-1.9.7/src/http/modules/ngx_http_ssi_filter_module.h) vendor/nginx-1.9.9/src/http/modules/ngx_http_ssl_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_ssl_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_ssl_module.h (from vendor/nginx-1.9.7/src/http/modules/ngx_http_ssl_module.h) vendor/nginx-1.9.9/src/http/modules/ngx_http_static_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_static_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_stub_status_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_stub_status_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_sub_filter_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_sub_filter_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_upstream_hash_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_upstream_hash_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_upstream_ip_hash_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_upstream_ip_hash_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_upstream_keepalive_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_upstream_keepalive_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_upstream_least_conn_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_upstream_least_conn_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_upstream_zone_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_upstream_zone_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_userid_filter_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_userid_filter_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_uwsgi_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_uwsgi_module.c) vendor/nginx-1.9.9/src/http/modules/ngx_http_xslt_filter_module.c (from vendor/nginx-1.9.7/src/http/modules/ngx_http_xslt_filter_module.c) vendor/nginx-1.9.9/src/http/modules/perl/Makefile.PL (from vendor/nginx-1.9.7/src/http/modules/perl/Makefile.PL) vendor/nginx-1.9.9/src/http/modules/perl/nginx.pm (from vendor/nginx-1.9.7/src/http/modules/perl/nginx.pm) vendor/nginx-1.9.9/src/http/modules/perl/nginx.xs (from vendor/nginx-1.9.7/src/http/modules/perl/nginx.xs) vendor/nginx-1.9.9/src/http/modules/perl/ngx_http_perl_module.c (from vendor/nginx-1.9.7/src/http/modules/perl/ngx_http_perl_module.c) vendor/nginx-1.9.9/src/http/modules/perl/ngx_http_perl_module.h (from vendor/nginx-1.9.7/src/http/modules/perl/ngx_http_perl_module.h) vendor/nginx-1.9.9/src/http/modules/perl/typemap (from vendor/nginx-1.9.7/src/http/modules/perl/typemap) vendor/nginx-1.9.9/src/http/ngx_http.c (from vendor/nginx-1.9.7/src/http/ngx_http.c) vendor/nginx-1.9.9/src/http/ngx_http.h (from vendor/nginx-1.9.7/src/http/ngx_http.h) vendor/nginx-1.9.9/src/http/ngx_http_cache.h (from vendor/nginx-1.9.7/src/http/ngx_http_cache.h) vendor/nginx-1.9.9/src/http/ngx_http_config.h (from vendor/nginx-1.9.7/src/http/ngx_http_config.h) vendor/nginx-1.9.9/src/http/ngx_http_copy_filter_module.c (from vendor/nginx-1.9.7/src/http/ngx_http_copy_filter_module.c) vendor/nginx-1.9.9/src/http/ngx_http_core_module.c (from vendor/nginx-1.9.7/src/http/ngx_http_core_module.c) vendor/nginx-1.9.9/src/http/ngx_http_core_module.h (from vendor/nginx-1.9.7/src/http/ngx_http_core_module.h) vendor/nginx-1.9.9/src/http/ngx_http_file_cache.c (from vendor/nginx-1.9.7/src/http/ngx_http_file_cache.c) vendor/nginx-1.9.9/src/http/ngx_http_header_filter_module.c (from vendor/nginx-1.9.7/src/http/ngx_http_header_filter_module.c) vendor/nginx-1.9.9/src/http/ngx_http_parse.c (from vendor/nginx-1.9.7/src/http/ngx_http_parse.c) vendor/nginx-1.9.9/src/http/ngx_http_postpone_filter_module.c (from vendor/nginx-1.9.7/src/http/ngx_http_postpone_filter_module.c) vendor/nginx-1.9.9/src/http/ngx_http_request.c (from vendor/nginx-1.9.7/src/http/ngx_http_request.c) vendor/nginx-1.9.9/src/http/ngx_http_request.h (from vendor/nginx-1.9.7/src/http/ngx_http_request.h) vendor/nginx-1.9.9/src/http/ngx_http_request_body.c (from vendor/nginx-1.9.7/src/http/ngx_http_request_body.c) vendor/nginx-1.9.9/src/http/ngx_http_script.c (from vendor/nginx-1.9.7/src/http/ngx_http_script.c) vendor/nginx-1.9.9/src/http/ngx_http_script.h (from vendor/nginx-1.9.7/src/http/ngx_http_script.h) vendor/nginx-1.9.9/src/http/ngx_http_special_response.c (from vendor/nginx-1.9.7/src/http/ngx_http_special_response.c) vendor/nginx-1.9.9/src/http/ngx_http_upstream.c (from vendor/nginx-1.9.7/src/http/ngx_http_upstream.c) vendor/nginx-1.9.9/src/http/ngx_http_upstream.h (from vendor/nginx-1.9.7/src/http/ngx_http_upstream.h) vendor/nginx-1.9.9/src/http/ngx_http_upstream_round_robin.c (from vendor/nginx-1.9.7/src/http/ngx_http_upstream_round_robin.c) vendor/nginx-1.9.9/src/http/ngx_http_upstream_round_robin.h (from vendor/nginx-1.9.7/src/http/ngx_http_upstream_round_robin.h) vendor/nginx-1.9.9/src/http/ngx_http_variables.c (from vendor/nginx-1.9.7/src/http/ngx_http_variables.c) vendor/nginx-1.9.9/src/http/ngx_http_variables.h (from vendor/nginx-1.9.7/src/http/ngx_http_variables.h) vendor/nginx-1.9.9/src/http/ngx_http_write_filter_module.c (from vendor/nginx-1.9.7/src/http/ngx_http_write_filter_module.c) vendor/nginx-1.9.9/src/http/v2/ngx_http_v2.c (from vendor/nginx-1.9.7/src/http/v2/ngx_http_v2.c) vendor/nginx-1.9.9/src/http/v2/ngx_http_v2.h (from vendor/nginx-1.9.7/src/http/v2/ngx_http_v2.h) vendor/nginx-1.9.9/src/http/v2/ngx_http_v2_filter_module.c (from vendor/nginx-1.9.7/src/http/v2/ngx_http_v2_filter_module.c) vendor/nginx-1.9.9/src/http/v2/ngx_http_v2_huff_decode.c (from vendor/nginx-1.9.7/src/http/v2/ngx_http_v2_huff_decode.c) vendor/nginx-1.9.9/src/http/v2/ngx_http_v2_huff_encode.c (from vendor/nginx-1.9.7/src/http/v2/ngx_http_v2_huff_encode.c) vendor/nginx-1.9.9/src/http/v2/ngx_http_v2_module.c (from vendor/nginx-1.9.7/src/http/v2/ngx_http_v2_module.c) vendor/nginx-1.9.9/src/http/v2/ngx_http_v2_module.h (from vendor/nginx-1.9.7/src/http/v2/ngx_http_v2_module.h) vendor/nginx-1.9.9/src/http/v2/ngx_http_v2_table.c (from vendor/nginx-1.9.7/src/http/v2/ngx_http_v2_table.c) vendor/nginx-1.9.9/src/mail/ngx_mail.c (from vendor/nginx-1.9.7/src/mail/ngx_mail.c) vendor/nginx-1.9.9/src/mail/ngx_mail.h (from vendor/nginx-1.9.7/src/mail/ngx_mail.h) vendor/nginx-1.9.9/src/mail/ngx_mail_auth_http_module.c (from vendor/nginx-1.9.7/src/mail/ngx_mail_auth_http_module.c) vendor/nginx-1.9.9/src/mail/ngx_mail_core_module.c (from vendor/nginx-1.9.7/src/mail/ngx_mail_core_module.c) vendor/nginx-1.9.9/src/mail/ngx_mail_handler.c (from vendor/nginx-1.9.7/src/mail/ngx_mail_handler.c) vendor/nginx-1.9.9/src/mail/ngx_mail_imap_handler.c (from vendor/nginx-1.9.7/src/mail/ngx_mail_imap_handler.c) vendor/nginx-1.9.9/src/mail/ngx_mail_imap_module.c (from vendor/nginx-1.9.7/src/mail/ngx_mail_imap_module.c) vendor/nginx-1.9.9/src/mail/ngx_mail_imap_module.h (from vendor/nginx-1.9.7/src/mail/ngx_mail_imap_module.h) vendor/nginx-1.9.9/src/mail/ngx_mail_parse.c (from vendor/nginx-1.9.7/src/mail/ngx_mail_parse.c) vendor/nginx-1.9.9/src/mail/ngx_mail_pop3_handler.c (from vendor/nginx-1.9.7/src/mail/ngx_mail_pop3_handler.c) vendor/nginx-1.9.9/src/mail/ngx_mail_pop3_module.c (from vendor/nginx-1.9.7/src/mail/ngx_mail_pop3_module.c) vendor/nginx-1.9.9/src/mail/ngx_mail_pop3_module.h (from vendor/nginx-1.9.7/src/mail/ngx_mail_pop3_module.h) vendor/nginx-1.9.9/src/mail/ngx_mail_proxy_module.c (from vendor/nginx-1.9.7/src/mail/ngx_mail_proxy_module.c) vendor/nginx-1.9.9/src/mail/ngx_mail_smtp_handler.c (from vendor/nginx-1.9.7/src/mail/ngx_mail_smtp_handler.c) vendor/nginx-1.9.9/src/mail/ngx_mail_smtp_module.c (from vendor/nginx-1.9.7/src/mail/ngx_mail_smtp_module.c) vendor/nginx-1.9.9/src/mail/ngx_mail_smtp_module.h (from vendor/nginx-1.9.7/src/mail/ngx_mail_smtp_module.h) vendor/nginx-1.9.9/src/mail/ngx_mail_ssl_module.c (from vendor/nginx-1.9.7/src/mail/ngx_mail_ssl_module.c) vendor/nginx-1.9.9/src/mail/ngx_mail_ssl_module.h (from vendor/nginx-1.9.7/src/mail/ngx_mail_ssl_module.h) vendor/nginx-1.9.9/src/misc/ngx_cpp_test_module.cpp (from vendor/nginx-1.9.7/src/misc/ngx_cpp_test_module.cpp) vendor/nginx-1.9.9/src/misc/ngx_google_perftools_module.c (from vendor/nginx-1.9.7/src/misc/ngx_google_perftools_module.c) vendor/nginx-1.9.9/src/mysql/config (from vendor/nginx-1.9.7/src/mysql/config) vendor/nginx-1.9.9/src/mysql/ngx_http_mysql_test.c (from vendor/nginx-1.9.7/src/mysql/ngx_http_mysql_test.c) vendor/nginx-1.9.9/src/mysql/ngx_mysql.c (from vendor/nginx-1.9.7/src/mysql/ngx_mysql.c) vendor/nginx-1.9.9/src/mysql/ngx_mysql.h (from vendor/nginx-1.9.7/src/mysql/ngx_mysql.h) vendor/nginx-1.9.9/src/os/unix/ngx_alloc.c (from vendor/nginx-1.9.7/src/os/unix/ngx_alloc.c) vendor/nginx-1.9.9/src/os/unix/ngx_alloc.h (from vendor/nginx-1.9.7/src/os/unix/ngx_alloc.h) vendor/nginx-1.9.9/src/os/unix/ngx_atomic.h (from vendor/nginx-1.9.7/src/os/unix/ngx_atomic.h) vendor/nginx-1.9.9/src/os/unix/ngx_channel.c (from vendor/nginx-1.9.7/src/os/unix/ngx_channel.c) vendor/nginx-1.9.9/src/os/unix/ngx_channel.h (from vendor/nginx-1.9.7/src/os/unix/ngx_channel.h) vendor/nginx-1.9.9/src/os/unix/ngx_daemon.c (from vendor/nginx-1.9.7/src/os/unix/ngx_daemon.c) vendor/nginx-1.9.9/src/os/unix/ngx_darwin.h (from vendor/nginx-1.9.7/src/os/unix/ngx_darwin.h) vendor/nginx-1.9.9/src/os/unix/ngx_darwin_config.h (from vendor/nginx-1.9.7/src/os/unix/ngx_darwin_config.h) vendor/nginx-1.9.9/src/os/unix/ngx_darwin_init.c (from vendor/nginx-1.9.7/src/os/unix/ngx_darwin_init.c) vendor/nginx-1.9.9/src/os/unix/ngx_darwin_sendfile_chain.c (from vendor/nginx-1.9.7/src/os/unix/ngx_darwin_sendfile_chain.c) vendor/nginx-1.9.9/src/os/unix/ngx_errno.c (from vendor/nginx-1.9.7/src/os/unix/ngx_errno.c) vendor/nginx-1.9.9/src/os/unix/ngx_errno.h (from vendor/nginx-1.9.7/src/os/unix/ngx_errno.h) vendor/nginx-1.9.9/src/os/unix/ngx_file_aio_read.c (from vendor/nginx-1.9.7/src/os/unix/ngx_file_aio_read.c) vendor/nginx-1.9.9/src/os/unix/ngx_files.c (from vendor/nginx-1.9.7/src/os/unix/ngx_files.c) vendor/nginx-1.9.9/src/os/unix/ngx_files.h (from vendor/nginx-1.9.7/src/os/unix/ngx_files.h) vendor/nginx-1.9.9/src/os/unix/ngx_freebsd.h (from vendor/nginx-1.9.7/src/os/unix/ngx_freebsd.h) vendor/nginx-1.9.9/src/os/unix/ngx_freebsd_config.h (from vendor/nginx-1.9.7/src/os/unix/ngx_freebsd_config.h) vendor/nginx-1.9.9/src/os/unix/ngx_freebsd_init.c (from vendor/nginx-1.9.7/src/os/unix/ngx_freebsd_init.c) vendor/nginx-1.9.9/src/os/unix/ngx_freebsd_sendfile_chain.c (from vendor/nginx-1.9.7/src/os/unix/ngx_freebsd_sendfile_chain.c) vendor/nginx-1.9.9/src/os/unix/ngx_gcc_atomic_amd64.h (from vendor/nginx-1.9.7/src/os/unix/ngx_gcc_atomic_amd64.h) vendor/nginx-1.9.9/src/os/unix/ngx_gcc_atomic_ppc.h (from vendor/nginx-1.9.7/src/os/unix/ngx_gcc_atomic_ppc.h) vendor/nginx-1.9.9/src/os/unix/ngx_gcc_atomic_sparc64.h (from vendor/nginx-1.9.7/src/os/unix/ngx_gcc_atomic_sparc64.h) vendor/nginx-1.9.9/src/os/unix/ngx_gcc_atomic_x86.h (from vendor/nginx-1.9.7/src/os/unix/ngx_gcc_atomic_x86.h) vendor/nginx-1.9.9/src/os/unix/ngx_linux.h (from vendor/nginx-1.9.7/src/os/unix/ngx_linux.h) vendor/nginx-1.9.9/src/os/unix/ngx_linux_aio_read.c (from vendor/nginx-1.9.7/src/os/unix/ngx_linux_aio_read.c) vendor/nginx-1.9.9/src/os/unix/ngx_linux_config.h (from vendor/nginx-1.9.7/src/os/unix/ngx_linux_config.h) vendor/nginx-1.9.9/src/os/unix/ngx_linux_init.c (from vendor/nginx-1.9.7/src/os/unix/ngx_linux_init.c) vendor/nginx-1.9.9/src/os/unix/ngx_linux_sendfile_chain.c (from vendor/nginx-1.9.7/src/os/unix/ngx_linux_sendfile_chain.c) vendor/nginx-1.9.9/src/os/unix/ngx_os.h (from vendor/nginx-1.9.7/src/os/unix/ngx_os.h) vendor/nginx-1.9.9/src/os/unix/ngx_posix_config.h (from vendor/nginx-1.9.7/src/os/unix/ngx_posix_config.h) vendor/nginx-1.9.9/src/os/unix/ngx_posix_init.c (from vendor/nginx-1.9.7/src/os/unix/ngx_posix_init.c) vendor/nginx-1.9.9/src/os/unix/ngx_process.c (from vendor/nginx-1.9.7/src/os/unix/ngx_process.c) vendor/nginx-1.9.9/src/os/unix/ngx_process.h (from vendor/nginx-1.9.7/src/os/unix/ngx_process.h) vendor/nginx-1.9.9/src/os/unix/ngx_process_cycle.c (from vendor/nginx-1.9.7/src/os/unix/ngx_process_cycle.c) vendor/nginx-1.9.9/src/os/unix/ngx_process_cycle.h (from vendor/nginx-1.9.7/src/os/unix/ngx_process_cycle.h) vendor/nginx-1.9.9/src/os/unix/ngx_readv_chain.c (from vendor/nginx-1.9.7/src/os/unix/ngx_readv_chain.c) vendor/nginx-1.9.9/src/os/unix/ngx_recv.c (from vendor/nginx-1.9.7/src/os/unix/ngx_recv.c) vendor/nginx-1.9.9/src/os/unix/ngx_send.c (from vendor/nginx-1.9.7/src/os/unix/ngx_send.c) vendor/nginx-1.9.9/src/os/unix/ngx_setaffinity.c (from vendor/nginx-1.9.7/src/os/unix/ngx_setaffinity.c) vendor/nginx-1.9.9/src/os/unix/ngx_setaffinity.h (from vendor/nginx-1.9.7/src/os/unix/ngx_setaffinity.h) vendor/nginx-1.9.9/src/os/unix/ngx_setproctitle.c (from vendor/nginx-1.9.7/src/os/unix/ngx_setproctitle.c) vendor/nginx-1.9.9/src/os/unix/ngx_setproctitle.h (from vendor/nginx-1.9.7/src/os/unix/ngx_setproctitle.h) vendor/nginx-1.9.9/src/os/unix/ngx_shmem.c (from vendor/nginx-1.9.7/src/os/unix/ngx_shmem.c) vendor/nginx-1.9.9/src/os/unix/ngx_shmem.h (from vendor/nginx-1.9.7/src/os/unix/ngx_shmem.h) vendor/nginx-1.9.9/src/os/unix/ngx_socket.c (from vendor/nginx-1.9.7/src/os/unix/ngx_socket.c) vendor/nginx-1.9.9/src/os/unix/ngx_socket.h (from vendor/nginx-1.9.7/src/os/unix/ngx_socket.h) vendor/nginx-1.9.9/src/os/unix/ngx_solaris.h (from vendor/nginx-1.9.7/src/os/unix/ngx_solaris.h) vendor/nginx-1.9.9/src/os/unix/ngx_solaris_config.h (from vendor/nginx-1.9.7/src/os/unix/ngx_solaris_config.h) vendor/nginx-1.9.9/src/os/unix/ngx_solaris_init.c (from vendor/nginx-1.9.7/src/os/unix/ngx_solaris_init.c) vendor/nginx-1.9.9/src/os/unix/ngx_solaris_sendfilev_chain.c (from vendor/nginx-1.9.7/src/os/unix/ngx_solaris_sendfilev_chain.c) vendor/nginx-1.9.9/src/os/unix/ngx_sunpro_amd64.il (from vendor/nginx-1.9.7/src/os/unix/ngx_sunpro_amd64.il) vendor/nginx-1.9.9/src/os/unix/ngx_sunpro_atomic_sparc64.h (from vendor/nginx-1.9.7/src/os/unix/ngx_sunpro_atomic_sparc64.h) vendor/nginx-1.9.9/src/os/unix/ngx_sunpro_sparc64.il (from vendor/nginx-1.9.7/src/os/unix/ngx_sunpro_sparc64.il) vendor/nginx-1.9.9/src/os/unix/ngx_sunpro_x86.il (from vendor/nginx-1.9.7/src/os/unix/ngx_sunpro_x86.il) vendor/nginx-1.9.9/src/os/unix/ngx_thread.h (from vendor/nginx-1.9.7/src/os/unix/ngx_thread.h) vendor/nginx-1.9.9/src/os/unix/ngx_thread_cond.c (from vendor/nginx-1.9.7/src/os/unix/ngx_thread_cond.c) vendor/nginx-1.9.9/src/os/unix/ngx_thread_id.c (from vendor/nginx-1.9.7/src/os/unix/ngx_thread_id.c) vendor/nginx-1.9.9/src/os/unix/ngx_thread_mutex.c (from vendor/nginx-1.9.7/src/os/unix/ngx_thread_mutex.c) vendor/nginx-1.9.9/src/os/unix/ngx_time.c (from vendor/nginx-1.9.7/src/os/unix/ngx_time.c) vendor/nginx-1.9.9/src/os/unix/ngx_time.h (from vendor/nginx-1.9.7/src/os/unix/ngx_time.h) vendor/nginx-1.9.9/src/os/unix/ngx_udp_recv.c (from vendor/nginx-1.9.7/src/os/unix/ngx_udp_recv.c) vendor/nginx-1.9.9/src/os/unix/ngx_user.c (from vendor/nginx-1.9.7/src/os/unix/ngx_user.c) vendor/nginx-1.9.9/src/os/unix/ngx_user.h (from vendor/nginx-1.9.7/src/os/unix/ngx_user.h) vendor/nginx-1.9.9/src/os/unix/ngx_writev_chain.c (from vendor/nginx-1.9.7/src/os/unix/ngx_writev_chain.c) vendor/nginx-1.9.9/src/os/win32/nginx.ico (from vendor/nginx-1.9.7/src/os/win32/nginx.ico) vendor/nginx-1.9.9/src/os/win32/nginx.rc (from vendor/nginx-1.9.7/src/os/win32/nginx.rc) vendor/nginx-1.9.9/src/os/win32/nginx_icon16.xpm (from vendor/nginx-1.9.7/src/os/win32/nginx_icon16.xpm) vendor/nginx-1.9.9/src/os/win32/nginx_icon32.xpm (from vendor/nginx-1.9.7/src/os/win32/nginx_icon32.xpm) vendor/nginx-1.9.9/src/os/win32/nginx_icon48.xpm (from vendor/nginx-1.9.7/src/os/win32/nginx_icon48.xpm) vendor/nginx-1.9.9/src/os/win32/ngx_alloc.c (from vendor/nginx-1.9.7/src/os/win32/ngx_alloc.c) vendor/nginx-1.9.9/src/os/win32/ngx_alloc.h (from vendor/nginx-1.9.7/src/os/win32/ngx_alloc.h) vendor/nginx-1.9.9/src/os/win32/ngx_atomic.h (from vendor/nginx-1.9.7/src/os/win32/ngx_atomic.h) vendor/nginx-1.9.9/src/os/win32/ngx_errno.c (from vendor/nginx-1.9.7/src/os/win32/ngx_errno.c) vendor/nginx-1.9.9/src/os/win32/ngx_errno.h (from vendor/nginx-1.9.7/src/os/win32/ngx_errno.h) vendor/nginx-1.9.9/src/os/win32/ngx_event_log.c (from vendor/nginx-1.9.7/src/os/win32/ngx_event_log.c) vendor/nginx-1.9.9/src/os/win32/ngx_files.c (from vendor/nginx-1.9.7/src/os/win32/ngx_files.c) vendor/nginx-1.9.9/src/os/win32/ngx_files.h (from vendor/nginx-1.9.7/src/os/win32/ngx_files.h) vendor/nginx-1.9.9/src/os/win32/ngx_os.h (from vendor/nginx-1.9.7/src/os/win32/ngx_os.h) vendor/nginx-1.9.9/src/os/win32/ngx_process.c (from vendor/nginx-1.9.7/src/os/win32/ngx_process.c) vendor/nginx-1.9.9/src/os/win32/ngx_process.h (from vendor/nginx-1.9.7/src/os/win32/ngx_process.h) vendor/nginx-1.9.9/src/os/win32/ngx_process_cycle.c (from vendor/nginx-1.9.7/src/os/win32/ngx_process_cycle.c) vendor/nginx-1.9.9/src/os/win32/ngx_process_cycle.h (from vendor/nginx-1.9.7/src/os/win32/ngx_process_cycle.h) vendor/nginx-1.9.9/src/os/win32/ngx_service.c (from vendor/nginx-1.9.7/src/os/win32/ngx_service.c) vendor/nginx-1.9.9/src/os/win32/ngx_shmem.c (from vendor/nginx-1.9.7/src/os/win32/ngx_shmem.c) vendor/nginx-1.9.9/src/os/win32/ngx_shmem.h (from vendor/nginx-1.9.7/src/os/win32/ngx_shmem.h) vendor/nginx-1.9.9/src/os/win32/ngx_socket.c (from vendor/nginx-1.9.7/src/os/win32/ngx_socket.c) vendor/nginx-1.9.9/src/os/win32/ngx_socket.h (from vendor/nginx-1.9.7/src/os/win32/ngx_socket.h) vendor/nginx-1.9.9/src/os/win32/ngx_stat.c (from vendor/nginx-1.9.7/src/os/win32/ngx_stat.c) vendor/nginx-1.9.9/src/os/win32/ngx_thread.c (from vendor/nginx-1.9.7/src/os/win32/ngx_thread.c) vendor/nginx-1.9.9/src/os/win32/ngx_thread.h (from vendor/nginx-1.9.7/src/os/win32/ngx_thread.h) vendor/nginx-1.9.9/src/os/win32/ngx_time.c (from vendor/nginx-1.9.7/src/os/win32/ngx_time.c) vendor/nginx-1.9.9/src/os/win32/ngx_time.h (from vendor/nginx-1.9.7/src/os/win32/ngx_time.h) vendor/nginx-1.9.9/src/os/win32/ngx_udp_wsarecv.c (from vendor/nginx-1.9.7/src/os/win32/ngx_udp_wsarecv.c) vendor/nginx-1.9.9/src/os/win32/ngx_user.c (from vendor/nginx-1.9.7/src/os/win32/ngx_user.c) vendor/nginx-1.9.9/src/os/win32/ngx_user.h (from vendor/nginx-1.9.7/src/os/win32/ngx_user.h) vendor/nginx-1.9.9/src/os/win32/ngx_win32_config.h (from vendor/nginx-1.9.7/src/os/win32/ngx_win32_config.h) vendor/nginx-1.9.9/src/os/win32/ngx_win32_init.c (from vendor/nginx-1.9.7/src/os/win32/ngx_win32_init.c) vendor/nginx-1.9.9/src/os/win32/ngx_wsarecv.c (from vendor/nginx-1.9.7/src/os/win32/ngx_wsarecv.c) vendor/nginx-1.9.9/src/os/win32/ngx_wsarecv_chain.c (from vendor/nginx-1.9.7/src/os/win32/ngx_wsarecv_chain.c) vendor/nginx-1.9.9/src/os/win32/ngx_wsasend.c (from vendor/nginx-1.9.7/src/os/win32/ngx_wsasend.c) vendor/nginx-1.9.9/src/os/win32/ngx_wsasend_chain.c (from vendor/nginx-1.9.7/src/os/win32/ngx_wsasend_chain.c) vendor/nginx-1.9.9/src/stream/ngx_stream.c (from vendor/nginx-1.9.7/src/stream/ngx_stream.c) vendor/nginx-1.9.9/src/stream/ngx_stream.h (from vendor/nginx-1.9.7/src/stream/ngx_stream.h) vendor/nginx-1.9.9/src/stream/ngx_stream_access_module.c (from vendor/nginx-1.9.7/src/stream/ngx_stream_access_module.c) vendor/nginx-1.9.9/src/stream/ngx_stream_core_module.c (from vendor/nginx-1.9.7/src/stream/ngx_stream_core_module.c) vendor/nginx-1.9.9/src/stream/ngx_stream_handler.c (from vendor/nginx-1.9.7/src/stream/ngx_stream_handler.c) vendor/nginx-1.9.9/src/stream/ngx_stream_limit_conn_module.c (from vendor/nginx-1.9.7/src/stream/ngx_stream_limit_conn_module.c) vendor/nginx-1.9.9/src/stream/ngx_stream_proxy_module.c (from vendor/nginx-1.9.7/src/stream/ngx_stream_proxy_module.c) vendor/nginx-1.9.9/src/stream/ngx_stream_ssl_module.c (from vendor/nginx-1.9.7/src/stream/ngx_stream_ssl_module.c) vendor/nginx-1.9.9/src/stream/ngx_stream_ssl_module.h (from vendor/nginx-1.9.7/src/stream/ngx_stream_ssl_module.h) vendor/nginx-1.9.9/src/stream/ngx_stream_upstream.c (from vendor/nginx-1.9.7/src/stream/ngx_stream_upstream.c) vendor/nginx-1.9.9/src/stream/ngx_stream_upstream.h (from vendor/nginx-1.9.7/src/stream/ngx_stream_upstream.h) vendor/nginx-1.9.9/src/stream/ngx_stream_upstream_hash_module.c (from vendor/nginx-1.9.7/src/stream/ngx_stream_upstream_hash_module.c) vendor/nginx-1.9.9/src/stream/ngx_stream_upstream_least_conn_module.c (from vendor/nginx-1.9.7/src/stream/ngx_stream_upstream_least_conn_module.c) vendor/nginx-1.9.9/src/stream/ngx_stream_upstream_round_robin.c (from vendor/nginx-1.9.7/src/stream/ngx_stream_upstream_round_robin.c) vendor/nginx-1.9.9/src/stream/ngx_stream_upstream_round_robin.h (from vendor/nginx-1.9.7/src/stream/ngx_stream_upstream_round_robin.h) vendor/nginx-1.9.9/src/stream/ngx_stream_upstream_zone_module.c (from vendor/nginx-1.9.7/src/stream/ngx_stream_upstream_zone_module.c) Modified: nginx_version (+1 -1) =================================================================== --- nginx_version 2016-01-25 23:37:27 +0900 (fee0a27) +++ nginx_version 2016-01-26 10:27:00 +0900 (6ae756c) @@ -1 +1 @@ -1.9.7 +1.9.9 Renamed: vendor/nginx-1.9.9/auto/cc/acc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/cc/bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/cc/ccc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/cc/clang (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/cc/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/cc/gcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/cc/icc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/cc/msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/cc/name (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/cc/owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/cc/sunc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/configure (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/define (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/endianness (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/feature (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/have (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/have_headers (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/headers (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/include (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/init (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/install (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/lib/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/lib/geoip/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/lib/google-perftools/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/lib/libatomic/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/lib/libatomic/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/lib/libgd/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/lib/libxslt/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/lib/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/lib/md5/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/lib/md5/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/lib/md5/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/lib/md5/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/lib/md5/makefile.owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/lib/openssl/conf (+1 -0) 98% =================================================================== --- vendor/nginx-1.9.7/auto/lib/openssl/conf 2016-01-25 23:37:27 +0900 (bca2050) +++ vendor/nginx-1.9.9/auto/lib/openssl/conf 2016-01-26 10:27:00 +0900 (28a99b2) @@ -105,6 +105,7 @@ else if [ $ngx_found = yes ]; then have=NGX_SSL . auto/have + CORE_INCS="$CORE_INCS $ngx_feature_path" CORE_LIBS="$CORE_LIBS $ngx_feature_libs $NGX_LIBDL" OPENSSL=YES fi Renamed: vendor/nginx-1.9.9/auto/lib/openssl/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/lib/openssl/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/lib/openssl/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/lib/pcre/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/lib/pcre/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/lib/pcre/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/lib/pcre/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/lib/pcre/makefile.owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/lib/perl/conf (+1 -1) 96% =================================================================== --- vendor/nginx-1.9.7/auto/lib/perl/conf 2016-01-25 23:37:27 +0900 (2a1a3fe) +++ vendor/nginx-1.9.9/auto/lib/perl/conf 2016-01-26 10:27:00 +0900 (4d1bcf1) @@ -57,7 +57,7 @@ if test -n "$NGX_PERL_VER"; then if [ "$NGX_SYSTEM" = "Darwin" ]; then # OS X system perl wants to link universal binaries ngx_perl_ldopts=`echo $ngx_perl_ldopts \ - | sed -e 's/-arch x86_64 -arch i386//'` + | sed -e 's/-arch i386//' -e 's/-arch x86_64//'` fi CORE_LINK="$CORE_LINK $ngx_perl_ldopts" Renamed: vendor/nginx-1.9.9/auto/lib/perl/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/lib/sha1/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/lib/sha1/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/lib/sha1/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/lib/sha1/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/lib/sha1/makefile.owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/lib/test (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/lib/zlib/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/lib/zlib/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/lib/zlib/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/lib/zlib/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/lib/zlib/makefile.owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/modules (+14 -1) 98% =================================================================== --- vendor/nginx-1.9.7/auto/modules 2016-01-25 23:37:27 +0900 (5c734e1) +++ vendor/nginx-1.9.9/auto/modules 2016-01-26 10:27:00 +0900 (b2d2ee4) @@ -73,6 +73,11 @@ if [ $HTTP_SSI = YES ]; then fi +if [ $HTTP_SLICE = YES ]; then + HTTP_POSTPONE=YES +fi + + if [ $HTTP_ADDITION = YES ]; then HTTP_POSTPONE=YES fi @@ -110,6 +115,7 @@ fi # ngx_http_copy_filter # ngx_http_range_body_filter # ngx_http_not_modified_filter +# ngx_http_slice_filter HTTP_FILTER_MODULES="$HTTP_WRITE_FILTER_MODULE \ $HTTP_HEADER_FILTER_MODULE \ @@ -179,6 +185,12 @@ if [ $HTTP_USERID = YES ]; then HTTP_SRCS="$HTTP_SRCS $HTTP_USERID_SRCS" fi +if [ $HTTP_SLICE = YES ]; then + HTTP_SRCS="$HTTP_SRCS $HTTP_SLICE_SRCS" +else + HTTP_SLICE_FILTER_MODULE="" +fi + if [ $HTTP_V2 = YES ]; then have=NGX_HTTP_V2 . auto/have @@ -461,7 +473,8 @@ if [ $HTTP = YES ]; then $HTTP_AUX_FILTER_MODULES \ $HTTP_COPY_FILTER_MODULE \ $HTTP_RANGE_BODY_FILTER_MODULE \ - $HTTP_NOT_MODIFIED_FILTER_MODULE" + $HTTP_NOT_MODIFIED_FILTER_MODULE \ + $HTTP_SLICE_FILTER_MODULE" NGX_ADDON_DEPS="$NGX_ADDON_DEPS \$(HTTP_DEPS)" fi Renamed: vendor/nginx-1.9.9/auto/nohave (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/options (+3 -0) 99% =================================================================== --- vendor/nginx-1.9.7/auto/options 2016-01-25 23:37:27 +0900 (efc8943) +++ vendor/nginx-1.9.9/auto/options 2016-01-26 10:27:00 +0900 (931dabb) @@ -71,6 +71,7 @@ HTTP_ACCESS=YES HTTP_AUTH_BASIC=YES HTTP_AUTH_REQUEST=NO HTTP_USERID=YES +HTTP_SLICE=NO HTTP_AUTOINDEX=YES HTTP_RANDOM_INDEX=NO HTTP_STATUS=NO @@ -226,6 +227,7 @@ do --with-http_random_index_module) HTTP_RANDOM_INDEX=YES ;; --with-http_secure_link_module) HTTP_SECURE_LINK=YES ;; --with-http_degradation_module) HTTP_DEGRADATION=YES ;; + --with-http_slice_module) HTTP_SLICE=YES ;; --without-http_charset_module) HTTP_CHARSET=NO ;; --without-http_gzip_module) HTTP_GZIP=NO ;; @@ -394,6 +396,7 @@ cat << END --with-http_random_index_module enable ngx_http_random_index_module --with-http_secure_link_module enable ngx_http_secure_link_module --with-http_degradation_module enable ngx_http_degradation_module + --with-http_slice_module enable ngx_http_slice_module --with-http_stub_status_module enable ngx_http_stub_status_module --without-http_charset_module disable ngx_http_charset_module Renamed: vendor/nginx-1.9.9/auto/os/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/os/darwin (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/os/freebsd (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/os/linux (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/os/solaris (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/os/win32 (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/sources (+4 -3) 99% =================================================================== --- vendor/nginx-1.9.7/auto/sources 2016-01-25 23:37:27 +0900 (2abbc60) +++ vendor/nginx-1.9.9/auto/sources 2016-01-26 10:27:00 +0900 (2e44ce1) @@ -254,9 +254,6 @@ NGX_WIN32_ICONS="src/os/win32/nginx.ico" NGX_WIN32_RC="src/os/win32/nginx.rc" -# the http modules that have their logging formats -# must be after ngx_http_log_module - HTTP_MODULES="ngx_http_module \ ngx_http_core_module \ ngx_http_log_module \ @@ -363,6 +360,10 @@ HTTP_USERID_FILTER_MODULE=ngx_http_userid_filter_module HTTP_USERID_SRCS=src/http/modules/ngx_http_userid_filter_module.c +HTTP_SLICE_FILTER_MODULE=ngx_http_slice_filter_module +HTTP_SLICE_SRCS=src/http/modules/ngx_http_slice_filter_module.c + + HTTP_REALIP_MODULE=ngx_http_realip_module HTTP_REALIP_SRCS=src/http/modules/ngx_http_realip_module.c Renamed: vendor/nginx-1.9.9/auto/stubs (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/summary (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/threads (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/types/sizeof (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/types/typedef (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/types/uintptr_t (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/types/value (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/auto/unix (+16 -0) 97% =================================================================== --- vendor/nginx-1.9.7/auto/unix 2016-01-25 23:37:27 +0900 (b7b7a25) +++ vendor/nginx-1.9.9/auto/unix 2016-01-26 10:27:00 +0900 (7bfca8f) @@ -589,6 +589,22 @@ ngx_feature_test="char buf[1]; ssize_t n; n = pwrite(1, buf, 1, 0); . auto/feature +# pwritev() was introduced in FreeBSD 6 and Linux 2.6.30, glibc 2.10 + +ngx_feature="pwritev()" +ngx_feature_name="NGX_HAVE_PWRITEV" +ngx_feature_run=no +ngx_feature_incs='#include <sys/uio.h>' +ngx_feature_path= +ngx_feature_libs= +ngx_feature_test="char buf[1]; struct iovec vec[1]; ssize_t n; + vec[0].iov_base = buf; + vec[0].iov_len = 1; + n = pwritev(1, vec, 1, 0); + if (n == -1) return 1" +. auto/feature + + ngx_feature="sys_nerr" ngx_feature_name="NGX_SYS_NERR" ngx_feature_run=value Renamed: vendor/nginx-1.9.9/conf/fastcgi.conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/conf/fastcgi_params (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/conf/koi-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/conf/koi-win (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/conf/mime.types (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/conf/nginx.conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/conf/scgi_params (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/conf/uwsgi_params (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/conf/win-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/contrib/README (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/contrib/geo2nginx.pl (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/contrib/unicode2nginx/koi-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/contrib/unicode2nginx/unicode-to-nginx.pl (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/contrib/unicode2nginx/win-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/contrib/vim/ftdetect/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/contrib/vim/indent/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/contrib/vim/syntax/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/docs/GNUmakefile (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/docs/dtd/change_log_conf.dtd (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/docs/dtd/changes.dtd (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/docs/html/50x.html (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/docs/html/index.html (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/docs/man/nginx.8 (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/docs/text/LICENSE (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/docs/text/README (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/docs/xml/change_log_conf.xml (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/docs/xml/nginx/changes.xml (+71 -1) 99% =================================================================== --- vendor/nginx-1.9.7/docs/xml/nginx/changes.xml 2016-01-25 23:37:27 +0900 (9d5c4e7) +++ vendor/nginx-1.9.9/docs/xml/nginx/changes.xml 2016-01-26 10:27:00 +0900 (55a9395) @@ -5,6 +5,76 @@ <change_log title="nginx"> +<changes ver="1.9.9" date="09.12.2015"> + +<change type="bugfix"> +<para lang="ru"> +проксирование в unix domain сокеты не работало при использовании переменных; +ошибка появилась в 1.9.8. +</para> +<para lang="en"> +proxying to unix domain sockets did not work when using variables; +the bug had appeared in 1.9.8. +</para> +</change> + +</changes> + + +<changes ver="1.9.8" date="08.12.2015"> + +<change type="feature"> +<para lang="ru"> +поддержка pwritev(). +</para> +<para lang="en"> +pwritev() support. +</para> +</change> + +<change type="feature"> +<para lang="ru"> +директива include в блоке upstream. +</para> +<para lang="en"> +the "include" directive inside the "upstream" block. +</para> +</change> + +<change type="feature"> +<para lang="ru"> +модуль ngx_http_slice_module. +</para> +<para lang="en"> +the ngx_http_slice_module. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +при использовании LibreSSL +в рабочем процессе мог произойти segmentation fault; +ошибка появилась в 1.9.6. +</para> +<para lang="en"> +a segmentation fault might occur in a worker process +when using LibreSSL; +the bug had appeared in 1.9.6. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +nginx мог не собираться на OS X. +</para> +<para lang="en"> +nginx could not be built on OS X in some cases. +</para> +</change> + +</changes> + + <changes ver="1.9.7" date="17.11.2015"> <change type="feature"> @@ -30,7 +100,7 @@ the "proxy_cache_convert_head" directive. переменная $realip_remote_addr в модуле ngx_http_realip_module. </para> <para lang="en"> -the $realip_remote_addr in the ngx_http_realip_module. +the $realip_remote_addr variable in the ngx_http_realip_module. </para> </change> Renamed: vendor/nginx-1.9.9/docs/xsls/changes.xsls (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/docs/xslt/changes.xslt (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/misc/GNUmakefile (+3 -2) 98% =================================================================== --- vendor/nginx-1.9.7/misc/GNUmakefile 2016-01-25 23:37:27 +0900 (a20b8ff) +++ vendor/nginx-1.9.9/misc/GNUmakefile 2016-01-26 10:27:00 +0900 (ba7b26e) @@ -5,9 +5,9 @@ NGINX = nginx-$(VER) TEMP = tmp OBJS = objs.msvc8 -OPENSSL = openssl-1.0.2d +OPENSSL = openssl-1.0.2e ZLIB = zlib-1.2.8 -PCRE = pcre-8.37 +PCRE = pcre-8.38 release: export @@ -79,6 +79,7 @@ win32: --with-http_auth_request_module \ --with-http_random_index_module \ --with-http_secure_link_module \ + --with-http_slice_module \ --with-mail \ --with-stream \ --with-openssl=$(OBJS)/lib/$(OPENSSL) \ Renamed: vendor/nginx-1.9.9/misc/README (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/nginx.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/nginx.h (+2 -2) 85% =================================================================== --- vendor/nginx-1.9.7/src/core/nginx.h 2016-01-25 23:37:27 +0900 (ae7d492) +++ vendor/nginx-1.9.9/src/core/nginx.h 2016-01-26 10:27:00 +0900 (87a984a) @@ -9,8 +9,8 @@ #define _NGINX_H_INCLUDED_ -#define nginx_version 1009007 -#define NGINX_VERSION "1.9.7" +#define nginx_version 1009009 +#define NGINX_VERSION "1.9.9" #define NGINX_VER "nginx/" NGINX_VERSION #ifdef NGX_BUILD Renamed: vendor/nginx-1.9.9/src/core/ngx_array.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_array.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_buf.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_buf.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_conf_file.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_conf_file.h (+1 -1) 99% =================================================================== --- vendor/nginx-1.9.7/src/core/ngx_conf_file.h 2016-01-25 23:37:27 +0900 (ee44306) +++ vendor/nginx-1.9.9/src/core/ngx_conf_file.h 2016-01-26 10:27:00 +0900 (2d03f43) @@ -50,7 +50,7 @@ #define NGX_DIRECT_CONF 0x00010000 #define NGX_MAIN_CONF 0x01000000 -#define NGX_ANY_CONF 0x0F000000 +#define NGX_ANY_CONF 0x1F000000 Renamed: vendor/nginx-1.9.9/src/core/ngx_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_connection.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_connection.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_core.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_cpuinfo.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_crc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_crc32.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_crc32.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_crypt.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_crypt.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_cycle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_cycle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_file.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_file.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_hash.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_hash.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_inet.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_inet.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_list.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_list.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_log.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_log.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_md5.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_md5.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_murmurhash.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_murmurhash.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_open_file_cache.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_open_file_cache.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_output_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_palloc.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_palloc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_parse.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_parse.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_parse_time.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_parse_time.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_proxy_protocol.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_proxy_protocol.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_queue.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_queue.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_radix_tree.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_radix_tree.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_rbtree.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_rbtree.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_regex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_regex.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_resolver.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_resolver.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_rwlock.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_rwlock.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_sha1.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_shmtx.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_shmtx.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_slab.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_slab.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_spinlock.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_string.c (+1 -1) 99% =================================================================== --- vendor/nginx-1.9.7/src/core/ngx_string.c 2016-01-25 23:37:27 +0900 (d2a8d01) +++ vendor/nginx-1.9.9/src/core/ngx_string.c 2016-01-26 10:27:00 +0900 (cf665a4) @@ -410,7 +410,7 @@ ngx_vslprintf(u_char *buf, u_char *last, const char *fmt, va_list args) hex = 2; sign = 0; zero = '0'; - width = NGX_PTR_SIZE * 2; + width = 2 * sizeof(void *); break; case 'c': Renamed: vendor/nginx-1.9.9/src/core/ngx_string.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_syslog.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_syslog.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_thread_pool.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_thread_pool.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_times.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/core/ngx_times.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/event/modules/ngx_devpoll_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/event/modules/ngx_epoll_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/event/modules/ngx_eventport_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/event/modules/ngx_iocp_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/event/modules/ngx_iocp_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/event/modules/ngx_kqueue_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/event/modules/ngx_poll_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/event/modules/ngx_select_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/event/modules/ngx_win32_select_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/event/ngx_event.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/event/ngx_event.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/event/ngx_event_accept.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/event/ngx_event_acceptex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/event/ngx_event_connect.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/event/ngx_event_connect.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/event/ngx_event_connectex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/event/ngx_event_openssl.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/event/ngx_event_openssl.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/event/ngx_event_openssl_stapling.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/event/ngx_event_pipe.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/event/ngx_event_pipe.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/event/ngx_event_posted.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/event/ngx_event_posted.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/event/ngx_event_timer.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/event/ngx_event_timer.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_access_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_addition_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_auth_basic_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_auth_request_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_autoindex_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_browser_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_charset_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_chunked_filter_module.c (+1 -1) 99% =================================================================== --- vendor/nginx-1.9.7/src/http/modules/ngx_http_chunked_filter_module.c 2016-01-25 23:37:27 +0900 (a7dc5bf) +++ vendor/nginx-1.9.9/src/http/modules/ngx_http_chunked_filter_module.c 2016-01-26 10:27:00 +0900 (0059a98) @@ -64,7 +64,7 @@ ngx_http_chunked_header_filter(ngx_http_request_t *r) || r->headers_out.status == NGX_HTTP_NO_CONTENT || r->headers_out.status < NGX_HTTP_OK || r != r->main - || (r->method & NGX_HTTP_HEAD)) + || r->method == NGX_HTTP_HEAD) { return ngx_http_next_header_filter(r); } Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_dav_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_degradation_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_empty_gif_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_fastcgi_module.c (+3 -2) 99% =================================================================== --- vendor/nginx-1.9.7/src/http/modules/ngx_http_fastcgi_module.c 2016-01-25 23:37:27 +0900 (668719f) +++ vendor/nginx-1.9.9/src/http/modules/ngx_http_fastcgi_module.c 2016-01-26 10:27:00 +0900 (dbd7767) @@ -773,10 +773,11 @@ ngx_http_fastcgi_eval(ngx_http_request_t *r, ngx_http_fastcgi_loc_conf_t *flcf) } else { u->resolved->host = url.host; - u->resolved->port = url.port; - u->resolved->no_port = url.no_port; } + u->resolved->port = url.port; + u->resolved->no_port = url.no_port; + return NGX_OK; } Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_flv_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_geo_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_geoip_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_gunzip_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_gzip_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_gzip_static_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_headers_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_image_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_index_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_limit_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_limit_req_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_log_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_map_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_memcached_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_mp4_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_not_modified_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_proxy_module.c (+8 -14) 99% =================================================================== --- vendor/nginx-1.9.7/src/http/modules/ngx_http_proxy_module.c 2016-01-25 23:37:27 +0900 (1933509) +++ vendor/nginx-1.9.9/src/http/modules/ngx_http_proxy_module.c 2016-01-26 10:27:00 +0900 (a869e74) @@ -1015,10 +1015,11 @@ ngx_http_proxy_eval(ngx_http_request_t *r, ngx_http_proxy_ctx_t *ctx, } else { u->resolved->host = url.host; - u->resolved->port = (in_port_t) (url.no_port ? port : url.port); - u->resolved->no_port = url.no_port; } + u->resolved->port = (in_port_t) (url.no_port ? port : url.port); + u->resolved->no_port = url.no_port; + return NGX_OK; } @@ -1156,25 +1157,24 @@ ngx_http_proxy_create_request(ngx_http_request_t *r) if (u->method.len) { /* HEAD was changed to GET to cache response */ method = u->method; - method.len++; } else if (plcf->method.len) { method = plcf->method; } else { method = r->method_name; - method.len++; } ctx = ngx_http_get_module_ctx(r, ngx_http_proxy_module); - if (method.len == 5 - && ngx_strncasecmp(method.data, (u_char *) "HEAD ", 5) == 0) + if (method.len == 4 + && ngx_strncasecmp(method.data, (u_char *) "HEAD", 4) == 0) { ctx->head = 1; } - len = method.len + sizeof(ngx_http_proxy_version) - 1 + sizeof(CRLF) - 1; + len = method.len + 1 + sizeof(ngx_http_proxy_version) - 1 + + sizeof(CRLF) - 1; escape = 0; loc_len = 0; @@ -1293,6 +1293,7 @@ ngx_http_proxy_create_request(ngx_http_request_t *r) /* the request line */ b->last = ngx_copy(b->last, method.data, method.len); + *b->last++ = ' '; u->uri.data = b->last; @@ -3158,13 +3159,6 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) ngx_conf_merge_str_value(conf->method, prev->method, ""); - if (conf->method.len - && conf->method.data[conf->method.len - 1] != ' ') - { - conf->method.data[conf->method.len] = ' '; - conf->method.len++; - } - ngx_conf_merge_value(conf->upstream.pass_request_headers, prev->upstream.pass_request_headers, 1); ngx_conf_merge_value(conf->upstream.pass_request_body, Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_random_index_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_range_filter_module.c (+23 -5) 97% =================================================================== --- vendor/nginx-1.9.7/src/http/modules/ngx_http_range_filter_module.c 2016-01-25 23:37:27 +0900 (952da75) +++ vendor/nginx-1.9.9/src/http/modules/ngx_http_range_filter_module.c 2016-01-26 10:27:00 +0900 (b07b2e2) @@ -154,7 +154,7 @@ ngx_http_range_header_filter(ngx_http_request_t *r) if (r->http_version < NGX_HTTP_VERSION_10 || r->headers_out.status != NGX_HTTP_OK - || r != r->main + || (r != r->main && !r->subrequest_ranges) || r->headers_out.content_length_n == -1 || !r->allow_ranges) { @@ -222,6 +222,8 @@ parse: return NGX_ERROR; } + ctx->offset = r->headers_out.content_offset; + if (ngx_array_init(&ctx->ranges, r->pool, 1, sizeof(ngx_http_range_t)) != NGX_OK) { @@ -273,10 +275,21 @@ static ngx_int_t ngx_http_range_parse(ngx_http_request_t *r, ngx_http_range_filter_ctx_t *ctx, ngx_uint_t ranges) { - u_char *p; - off_t start, end, size, content_length, cutoff, cutlim; - ngx_uint_t suffix; - ngx_http_range_t *range; + u_char *p; + off_t start, end, size, content_length, cutoff, + cutlim; + ngx_uint_t suffix; + ngx_http_range_t *range; + ngx_http_range_filter_ctx_t *mctx; + + if (r != r->main) { + mctx = ngx_http_get_module_ctx(r->main, + ngx_http_range_body_filter_module); + if (mctx) { + ctx->ranges = mctx->ranges; + return NGX_OK; + } + } p = r->headers_in.range->value.data + 6; size = 0; @@ -395,6 +408,10 @@ ngx_http_range_singlepart_header(ngx_http_request_t *r, ngx_table_elt_t *content_range; ngx_http_range_t *range; + if (r != r->main) { + return ngx_http_next_header_filter(r); + } + content_range = ngx_list_push(&r->headers_out.headers); if (content_range == NULL) { return NGX_ERROR; @@ -422,6 +439,7 @@ ngx_http_range_singlepart_header(ngx_http_request_t *r, - content_range->value.data; r->headers_out.content_length_n = range->end - range->start; + r->headers_out.content_offset = range->start; if (r->headers_out.content_length) { r->headers_out.content_length->hash = 0; Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_realip_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_referer_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_rewrite_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_scgi_module.c (+3 -2) 99% =================================================================== --- vendor/nginx-1.9.7/src/http/modules/ngx_http_scgi_module.c 2016-01-25 23:37:27 +0900 (6e5b077) +++ vendor/nginx-1.9.9/src/http/modules/ngx_http_scgi_module.c 2016-01-26 10:27:00 +0900 (76c7786) @@ -569,10 +569,11 @@ ngx_http_scgi_eval(ngx_http_request_t *r, ngx_http_scgi_loc_conf_t * scf) } else { u->resolved->host = url.host; - u->resolved->port = url.port; - u->resolved->no_port = url.no_port; } + u->resolved->port = url.port; + u->resolved->no_port = url.no_port; + return NGX_OK; } Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_secure_link_module.c (+0 -0) 100% =================================================================== Added: vendor/nginx-1.9.9/src/http/modules/ngx_http_slice_filter_module.c (+526 -0) 100644 =================================================================== --- /dev/null +++ vendor/nginx-1.9.9/src/http/modules/ngx_http_slice_filter_module.c 2016-01-26 10:27:00 +0900 (5e149b4) @@ -0,0 +1,526 @@ + +/* + * Copyright (C) Roman Arutyunyan + * Copyright (C) Nginx, Inc. + */ + + +#include <ngx_config.h> +#include <ngx_core.h> +#include <ngx_http.h> + + +typedef struct { + size_t size; +} ngx_http_slice_loc_conf_t; + + +typedef struct { + off_t start; + off_t end; + ngx_str_t range; + ngx_str_t etag; + ngx_uint_t last; /* unsigned last:1; */ +} ngx_http_slice_ctx_t; + + +typedef struct { + off_t start; + off_t end; + off_t complete_length; +} ngx_http_slice_content_range_t; + + +static ngx_int_t ngx_http_slice_header_filter(ngx_http_request_t *r); +static ngx_int_t ngx_http_slice_body_filter(ngx_http_request_t *r, + ngx_chain_t *in); +static ngx_int_t ngx_http_slice_parse_content_range(ngx_http_request_t *r, + ngx_http_slice_content_range_t *cr); +static ngx_int_t ngx_http_slice_range_variable(ngx_http_request_t *r, + ngx_http_variable_value_t *v, uintptr_t data); +static off_t ngx_http_slice_get_start(ngx_http_request_t *r); +static void *ngx_http_slice_create_loc_conf(ngx_conf_t *cf); +static char *ngx_http_slice_merge_loc_conf(ngx_conf_t *cf, void *parent, + void *child); +static ngx_int_t ngx_http_slice_add_variables(ngx_conf_t *cf); +static ngx_int_t ngx_http_slice_init(ngx_conf_t *cf); + + +static ngx_command_t ngx_http_slice_filter_commands[] = { + + { ngx_string("slice"), + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, + ngx_conf_set_size_slot, + NGX_HTTP_LOC_CONF_OFFSET, + offsetof(ngx_http_slice_loc_conf_t, size), + NULL }, + + ngx_null_command +}; + + +static ngx_http_module_t ngx_http_slice_filter_module_ctx = { + ngx_http_slice_add_variables, /* preconfiguration */ + ngx_http_slice_init, /* postconfiguration */ + + NULL, /* create main configuration */ + NULL, /* init main configuration */ + + NULL, /* create server configuration */ + NULL, /* merge server configuration */ + + ngx_http_slice_create_loc_conf, /* create location configuration */ + ngx_http_slice_merge_loc_conf /* merge location configuration */ +}; + + +ngx_module_t ngx_http_slice_filter_module = { + NGX_MODULE_V1, + &ngx_http_slice_filter_module_ctx, /* module context */ + ngx_http_slice_filter_commands, /* module directives */ + NGX_HTTP_MODULE, /* module type */ + NULL, /* init master */ + NULL, /* init module */ + NULL, /* init process */ + NULL, /* init thread */ + NULL, /* exit thread */ + NULL, /* exit process */ + NULL, /* exit master */ + NGX_MODULE_V1_PADDING +}; + + +static ngx_str_t ngx_http_slice_range_name = ngx_string("slice_range"); + +static ngx_http_output_header_filter_pt ngx_http_next_header_filter; +static ngx_http_output_body_filter_pt ngx_http_next_body_filter; + + +static ngx_int_t +ngx_http_slice_header_filter(ngx_http_request_t *r) +{ + off_t end; + ngx_int_t rc; + ngx_table_elt_t *h; + ngx_http_slice_ctx_t *ctx; + ngx_http_slice_loc_conf_t *slcf; + ngx_http_slice_content_range_t cr; + + ctx = ngx_http_get_module_ctx(r, ngx_http_slice_filter_module); + if (ctx == NULL) { + return ngx_http_next_header_filter(r); + } + + if (r->headers_out.status != NGX_HTTP_PARTIAL_CONTENT) { + if (r == r->main) { + ngx_http_set_ctx(r, NULL, ngx_http_slice_filter_module); + return ngx_http_next_header_filter(r); + } + + ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, + "unexpected status code %ui in slice response", + r->headers_out.status); + return NGX_ERROR; + } + + h = r->headers_out.etag; + + if (ctx->etag.len) { + if (h == NULL + || h->value.len != ctx->etag.len + || ngx_strncmp(h->value.data, ctx->etag.data, ctx->etag.len) + != 0) + { + ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, + "etag mismatch in slice response"); + return NGX_ERROR; + } + } + + if (h) { + ctx->etag = h->value; + } + + if (ngx_http_slice_parse_content_range(r, &cr) != NGX_OK) { + ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, + "invalid range in slice response"); + return NGX_ERROR; + } + + if (cr.complete_length == -1) { + ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, + "no complete length in slice response"); + return NGX_ERROR; + } + + ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, + "http slice response range: %O-%O/%O", + cr.start, cr.end, cr.complete_length); + + slcf = ngx_http_get_module_loc_conf(r, ngx_http_slice_filter_module); + + end = ngx_min(cr.start + (off_t) slcf->size, cr.complete_length); + + if (cr.start != ctx->start || cr.end != end) { + ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, + "unexpected range in slice response: %O-%O", + cr.start, cr.end); + return NGX_ERROR; + } + + ctx->start = end; + + r->headers_out.status = NGX_HTTP_OK; + r->headers_out.status_line.len = 0; + r->headers_out.content_length_n = cr.complete_length; + r->headers_out.content_offset = cr.start; + r->headers_out.content_range->hash = 0; + r->headers_out.content_range = NULL; + + r->allow_ranges = 1; + r->subrequest_ranges = 1; + r->single_range = 1; + + rc = ngx_http_next_header_filter(r); + + if (r != r->main) { + return rc; + } + + if (r->headers_out.status == NGX_HTTP_PARTIAL_CONTENT) { + if (ctx->start + (off_t) slcf->size <= r->headers_out.content_offset) { + ctx->start = slcf->size + * (r->headers_out.content_offset / slcf->size); + } + + ctx->end = r->headers_out.content_offset + + r->headers_out.content_length_n; + + } else { + ctx->end = cr.complete_length; + } + + return rc; +} + + +static ngx_int_t +ngx_http_slice_body_filter(ngx_http_request_t *r, ngx_chain_t *in) +{ + ngx_int_t rc; + ngx_chain_t *cl; + ngx_http_request_t *sr; + ngx_http_slice_ctx_t *ctx; + ngx_http_slice_loc_conf_t *slcf; + + ctx = ngx_http_get_module_ctx(r, ngx_http_slice_filter_module); + + if (ctx == NULL || r != r->main) { + return ngx_http_next_body_filter(r, in); + } + + for (cl = in; cl; cl = cl->next) { + if (cl->buf->last_buf) { + cl->buf->last_buf = 0; + cl->buf->last_in_chain = 1; + cl->buf->sync = 1; + ctx->last = 1; + } + } + + rc = ngx_http_next_body_filter(r, in); + + if (rc == NGX_ERROR || !ctx->last) { + return rc; + } + + if (ctx->start >= ctx->end) { + ngx_http_set_ctx(r, NULL, ngx_http_slice_filter_module); + ngx_http_send_special(r, NGX_HTTP_LAST); + return rc; + } + + if (r->buffered) { + return rc; + } + + if (ngx_http_subrequest(r, &r->uri, &r->args, &sr, NULL, 0) != NGX_OK) { + return NGX_ERROR; + } + + ngx_http_set_ctx(sr, ctx, ngx_http_slice_filter_module); + + slcf = ngx_http_get_module_loc_conf(r, ngx_http_slice_filter_module); + + ctx->range.len = ngx_sprintf(ctx->range.data, "bytes=%O-%O", ctx->start, + ctx->start + (off_t) slcf->size - 1) + - ctx->range.data; + + ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, + "http slice subrequest: \"%V\"", &ctx->range); + + return rc; +} + + +static ngx_int_t +ngx_http_slice_parse_content_range(ngx_http_request_t *r, + ngx_http_slice_content_range_t *cr) +{ + off_t start, end, complete_length, cutoff, cutlim; + u_char *p; + ngx_table_elt_t *h; + + h = r->headers_out.content_range; + + if (h == NULL + || h->value.len < 7 + || ngx_strncmp(h->value.data, "bytes ", 6) != 0) + { + return NGX_ERROR; + } + + p = h->value.data + 6; + + cutoff = NGX_MAX_OFF_T_VALUE / 10; + cutlim = NGX_MAX_OFF_T_VALUE % 10; + + start = 0; + end = 0; + complete_length = 0; + + while (*p == ' ') { p++; } + + if (*p < '0' || *p > '9') { + return NGX_ERROR; + } + + while (*p >= '0' && *p <= '9') { + if (start >= cutoff && (start > cutoff || *p - '0' > cutlim)) { + return NGX_ERROR; + } + + start = start * 10 + *p++ - '0'; + } + + while (*p == ' ') { p++; } + + if (*p++ != '-') { + return NGX_ERROR; + } + + while (*p == ' ') { p++; } + + if (*p < '0' || *p > '9') { + return NGX_ERROR; + } + + while (*p >= '0' && *p <= '9') { + if (end >= cutoff && (end > cutoff || *p - '0' > cutlim)) { + return NGX_ERROR; + } + + end = end * 10 + *p++ - '0'; + } + + end++; + + while (*p == ' ') { p++; } + + if (*p++ != '/') { + return NGX_ERROR; + } + + while (*p == ' ') { p++; } + + if (*p != '*') { + if (*p < '0' || *p > '9') { + return NGX_ERROR; + } + + while (*p >= '0' && *p <= '9') { + if (complete_length >= cutoff + && (complete_length > cutoff || *p - '0' > cutlim)) + { + return NGX_ERROR; + } + + complete_length = complete_length * 10 + *p++ - '0'; + } + + } else { + complete_length = -1; + p++; + } + + while (*p == ' ') { p++; } + + if (*p != '\0') { + return NGX_ERROR; + } + + cr->start = start; + cr->end = end; + cr->complete_length = complete_length; + + return NGX_OK; +} + + +static ngx_int_t +ngx_http_slice_range_variable(ngx_http_request_t *r, + ngx_http_variable_value_t *v, uintptr_t data) +{ + u_char *p; + ngx_http_slice_ctx_t *ctx; + ngx_http_slice_loc_conf_t *slcf; + + ctx = ngx_http_get_module_ctx(r, ngx_http_slice_filter_module); + + if (ctx == NULL) { + if (r != r->main || r->headers_out.status) { + v->not_found = 1; + return NGX_OK; + } + + slcf = ngx_http_get_module_loc_conf(r, ngx_http_slice_filter_module); + + if (slcf->size == 0) { + v->not_found = 1; + return NGX_OK; + } + + ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_slice_ctx_t)); + if (ctx == NULL) { + return NGX_ERROR; + } + + ngx_http_set_ctx(r, ctx, ngx_http_slice_filter_module); + + p = ngx_pnalloc(r->pool, sizeof("bytes=-") - 1 + 2 * NGX_OFF_T_LEN); + if (p == NULL) { + return NGX_ERROR; + } + + ctx->start = slcf->size * (ngx_http_slice_get_start(r) / slcf->size); + + ctx->range.data = p; + ctx->range.len = ngx_sprintf(p, "bytes=%O-%O", ctx->start, + ctx->start + (off_t) slcf->size - 1) + - p; + } + + v->data = ctx->range.data; + v->valid = 1; + v->not_found = 0; + v->no_cacheable = 1; + v->len = ctx->range.len; + + return NGX_OK; +} + + +static off_t +ngx_http_slice_get_start(ngx_http_request_t *r) +{ + off_t start, cutoff, cutlim; + u_char *p; + ngx_table_elt_t *h; + + if (r->headers_in.if_range) { + return 0; + } + + h = r->headers_in.range; + + if (h == NULL + || h->value.len < 7 + || ngx_strncasecmp(h->value.data, (u_char *) "bytes=", 6) != 0) + { + return 0; + } + + p = h->value.data + 6; + + if (ngx_strchr(p, ',')) { + return 0; + } + + while (*p == ' ') { p++; } + + if (*p == '-') { + return 0; + } + + cutoff = NGX_MAX_OFF_T_VALUE / 10; + cutlim = NGX_MAX_OFF_T_VALUE % 10; + + start = 0; + + while (*p >= '0' && *p <= '9') { + if (start >= cutoff && (start > cutoff || *p - '0' > cutlim)) { + return 0; + } + + start = start * 10 + *p++ - '0'; + } + + return start; +} + + +static void * +ngx_http_slice_create_loc_conf(ngx_conf_t *cf) +{ + ngx_http_slice_loc_conf_t *slcf; + + slcf = ngx_palloc(cf->pool, sizeof(ngx_http_slice_loc_conf_t)); + if (slcf == NULL) { + return NULL; + } + + slcf->size = NGX_CONF_UNSET_SIZE; + + return slcf; +} + + +static char * +ngx_http_slice_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) +{ + ngx_http_slice_loc_conf_t *prev = parent; + ngx_http_slice_loc_conf_t *conf = child; + + ngx_conf_merge_size_value(conf->size, prev->size, 0); + + return NGX_CONF_OK; +} + + +static ngx_int_t +ngx_http_slice_add_variables(ngx_conf_t *cf) +{ + ngx_http_variable_t *var; + + var = ngx_http_add_variable(cf, &ngx_http_slice_range_name, 0); + if (var == NULL) { + return NGX_ERROR; + } + + var->get_handler = ngx_http_slice_range_variable; + + return NGX_OK; +} + + +static ngx_int_t +ngx_http_slice_init(ngx_conf_t *cf) +{ + ngx_http_next_header_filter = ngx_http_top_header_filter; + ngx_http_top_header_filter = ngx_http_slice_header_filter; + + ngx_http_next_body_filter = ngx_http_top_body_filter; + ngx_http_top_body_filter = ngx_http_slice_body_filter; + + return NGX_OK; +} Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_split_clients_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_ssi_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_ssi_filter_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_ssl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_ssl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_static_module.c (+1 -1) 99% =================================================================== --- vendor/nginx-1.9.7/src/http/modules/ngx_http_static_module.c 2016-01-25 23:37:27 +0900 (631eb17) +++ vendor/nginx-1.9.9/src/http/modules/ngx_http_static_module.c 2016-01-26 10:27:00 +0900 (f79c4ae) @@ -204,7 +204,7 @@ ngx_http_static_handler(ngx_http_request_t *r) #endif - if (r->method & NGX_HTTP_POST) { + if (r->method == NGX_HTTP_POST) { return NGX_HTTP_NOT_ALLOWED; } Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_stub_status_module.c (+1 -1) 98% =================================================================== --- vendor/nginx-1.9.7/src/http/modules/ngx_http_stub_status_module.c 2016-01-25 23:37:27 +0900 (dd68358) +++ vendor/nginx-1.9.9/src/http/modules/ngx_http_stub_status_module.c 2016-01-26 10:27:00 +0900 (61199f2) @@ -89,7 +89,7 @@ ngx_http_stub_status_handler(ngx_http_request_t *r) ngx_chain_t out; ngx_atomic_int_t ap, hn, ac, rq, rd, wr, wa; - if (r->method != NGX_HTTP_GET && r->method != NGX_HTTP_HEAD) { + if (!(r->method & (NGX_HTTP_GET|NGX_HTTP_HEAD))) { return NGX_HTTP_NOT_ALLOWED; } Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_sub_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_upstream_hash_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_upstream_ip_hash_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_upstream_keepalive_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_upstream_least_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_upstream_zone_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_userid_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_uwsgi_module.c (+3 -2) 99% =================================================================== --- vendor/nginx-1.9.7/src/http/modules/ngx_http_uwsgi_module.c 2016-01-25 23:37:27 +0900 (a50c553) +++ vendor/nginx-1.9.9/src/http/modules/ngx_http_uwsgi_module.c 2016-01-26 10:27:00 +0900 (0313dfa) @@ -771,10 +771,11 @@ ngx_http_uwsgi_eval(ngx_http_request_t *r, ngx_http_uwsgi_loc_conf_t * uwcf) } else { u->resolved->host = url.host; - u->resolved->port = url.port; - u->resolved->no_port = url.no_port; } + u->resolved->port = url.port; + u->resolved->no_port = url.no_port; + return NGX_OK; } Renamed: vendor/nginx-1.9.9/src/http/modules/ngx_http_xslt_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/perl/Makefile.PL (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/perl/nginx.pm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/perl/nginx.xs (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/perl/ngx_http_perl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/perl/ngx_http_perl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/modules/perl/typemap (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/ngx_http.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/ngx_http.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/ngx_http_cache.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/ngx_http_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/ngx_http_copy_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/ngx_http_core_module.c (+2 -2) 99% =================================================================== --- vendor/nginx-1.9.7/src/http/ngx_http_core_module.c 2016-01-25 23:37:27 +0900 (7a29608) +++ vendor/nginx-1.9.9/src/http/ngx_http_core_module.c 2016-01-26 10:27:00 +0900 (4b8dd4c) @@ -776,7 +776,7 @@ ngx_module_t ngx_http_core_module = { }; -ngx_str_t ngx_http_core_get_method = { 3, (u_char *) "GET " }; +ngx_str_t ngx_http_core_get_method = { 3, (u_char *) "GET" }; void @@ -3503,7 +3503,7 @@ ngx_http_core_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) /* TODO: it does not merge, it inits only */ ngx_conf_merge_size_value(conf->connection_pool_size, - prev->connection_pool_size, 256); + prev->connection_pool_size, 64 * sizeof(void *)); ngx_conf_merge_size_value(conf->request_pool_size, prev->request_pool_size, 4096); ngx_conf_merge_msec_value(conf->client_header_timeout, Renamed: vendor/nginx-1.9.9/src/http/ngx_http_core_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/ngx_http_file_cache.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/ngx_http_header_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/ngx_http_parse.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/ngx_http_postpone_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/ngx_http_request.c (+5 -1) 99% =================================================================== --- vendor/nginx-1.9.7/src/http/ngx_http_request.c 2016-01-25 23:37:27 +0900 (ab7c15f) +++ vendor/nginx-1.9.9/src/http/ngx_http_request.c 2016-01-26 10:27:00 +0900 (99e9325) @@ -837,6 +837,10 @@ ngx_http_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg) c = ngx_ssl_get_connection(ssl_conn); + if (c->ssl->renegotiation) { + return SSL_TLSEXT_ERR_NOACK; + } + ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, "SSL server name: \"%s\"", servername); @@ -1788,7 +1792,7 @@ ngx_http_process_request_header(ngx_http_request_t *r) } } - if (r->method & NGX_HTTP_TRACE) { + if (r->method == NGX_HTTP_TRACE) { ngx_log_error(NGX_LOG_INFO, r->connection->log, 0, "client sent TRACE method"); ngx_http_finalize_request(r, NGX_HTTP_NOT_ALLOWED); Renamed: vendor/nginx-1.9.9/src/http/ngx_http_request.h (+2 -0) 99% =================================================================== --- vendor/nginx-1.9.7/src/http/ngx_http_request.h 2016-01-25 23:37:27 +0900 (967032a) +++ vendor/nginx-1.9.9/src/http/ngx_http_request.h 2016-01-26 10:27:00 +0900 (8b88139) @@ -271,6 +271,7 @@ typedef struct { ngx_array_t cache_control; off_t content_length_n; + off_t content_offset; time_t date_time; time_t last_modified_time; } ngx_http_headers_out_t; @@ -530,6 +531,7 @@ struct ngx_http_request_s { unsigned filter_need_in_memory:1; unsigned filter_need_temporary:1; unsigned allow_ranges:1; + unsigned subrequest_ranges:1; unsigned single_range:1; unsigned disable_not_modified:1; Renamed: vendor/nginx-1.9.9/src/http/ngx_http_request_body.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/ngx_http_script.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/ngx_http_script.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/ngx_http_special_response.c (+1 -4) 99% =================================================================== --- vendor/nginx-1.9.7/src/http/ngx_http_special_response.c 2016-01-25 23:37:27 +0900 (a97791e) +++ vendor/nginx-1.9.9/src/http/ngx_http_special_response.c 2016-01-26 10:27:00 +0900 (2771e58) @@ -359,9 +359,6 @@ static ngx_str_t ngx_http_error_pages[] = { }; -static ngx_str_t ngx_http_get_name = { 3, (u_char *) "GET " }; - - ngx_int_t ngx_http_special_response_handler(ngx_http_request_t *r, ngx_int_t error) { @@ -564,7 +561,7 @@ ngx_http_send_error_page(ngx_http_request_t *r, ngx_http_err_page_t *err_page) if (r->method != NGX_HTTP_HEAD) { r->method = NGX_HTTP_GET; - r->method_name = ngx_http_get_name; + r->method_name = ngx_http_core_get_method; } return ngx_http_internal_redirect(r, &uri, &args); Renamed: vendor/nginx-1.9.9/src/http/ngx_http_upstream.c (+18 -3) 99% =================================================================== --- vendor/nginx-1.9.7/src/http/ngx_http_upstream.c 2016-01-25 23:37:27 +0900 (74fffd5) +++ vendor/nginx-1.9.9/src/http/ngx_http_upstream.c 2016-01-26 10:27:00 +0900 (6c6ee80) @@ -250,6 +250,11 @@ ngx_http_upstream_header_t ngx_http_upstream_headers_in[] = { ngx_http_upstream_copy_allow_ranges, offsetof(ngx_http_headers_out_t, accept_ranges), 1 }, + { ngx_string("Content-Range"), + ngx_http_upstream_ignore_header_line, 0, + ngx_http_upstream_copy_header_line, + offsetof(ngx_http_headers_out_t, content_range), 0 }, + { ngx_string("Connection"), ngx_http_upstream_process_connection, 0, ngx_http_upstream_ignore_header_line, 0, 0 }, @@ -633,8 +638,20 @@ ngx_http_upstream_init_request(ngx_http_request_t *r) u->ssl_name = u->resolved->host; #endif + host = &u->resolved->host; + if (u->resolved->sockaddr) { + if (u->resolved->port == 0 + && u->resolved->sockaddr->sa_family != AF_UNIX) + { + ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, + "no port in upstream \"%V\"", host); + ngx_http_upstream_finalize_request(r, u, + NGX_HTTP_INTERNAL_SERVER_ERROR); + return; + } + if (ngx_http_upstream_create_round_robin_peer(r, u->resolved) != NGX_OK) { @@ -648,8 +665,6 @@ ngx_http_upstream_init_request(ngx_http_request_t *r) return; } - host = &u->resolved->host; - umcf = ngx_http_get_module_main_conf(r, ngx_http_upstream_module); uscfp = umcf->upstreams.elts; @@ -764,7 +779,7 @@ ngx_http_upstream_cache(ngx_http_request_t *r, ngx_http_upstream_t *u) return rc; } - if ((r->method & NGX_HTTP_HEAD) && u->conf->cache_convert_head) { + if (r->method == NGX_HTTP_HEAD && u->conf->cache_convert_head) { u->method = ngx_http_core_get_method; } Renamed: vendor/nginx-1.9.9/src/http/ngx_http_upstream.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/ngx_http_upstream_round_robin.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/ngx_http_upstream_round_robin.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/ngx_http_variables.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/ngx_http_variables.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/ngx_http_write_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/v2/ngx_http_v2.c (+0 -3) 99% =================================================================== --- vendor/nginx-1.9.7/src/http/v2/ngx_http_v2.c 2016-01-25 23:37:27 +0900 (e77c13a) +++ vendor/nginx-1.9.9/src/http/v2/ngx_http_v2.c 2016-01-26 10:27:00 +0900 (869ce08) @@ -3294,9 +3294,6 @@ ngx_http_v2_construct_request_line(ngx_http_request_t *r) ngx_memcpy(p, ending, sizeof(ending)); - /* some modules expect the space character after method name */ - r->method_name.data = r->request_line.data; - ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "http2 http request line: \"%V\"", &r->request_line); Renamed: vendor/nginx-1.9.9/src/http/v2/ngx_http_v2.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/v2/ngx_http_v2_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/v2/ngx_http_v2_huff_decode.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/v2/ngx_http_v2_huff_encode.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/v2/ngx_http_v2_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/v2/ngx_http_v2_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/http/v2/ngx_http_v2_table.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/mail/ngx_mail.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/mail/ngx_mail.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/mail/ngx_mail_auth_http_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/mail/ngx_mail_core_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/mail/ngx_mail_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/mail/ngx_mail_imap_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/mail/ngx_mail_imap_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/mail/ngx_mail_imap_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/mail/ngx_mail_parse.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/mail/ngx_mail_pop3_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/mail/ngx_mail_pop3_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/mail/ngx_mail_pop3_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/mail/ngx_mail_proxy_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/mail/ngx_mail_smtp_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/mail/ngx_mail_smtp_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/mail/ngx_mail_smtp_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/mail/ngx_mail_ssl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/mail/ngx_mail_ssl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/misc/ngx_cpp_test_module.cpp (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/misc/ngx_google_perftools_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/mysql/config (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/mysql/ngx_http_mysql_test.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/mysql/ngx_mysql.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/mysql/ngx_mysql.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_alloc.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_alloc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_atomic.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_channel.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_channel.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_daemon.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_darwin.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_darwin_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_darwin_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_darwin_sendfile_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_errno.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_errno.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_file_aio_read.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_files.c (+103 -34) 83% =================================================================== --- vendor/nginx-1.9.7/src/os/unix/ngx_files.c 2016-01-25 23:37:27 +0900 (417b598) +++ vendor/nginx-1.9.9/src/os/unix/ngx_files.c 2016-01-26 10:27:00 +0900 (00a6a49) @@ -14,6 +14,9 @@ static void ngx_thread_read_handler(void *data, ngx_log_t *log); #endif +static ssize_t ngx_writev_file(ngx_file_t *file, ngx_array_t *vec, size_t size, + off_t offset); + #if (NGX_HAVE_FILE_AIO) @@ -176,7 +179,8 @@ ngx_thread_read_handler(void *data, ngx_log_t *log) ssize_t ngx_write_file(ngx_file_t *file, u_char *buf, size_t size, off_t offset) { - ssize_t n, written; + ssize_t n, written; + ngx_err_t err; ngx_log_debug4(NGX_LOG_DEBUG_CORE, file->log, 0, "write: %d, %p, %uz, %O", file->fd, buf, size, offset); @@ -189,7 +193,15 @@ ngx_write_file(ngx_file_t *file, u_char *buf, size_t size, off_t offset) n = pwrite(file->fd, buf + written, size, offset); if (n == -1) { - ngx_log_error(NGX_LOG_CRIT, file->log, ngx_errno, + err = ngx_errno; + + if (err == NGX_EINTR) { + ngx_log_debug0(NGX_LOG_DEBUG_CORE, file->log, err, + "pwrite() was interrupted"); + continue; + } + + ngx_log_error(NGX_LOG_CRIT, file->log, err, "pwrite() \"%s\" failed", file->name.data); return NGX_ERROR; } @@ -221,11 +233,20 @@ ngx_write_file(ngx_file_t *file, u_char *buf, size_t size, off_t offset) n = write(file->fd, buf + written, size); if (n == -1) { - ngx_log_error(NGX_LOG_CRIT, file->log, ngx_errno, + err = ngx_errno; + + if (err == NGX_EINTR) { + ngx_log_debug0(NGX_LOG_DEBUG_CORE, file->log, err, + "write() was interrupted"); + continue; + } + + ngx_log_error(NGX_LOG_CRIT, file->log, err, "write() \"%s\" failed", file->name.data); return NGX_ERROR; } + file->sys_offset += n; file->offset += n; written += n; @@ -264,7 +285,6 @@ ngx_write_chain_to_file(ngx_file_t *file, ngx_chain_t *cl, off_t offset, u_char *prev; size_t size; ssize_t total, n; - ngx_err_t err; ngx_array_t vec; struct iovec *iov, iovs[NGX_IOVS]; @@ -326,52 +346,101 @@ ngx_write_chain_to_file(ngx_file_t *file, ngx_chain_t *cl, off_t offset, return total + n; } - if (file->sys_offset != offset) { - if (lseek(file->fd, offset, SEEK_SET) == -1) { - ngx_log_error(NGX_LOG_CRIT, file->log, ngx_errno, - "lseek() \"%s\" failed", file->name.data); - return NGX_ERROR; - } + n = ngx_writev_file(file, &vec, size, offset); - file->sys_offset = offset; + if (n == NGX_ERROR) { + return n; } + offset += n; + total += n; + + } while (cl); + + return total; +} + + +static ssize_t +ngx_writev_file(ngx_file_t *file, ngx_array_t *vec, size_t size, off_t offset) +{ + ssize_t n; + ngx_err_t err; + + ngx_log_debug3(NGX_LOG_DEBUG_CORE, file->log, 0, + "writev: %d, %uz, %O", file->fd, size, offset); + +#if (NGX_HAVE_PWRITEV) + eintr: - n = writev(file->fd, vec.elts, vec.nelts); + n = pwritev(file->fd, vec->elts, vec->nelts, offset); - if (n == -1) { - err = ngx_errno; + if (n == -1) { + err = ngx_errno; - if (err == NGX_EINTR) { - ngx_log_debug0(NGX_LOG_DEBUG_CORE, file->log, err, - "writev() was interrupted"); - goto eintr; - } + if (err == NGX_EINTR) { + ngx_log_debug0(NGX_LOG_DEBUG_CORE, file->log, err, + "pwritev() was interrupted"); + goto eintr; + } - ngx_log_error(NGX_LOG_CRIT, file->log, err, - "writev() \"%s\" failed", file->name.data); + ngx_log_error(NGX_LOG_CRIT, file->log, err, + "pwritev() \"%s\" failed", file->name.data); + return NGX_ERROR; + } + + if ((size_t) n != size) { + ngx_log_error(NGX_LOG_CRIT, file->log, 0, + "pwritev() \"%s\" has written only %z of %uz", + file->name.data, n, size); + return NGX_ERROR; + } + +#else + + if (file->sys_offset != offset) { + if (lseek(file->fd, offset, SEEK_SET) == -1) { + ngx_log_error(NGX_LOG_CRIT, file->log, ngx_errno, + "lseek() \"%s\" failed", file->name.data); return NGX_ERROR; } - if ((size_t) n != size) { - ngx_log_error(NGX_LOG_CRIT, file->log, 0, - "writev() \"%s\" has written only %z of %uz", - file->name.data, n, size); - return NGX_ERROR; + file->sys_offset = offset; + } + +eintr: + + n = writev(file->fd, vec->elts, vec->nelts); + + if (n == -1) { + err = ngx_errno; + + if (err == NGX_EINTR) { + ngx_log_debug0(NGX_LOG_DEBUG_CORE, file->log, err, + "writev() was interrupted"); + goto eintr; } - ngx_log_debug2(NGX_LOG_DEBUG_CORE, file->log, 0, - "writev: %d, %z", file->fd, n); + ngx_log_error(NGX_LOG_CRIT, file->log, err, + "writev() \"%s\" failed", file->name.data); + return NGX_ERROR; + } - file->sys_offset += n; - file->offset += n; - offset += n; - total += n; + if ((size_t) n != size) { + ngx_log_error(NGX_LOG_CRIT, file->log, 0, + "writev() \"%s\" has written only %z of %uz", + file->name.data, n, size); + return NGX_ERROR; + } - } while (cl); + file->sys_offset += n; - return total; +#endif + + file->offset += n; + + return n; } Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_files.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_freebsd.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_freebsd_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_freebsd_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_freebsd_sendfile_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_gcc_atomic_amd64.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_gcc_atomic_ppc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_gcc_atomic_sparc64.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_gcc_atomic_x86.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_linux.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_linux_aio_read.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_linux_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_linux_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_linux_sendfile_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_os.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_posix_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_posix_init.c (+1 -1) 97% =================================================================== --- vendor/nginx-1.9.7/src/os/unix/ngx_posix_init.c 2016-01-25 23:37:27 +0900 (bf3a310) +++ vendor/nginx-1.9.9/src/os/unix/ngx_posix_init.c 2016-01-26 10:27:00 +0900 (61cc8ca) @@ -63,7 +63,7 @@ ngx_os_init(ngx_log_t *log) if (getrlimit(RLIMIT_NOFILE, &rlmt) == -1) { ngx_log_error(NGX_LOG_ALERT, log, errno, - "getrlimit(RLIMIT_NOFILE) failed)"); + "getrlimit(RLIMIT_NOFILE) failed"); return NGX_ERROR; } Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_process.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_process.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_process_cycle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_process_cycle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_readv_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_recv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_send.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_setaffinity.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_setaffinity.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_setproctitle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_setproctitle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_shmem.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_shmem.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_socket.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_socket.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_solaris.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_solaris_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_solaris_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_solaris_sendfilev_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_sunpro_amd64.il (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_sunpro_atomic_sparc64.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_sunpro_sparc64.il (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_sunpro_x86.il (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_thread.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_thread_cond.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_thread_id.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_thread_mutex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_time.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_time.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_udp_recv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_user.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_user.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/unix/ngx_writev_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/nginx.ico (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/nginx.rc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/nginx_icon16.xpm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/nginx_icon32.xpm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/nginx_icon48.xpm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/ngx_alloc.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/ngx_alloc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/ngx_atomic.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/ngx_errno.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/ngx_errno.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/ngx_event_log.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/ngx_files.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/ngx_files.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/ngx_os.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/ngx_process.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/ngx_process.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/ngx_process_cycle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/ngx_process_cycle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/ngx_service.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/ngx_shmem.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/ngx_shmem.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/ngx_socket.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/ngx_socket.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/ngx_stat.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/ngx_thread.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/ngx_thread.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/ngx_time.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/ngx_time.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/ngx_udp_wsarecv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/ngx_user.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/ngx_user.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/ngx_win32_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/ngx_win32_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/ngx_wsarecv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/ngx_wsarecv_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/ngx_wsasend.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/os/win32/ngx_wsasend_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/stream/ngx_stream.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/stream/ngx_stream.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/stream/ngx_stream_access_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/stream/ngx_stream_core_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/stream/ngx_stream_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/stream/ngx_stream_limit_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/stream/ngx_stream_proxy_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/stream/ngx_stream_ssl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/stream/ngx_stream_ssl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/stream/ngx_stream_upstream.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/stream/ngx_stream_upstream.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/stream/ngx_stream_upstream_hash_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/stream/ngx_stream_upstream_least_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/stream/ngx_stream_upstream_round_robin.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/stream/ngx_stream_upstream_round_robin.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.9/src/stream/ngx_stream_upstream_zone_module.c (+0 -0) 100% ===================================================================
