Kentaro Hayashi
null+****@clear*****
Tue Oct 24 17:57:33 JST 2017
Kentaro Hayashi 2017-10-24 17:57:33 +0900 (Tue, 24 Oct 2017) New Revision: 0aeeacae05d2b0a43ba0b3dba88cf7a3fe558383 https://github.com/groonga/groonga/commit/0aeeacae05d2b0a43ba0b3dba88cf7a3fe558383 Message: vendor nginx: update bundled nginx to 1.13.6 $ ./update_nginx.sh 1.13.6 Added files: vendor/nginx-1.13.6/conf/mime.types Removed files: vendor/nginx-1.13.5/conf/mime.types Modified files: nginx_version Renamed files: vendor/nginx-1.13.6/auto/cc/acc (from vendor/nginx-1.13.5/auto/cc/acc) vendor/nginx-1.13.6/auto/cc/bcc (from vendor/nginx-1.13.5/auto/cc/bcc) vendor/nginx-1.13.6/auto/cc/ccc (from vendor/nginx-1.13.5/auto/cc/ccc) vendor/nginx-1.13.6/auto/cc/clang (from vendor/nginx-1.13.5/auto/cc/clang) vendor/nginx-1.13.6/auto/cc/conf (from vendor/nginx-1.13.5/auto/cc/conf) vendor/nginx-1.13.6/auto/cc/gcc (from vendor/nginx-1.13.5/auto/cc/gcc) vendor/nginx-1.13.6/auto/cc/icc (from vendor/nginx-1.13.5/auto/cc/icc) vendor/nginx-1.13.6/auto/cc/msvc (from vendor/nginx-1.13.5/auto/cc/msvc) vendor/nginx-1.13.6/auto/cc/name (from vendor/nginx-1.13.5/auto/cc/name) vendor/nginx-1.13.6/auto/cc/owc (from vendor/nginx-1.13.5/auto/cc/owc) vendor/nginx-1.13.6/auto/cc/sunc (from vendor/nginx-1.13.5/auto/cc/sunc) vendor/nginx-1.13.6/auto/configure (from vendor/nginx-1.13.5/auto/configure) vendor/nginx-1.13.6/auto/define (from vendor/nginx-1.13.5/auto/define) vendor/nginx-1.13.6/auto/endianness (from vendor/nginx-1.13.5/auto/endianness) vendor/nginx-1.13.6/auto/feature (from vendor/nginx-1.13.5/auto/feature) vendor/nginx-1.13.6/auto/have (from vendor/nginx-1.13.5/auto/have) vendor/nginx-1.13.6/auto/have_headers (from vendor/nginx-1.13.5/auto/have_headers) vendor/nginx-1.13.6/auto/headers (from vendor/nginx-1.13.5/auto/headers) vendor/nginx-1.13.6/auto/include (from vendor/nginx-1.13.5/auto/include) vendor/nginx-1.13.6/auto/init (from vendor/nginx-1.13.5/auto/init) vendor/nginx-1.13.6/auto/install (from vendor/nginx-1.13.5/auto/install) vendor/nginx-1.13.6/auto/lib/conf (from vendor/nginx-1.13.5/auto/lib/conf) vendor/nginx-1.13.6/auto/lib/geoip/conf (from vendor/nginx-1.13.5/auto/lib/geoip/conf) vendor/nginx-1.13.6/auto/lib/google-perftools/conf (from vendor/nginx-1.13.5/auto/lib/google-perftools/conf) vendor/nginx-1.13.6/auto/lib/libatomic/conf (from vendor/nginx-1.13.5/auto/lib/libatomic/conf) vendor/nginx-1.13.6/auto/lib/libatomic/make (from vendor/nginx-1.13.5/auto/lib/libatomic/make) vendor/nginx-1.13.6/auto/lib/libgd/conf (from vendor/nginx-1.13.5/auto/lib/libgd/conf) vendor/nginx-1.13.6/auto/lib/libxslt/conf (from vendor/nginx-1.13.5/auto/lib/libxslt/conf) vendor/nginx-1.13.6/auto/lib/make (from vendor/nginx-1.13.5/auto/lib/make) vendor/nginx-1.13.6/auto/lib/openssl/conf (from vendor/nginx-1.13.5/auto/lib/openssl/conf) vendor/nginx-1.13.6/auto/lib/openssl/make (from vendor/nginx-1.13.5/auto/lib/openssl/make) vendor/nginx-1.13.6/auto/lib/openssl/makefile.bcc (from vendor/nginx-1.13.5/auto/lib/openssl/makefile.bcc) vendor/nginx-1.13.6/auto/lib/openssl/makefile.msvc (from vendor/nginx-1.13.5/auto/lib/openssl/makefile.msvc) vendor/nginx-1.13.6/auto/lib/pcre/conf (from vendor/nginx-1.13.5/auto/lib/pcre/conf) vendor/nginx-1.13.6/auto/lib/pcre/make (from vendor/nginx-1.13.5/auto/lib/pcre/make) vendor/nginx-1.13.6/auto/lib/pcre/makefile.bcc (from vendor/nginx-1.13.5/auto/lib/pcre/makefile.bcc) vendor/nginx-1.13.6/auto/lib/pcre/makefile.msvc (from vendor/nginx-1.13.5/auto/lib/pcre/makefile.msvc) vendor/nginx-1.13.6/auto/lib/pcre/makefile.owc (from vendor/nginx-1.13.5/auto/lib/pcre/makefile.owc) vendor/nginx-1.13.6/auto/lib/perl/conf (from vendor/nginx-1.13.5/auto/lib/perl/conf) vendor/nginx-1.13.6/auto/lib/perl/make (from vendor/nginx-1.13.5/auto/lib/perl/make) vendor/nginx-1.13.6/auto/lib/zlib/conf (from vendor/nginx-1.13.5/auto/lib/zlib/conf) vendor/nginx-1.13.6/auto/lib/zlib/make (from vendor/nginx-1.13.5/auto/lib/zlib/make) vendor/nginx-1.13.6/auto/lib/zlib/makefile.bcc (from vendor/nginx-1.13.5/auto/lib/zlib/makefile.bcc) vendor/nginx-1.13.6/auto/lib/zlib/makefile.msvc (from vendor/nginx-1.13.5/auto/lib/zlib/makefile.msvc) vendor/nginx-1.13.6/auto/lib/zlib/makefile.owc (from vendor/nginx-1.13.5/auto/lib/zlib/makefile.owc) vendor/nginx-1.13.6/auto/make (from vendor/nginx-1.13.5/auto/make) vendor/nginx-1.13.6/auto/module (from vendor/nginx-1.13.5/auto/module) vendor/nginx-1.13.6/auto/modules (from vendor/nginx-1.13.5/auto/modules) vendor/nginx-1.13.6/auto/nohave (from vendor/nginx-1.13.5/auto/nohave) vendor/nginx-1.13.6/auto/options (from vendor/nginx-1.13.5/auto/options) vendor/nginx-1.13.6/auto/os/conf (from vendor/nginx-1.13.5/auto/os/conf) vendor/nginx-1.13.6/auto/os/darwin (from vendor/nginx-1.13.5/auto/os/darwin) vendor/nginx-1.13.6/auto/os/freebsd (from vendor/nginx-1.13.5/auto/os/freebsd) vendor/nginx-1.13.6/auto/os/linux (from vendor/nginx-1.13.5/auto/os/linux) vendor/nginx-1.13.6/auto/os/solaris (from vendor/nginx-1.13.5/auto/os/solaris) vendor/nginx-1.13.6/auto/os/win32 (from vendor/nginx-1.13.5/auto/os/win32) vendor/nginx-1.13.6/auto/sources (from vendor/nginx-1.13.5/auto/sources) vendor/nginx-1.13.6/auto/stubs (from vendor/nginx-1.13.5/auto/stubs) vendor/nginx-1.13.6/auto/summary (from vendor/nginx-1.13.5/auto/summary) vendor/nginx-1.13.6/auto/threads (from vendor/nginx-1.13.5/auto/threads) vendor/nginx-1.13.6/auto/types/sizeof (from vendor/nginx-1.13.5/auto/types/sizeof) vendor/nginx-1.13.6/auto/types/typedef (from vendor/nginx-1.13.5/auto/types/typedef) vendor/nginx-1.13.6/auto/types/uintptr_t (from vendor/nginx-1.13.5/auto/types/uintptr_t) vendor/nginx-1.13.6/auto/types/value (from vendor/nginx-1.13.5/auto/types/value) vendor/nginx-1.13.6/auto/unix (from vendor/nginx-1.13.5/auto/unix) vendor/nginx-1.13.6/conf/fastcgi.conf (from vendor/nginx-1.13.5/conf/fastcgi.conf) vendor/nginx-1.13.6/conf/fastcgi_params (from vendor/nginx-1.13.5/conf/fastcgi_params) vendor/nginx-1.13.6/conf/koi-utf (from vendor/nginx-1.13.5/conf/koi-utf) vendor/nginx-1.13.6/conf/koi-win (from vendor/nginx-1.13.5/conf/koi-win) vendor/nginx-1.13.6/conf/nginx.conf (from vendor/nginx-1.13.5/conf/nginx.conf) vendor/nginx-1.13.6/conf/scgi_params (from vendor/nginx-1.13.5/conf/scgi_params) vendor/nginx-1.13.6/conf/uwsgi_params (from vendor/nginx-1.13.5/conf/uwsgi_params) vendor/nginx-1.13.6/conf/win-utf (from vendor/nginx-1.13.5/conf/win-utf) vendor/nginx-1.13.6/contrib/README (from vendor/nginx-1.13.5/contrib/README) vendor/nginx-1.13.6/contrib/geo2nginx.pl (from vendor/nginx-1.13.5/contrib/geo2nginx.pl) vendor/nginx-1.13.6/contrib/unicode2nginx/koi-utf (from vendor/nginx-1.13.5/contrib/unicode2nginx/koi-utf) vendor/nginx-1.13.6/contrib/unicode2nginx/unicode-to-nginx.pl (from vendor/nginx-1.13.5/contrib/unicode2nginx/unicode-to-nginx.pl) vendor/nginx-1.13.6/contrib/unicode2nginx/win-utf (from vendor/nginx-1.13.5/contrib/unicode2nginx/win-utf) vendor/nginx-1.13.6/contrib/vim/ftdetect/nginx.vim (from vendor/nginx-1.13.5/contrib/vim/ftdetect/nginx.vim) vendor/nginx-1.13.6/contrib/vim/ftplugin/nginx.vim (from vendor/nginx-1.13.5/contrib/vim/ftplugin/nginx.vim) vendor/nginx-1.13.6/contrib/vim/indent/nginx.vim (from vendor/nginx-1.13.5/contrib/vim/indent/nginx.vim) vendor/nginx-1.13.6/contrib/vim/syntax/nginx.vim (from vendor/nginx-1.13.5/contrib/vim/syntax/nginx.vim) vendor/nginx-1.13.6/docs/GNUmakefile (from vendor/nginx-1.13.5/docs/GNUmakefile) vendor/nginx-1.13.6/docs/dtd/change_log_conf.dtd (from vendor/nginx-1.13.5/docs/dtd/change_log_conf.dtd) vendor/nginx-1.13.6/docs/dtd/changes.dtd (from vendor/nginx-1.13.5/docs/dtd/changes.dtd) vendor/nginx-1.13.6/docs/html/50x.html (from vendor/nginx-1.13.5/docs/html/50x.html) vendor/nginx-1.13.6/docs/html/index.html (from vendor/nginx-1.13.5/docs/html/index.html) vendor/nginx-1.13.6/docs/man/nginx.8 (from vendor/nginx-1.13.5/docs/man/nginx.8) vendor/nginx-1.13.6/docs/text/LICENSE (from vendor/nginx-1.13.5/docs/text/LICENSE) vendor/nginx-1.13.6/docs/text/README (from vendor/nginx-1.13.5/docs/text/README) vendor/nginx-1.13.6/docs/xml/change_log_conf.xml (from vendor/nginx-1.13.5/docs/xml/change_log_conf.xml) vendor/nginx-1.13.6/docs/xml/nginx/changes.xml (from vendor/nginx-1.13.5/docs/xml/nginx/changes.xml) vendor/nginx-1.13.6/docs/xsls/changes.xsls (from vendor/nginx-1.13.5/docs/xsls/changes.xsls) vendor/nginx-1.13.6/docs/xslt/changes.xslt (from vendor/nginx-1.13.5/docs/xslt/changes.xslt) vendor/nginx-1.13.6/misc/GNUmakefile (from vendor/nginx-1.13.5/misc/GNUmakefile) vendor/nginx-1.13.6/misc/README (from vendor/nginx-1.13.5/misc/README) vendor/nginx-1.13.6/src/core/nginx.c (from vendor/nginx-1.13.5/src/core/nginx.c) vendor/nginx-1.13.6/src/core/nginx.h (from vendor/nginx-1.13.5/src/core/nginx.h) vendor/nginx-1.13.6/src/core/ngx_array.c (from vendor/nginx-1.13.5/src/core/ngx_array.c) vendor/nginx-1.13.6/src/core/ngx_array.h (from vendor/nginx-1.13.5/src/core/ngx_array.h) vendor/nginx-1.13.6/src/core/ngx_buf.c (from vendor/nginx-1.13.5/src/core/ngx_buf.c) vendor/nginx-1.13.6/src/core/ngx_buf.h (from vendor/nginx-1.13.5/src/core/ngx_buf.h) vendor/nginx-1.13.6/src/core/ngx_conf_file.c (from vendor/nginx-1.13.5/src/core/ngx_conf_file.c) vendor/nginx-1.13.6/src/core/ngx_conf_file.h (from vendor/nginx-1.13.5/src/core/ngx_conf_file.h) vendor/nginx-1.13.6/src/core/ngx_config.h (from vendor/nginx-1.13.5/src/core/ngx_config.h) vendor/nginx-1.13.6/src/core/ngx_connection.c (from vendor/nginx-1.13.5/src/core/ngx_connection.c) vendor/nginx-1.13.6/src/core/ngx_connection.h (from vendor/nginx-1.13.5/src/core/ngx_connection.h) vendor/nginx-1.13.6/src/core/ngx_core.h (from vendor/nginx-1.13.5/src/core/ngx_core.h) vendor/nginx-1.13.6/src/core/ngx_cpuinfo.c (from vendor/nginx-1.13.5/src/core/ngx_cpuinfo.c) vendor/nginx-1.13.6/src/core/ngx_crc.h (from vendor/nginx-1.13.5/src/core/ngx_crc.h) vendor/nginx-1.13.6/src/core/ngx_crc32.c (from vendor/nginx-1.13.5/src/core/ngx_crc32.c) vendor/nginx-1.13.6/src/core/ngx_crc32.h (from vendor/nginx-1.13.5/src/core/ngx_crc32.h) vendor/nginx-1.13.6/src/core/ngx_crypt.c (from vendor/nginx-1.13.5/src/core/ngx_crypt.c) vendor/nginx-1.13.6/src/core/ngx_crypt.h (from vendor/nginx-1.13.5/src/core/ngx_crypt.h) vendor/nginx-1.13.6/src/core/ngx_cycle.c (from vendor/nginx-1.13.5/src/core/ngx_cycle.c) vendor/nginx-1.13.6/src/core/ngx_cycle.h (from vendor/nginx-1.13.5/src/core/ngx_cycle.h) vendor/nginx-1.13.6/src/core/ngx_file.c (from vendor/nginx-1.13.5/src/core/ngx_file.c) vendor/nginx-1.13.6/src/core/ngx_file.h (from vendor/nginx-1.13.5/src/core/ngx_file.h) vendor/nginx-1.13.6/src/core/ngx_hash.c (from vendor/nginx-1.13.5/src/core/ngx_hash.c) vendor/nginx-1.13.6/src/core/ngx_hash.h (from vendor/nginx-1.13.5/src/core/ngx_hash.h) vendor/nginx-1.13.6/src/core/ngx_inet.c (from vendor/nginx-1.13.5/src/core/ngx_inet.c) vendor/nginx-1.13.6/src/core/ngx_inet.h (from vendor/nginx-1.13.5/src/core/ngx_inet.h) vendor/nginx-1.13.6/src/core/ngx_list.c (from vendor/nginx-1.13.5/src/core/ngx_list.c) vendor/nginx-1.13.6/src/core/ngx_list.h (from vendor/nginx-1.13.5/src/core/ngx_list.h) vendor/nginx-1.13.6/src/core/ngx_log.c (from vendor/nginx-1.13.5/src/core/ngx_log.c) vendor/nginx-1.13.6/src/core/ngx_log.h (from vendor/nginx-1.13.5/src/core/ngx_log.h) vendor/nginx-1.13.6/src/core/ngx_md5.c (from vendor/nginx-1.13.5/src/core/ngx_md5.c) vendor/nginx-1.13.6/src/core/ngx_md5.h (from vendor/nginx-1.13.5/src/core/ngx_md5.h) vendor/nginx-1.13.6/src/core/ngx_module.c (from vendor/nginx-1.13.5/src/core/ngx_module.c) vendor/nginx-1.13.6/src/core/ngx_module.h (from vendor/nginx-1.13.5/src/core/ngx_module.h) vendor/nginx-1.13.6/src/core/ngx_murmurhash.c (from vendor/nginx-1.13.5/src/core/ngx_murmurhash.c) vendor/nginx-1.13.6/src/core/ngx_murmurhash.h (from vendor/nginx-1.13.5/src/core/ngx_murmurhash.h) vendor/nginx-1.13.6/src/core/ngx_open_file_cache.c (from vendor/nginx-1.13.5/src/core/ngx_open_file_cache.c) vendor/nginx-1.13.6/src/core/ngx_open_file_cache.h (from vendor/nginx-1.13.5/src/core/ngx_open_file_cache.h) vendor/nginx-1.13.6/src/core/ngx_output_chain.c (from vendor/nginx-1.13.5/src/core/ngx_output_chain.c) vendor/nginx-1.13.6/src/core/ngx_palloc.c (from vendor/nginx-1.13.5/src/core/ngx_palloc.c) vendor/nginx-1.13.6/src/core/ngx_palloc.h (from vendor/nginx-1.13.5/src/core/ngx_palloc.h) vendor/nginx-1.13.6/src/core/ngx_parse.c (from vendor/nginx-1.13.5/src/core/ngx_parse.c) vendor/nginx-1.13.6/src/core/ngx_parse.h (from vendor/nginx-1.13.5/src/core/ngx_parse.h) vendor/nginx-1.13.6/src/core/ngx_parse_time.c (from vendor/nginx-1.13.5/src/core/ngx_parse_time.c) vendor/nginx-1.13.6/src/core/ngx_parse_time.h (from vendor/nginx-1.13.5/src/core/ngx_parse_time.h) vendor/nginx-1.13.6/src/core/ngx_proxy_protocol.c (from vendor/nginx-1.13.5/src/core/ngx_proxy_protocol.c) vendor/nginx-1.13.6/src/core/ngx_proxy_protocol.h (from vendor/nginx-1.13.5/src/core/ngx_proxy_protocol.h) vendor/nginx-1.13.6/src/core/ngx_queue.c (from vendor/nginx-1.13.5/src/core/ngx_queue.c) vendor/nginx-1.13.6/src/core/ngx_queue.h (from vendor/nginx-1.13.5/src/core/ngx_queue.h) vendor/nginx-1.13.6/src/core/ngx_radix_tree.c (from vendor/nginx-1.13.5/src/core/ngx_radix_tree.c) vendor/nginx-1.13.6/src/core/ngx_radix_tree.h (from vendor/nginx-1.13.5/src/core/ngx_radix_tree.h) vendor/nginx-1.13.6/src/core/ngx_rbtree.c (from vendor/nginx-1.13.5/src/core/ngx_rbtree.c) vendor/nginx-1.13.6/src/core/ngx_rbtree.h (from vendor/nginx-1.13.5/src/core/ngx_rbtree.h) vendor/nginx-1.13.6/src/core/ngx_regex.c (from vendor/nginx-1.13.5/src/core/ngx_regex.c) vendor/nginx-1.13.6/src/core/ngx_regex.h (from vendor/nginx-1.13.5/src/core/ngx_regex.h) vendor/nginx-1.13.6/src/core/ngx_resolver.c (from vendor/nginx-1.13.5/src/core/ngx_resolver.c) vendor/nginx-1.13.6/src/core/ngx_resolver.h (from vendor/nginx-1.13.5/src/core/ngx_resolver.h) vendor/nginx-1.13.6/src/core/ngx_rwlock.c (from vendor/nginx-1.13.5/src/core/ngx_rwlock.c) vendor/nginx-1.13.6/src/core/ngx_rwlock.h (from vendor/nginx-1.13.5/src/core/ngx_rwlock.h) vendor/nginx-1.13.6/src/core/ngx_sha1.c (from vendor/nginx-1.13.5/src/core/ngx_sha1.c) vendor/nginx-1.13.6/src/core/ngx_sha1.h (from vendor/nginx-1.13.5/src/core/ngx_sha1.h) vendor/nginx-1.13.6/src/core/ngx_shmtx.c (from vendor/nginx-1.13.5/src/core/ngx_shmtx.c) vendor/nginx-1.13.6/src/core/ngx_shmtx.h (from vendor/nginx-1.13.5/src/core/ngx_shmtx.h) vendor/nginx-1.13.6/src/core/ngx_slab.c (from vendor/nginx-1.13.5/src/core/ngx_slab.c) vendor/nginx-1.13.6/src/core/ngx_slab.h (from vendor/nginx-1.13.5/src/core/ngx_slab.h) vendor/nginx-1.13.6/src/core/ngx_spinlock.c (from vendor/nginx-1.13.5/src/core/ngx_spinlock.c) vendor/nginx-1.13.6/src/core/ngx_string.c (from vendor/nginx-1.13.5/src/core/ngx_string.c) vendor/nginx-1.13.6/src/core/ngx_string.h (from vendor/nginx-1.13.5/src/core/ngx_string.h) vendor/nginx-1.13.6/src/core/ngx_syslog.c (from vendor/nginx-1.13.5/src/core/ngx_syslog.c) vendor/nginx-1.13.6/src/core/ngx_syslog.h (from vendor/nginx-1.13.5/src/core/ngx_syslog.h) vendor/nginx-1.13.6/src/core/ngx_thread_pool.c (from vendor/nginx-1.13.5/src/core/ngx_thread_pool.c) vendor/nginx-1.13.6/src/core/ngx_thread_pool.h (from vendor/nginx-1.13.5/src/core/ngx_thread_pool.h) vendor/nginx-1.13.6/src/core/ngx_times.c (from vendor/nginx-1.13.5/src/core/ngx_times.c) vendor/nginx-1.13.6/src/core/ngx_times.h (from vendor/nginx-1.13.5/src/core/ngx_times.h) vendor/nginx-1.13.6/src/event/modules/ngx_devpoll_module.c (from vendor/nginx-1.13.5/src/event/modules/ngx_devpoll_module.c) vendor/nginx-1.13.6/src/event/modules/ngx_epoll_module.c (from vendor/nginx-1.13.5/src/event/modules/ngx_epoll_module.c) vendor/nginx-1.13.6/src/event/modules/ngx_eventport_module.c (from vendor/nginx-1.13.5/src/event/modules/ngx_eventport_module.c) vendor/nginx-1.13.6/src/event/modules/ngx_iocp_module.c (from vendor/nginx-1.13.5/src/event/modules/ngx_iocp_module.c) vendor/nginx-1.13.6/src/event/modules/ngx_iocp_module.h (from vendor/nginx-1.13.5/src/event/modules/ngx_iocp_module.h) vendor/nginx-1.13.6/src/event/modules/ngx_kqueue_module.c (from vendor/nginx-1.13.5/src/event/modules/ngx_kqueue_module.c) vendor/nginx-1.13.6/src/event/modules/ngx_poll_module.c (from vendor/nginx-1.13.5/src/event/modules/ngx_poll_module.c) vendor/nginx-1.13.6/src/event/modules/ngx_select_module.c (from vendor/nginx-1.13.5/src/event/modules/ngx_select_module.c) vendor/nginx-1.13.6/src/event/modules/ngx_win32_select_module.c (from vendor/nginx-1.13.5/src/event/modules/ngx_win32_select_module.c) vendor/nginx-1.13.6/src/event/ngx_event.c (from vendor/nginx-1.13.5/src/event/ngx_event.c) vendor/nginx-1.13.6/src/event/ngx_event.h (from vendor/nginx-1.13.5/src/event/ngx_event.h) vendor/nginx-1.13.6/src/event/ngx_event_accept.c (from vendor/nginx-1.13.5/src/event/ngx_event_accept.c) vendor/nginx-1.13.6/src/event/ngx_event_acceptex.c (from vendor/nginx-1.13.5/src/event/ngx_event_acceptex.c) vendor/nginx-1.13.6/src/event/ngx_event_connect.c (from vendor/nginx-1.13.5/src/event/ngx_event_connect.c) vendor/nginx-1.13.6/src/event/ngx_event_connect.h (from vendor/nginx-1.13.5/src/event/ngx_event_connect.h) vendor/nginx-1.13.6/src/event/ngx_event_connectex.c (from vendor/nginx-1.13.5/src/event/ngx_event_connectex.c) vendor/nginx-1.13.6/src/event/ngx_event_openssl.c (from vendor/nginx-1.13.5/src/event/ngx_event_openssl.c) vendor/nginx-1.13.6/src/event/ngx_event_openssl.h (from vendor/nginx-1.13.5/src/event/ngx_event_openssl.h) vendor/nginx-1.13.6/src/event/ngx_event_openssl_stapling.c (from vendor/nginx-1.13.5/src/event/ngx_event_openssl_stapling.c) vendor/nginx-1.13.6/src/event/ngx_event_pipe.c (from vendor/nginx-1.13.5/src/event/ngx_event_pipe.c) vendor/nginx-1.13.6/src/event/ngx_event_pipe.h (from vendor/nginx-1.13.5/src/event/ngx_event_pipe.h) vendor/nginx-1.13.6/src/event/ngx_event_posted.c (from vendor/nginx-1.13.5/src/event/ngx_event_posted.c) vendor/nginx-1.13.6/src/event/ngx_event_posted.h (from vendor/nginx-1.13.5/src/event/ngx_event_posted.h) vendor/nginx-1.13.6/src/event/ngx_event_timer.c (from vendor/nginx-1.13.5/src/event/ngx_event_timer.c) vendor/nginx-1.13.6/src/event/ngx_event_timer.h (from vendor/nginx-1.13.5/src/event/ngx_event_timer.h) vendor/nginx-1.13.6/src/http/modules/ngx_http_access_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_access_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_addition_filter_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_addition_filter_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_auth_basic_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_auth_basic_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_auth_request_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_auth_request_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_autoindex_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_autoindex_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_browser_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_browser_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_charset_filter_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_charset_filter_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_chunked_filter_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_chunked_filter_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_dav_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_dav_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_degradation_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_degradation_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_empty_gif_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_empty_gif_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_fastcgi_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_fastcgi_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_flv_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_flv_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_geo_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_geo_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_geoip_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_geoip_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_gunzip_filter_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_gunzip_filter_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_gzip_filter_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_gzip_filter_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_gzip_static_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_gzip_static_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_headers_filter_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_headers_filter_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_image_filter_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_image_filter_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_index_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_index_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_limit_conn_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_limit_conn_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_limit_req_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_limit_req_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_log_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_log_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_map_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_map_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_memcached_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_memcached_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_mirror_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_mirror_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_mp4_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_mp4_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_not_modified_filter_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_not_modified_filter_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_proxy_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_proxy_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_random_index_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_random_index_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_range_filter_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_range_filter_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_realip_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_realip_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_referer_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_referer_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_rewrite_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_rewrite_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_scgi_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_scgi_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_secure_link_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_secure_link_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_slice_filter_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_slice_filter_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_split_clients_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_split_clients_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_ssi_filter_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_ssi_filter_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_ssi_filter_module.h (from vendor/nginx-1.13.5/src/http/modules/ngx_http_ssi_filter_module.h) vendor/nginx-1.13.6/src/http/modules/ngx_http_ssl_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_ssl_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_ssl_module.h (from vendor/nginx-1.13.5/src/http/modules/ngx_http_ssl_module.h) vendor/nginx-1.13.6/src/http/modules/ngx_http_static_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_static_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_stub_status_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_stub_status_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_sub_filter_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_sub_filter_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_try_files_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_try_files_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_upstream_hash_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_upstream_hash_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_upstream_ip_hash_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_upstream_ip_hash_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_upstream_keepalive_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_upstream_keepalive_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_upstream_least_conn_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_upstream_least_conn_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_upstream_zone_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_upstream_zone_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_userid_filter_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_userid_filter_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_uwsgi_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_uwsgi_module.c) vendor/nginx-1.13.6/src/http/modules/ngx_http_xslt_filter_module.c (from vendor/nginx-1.13.5/src/http/modules/ngx_http_xslt_filter_module.c) vendor/nginx-1.13.6/src/http/modules/perl/Makefile.PL (from vendor/nginx-1.13.5/src/http/modules/perl/Makefile.PL) vendor/nginx-1.13.6/src/http/modules/perl/nginx.pm (from vendor/nginx-1.13.5/src/http/modules/perl/nginx.pm) vendor/nginx-1.13.6/src/http/modules/perl/nginx.xs (from vendor/nginx-1.13.5/src/http/modules/perl/nginx.xs) vendor/nginx-1.13.6/src/http/modules/perl/ngx_http_perl_module.c (from vendor/nginx-1.13.5/src/http/modules/perl/ngx_http_perl_module.c) vendor/nginx-1.13.6/src/http/modules/perl/ngx_http_perl_module.h (from vendor/nginx-1.13.5/src/http/modules/perl/ngx_http_perl_module.h) vendor/nginx-1.13.6/src/http/modules/perl/typemap (from vendor/nginx-1.13.5/src/http/modules/perl/typemap) vendor/nginx-1.13.6/src/http/ngx_http.c (from vendor/nginx-1.13.5/src/http/ngx_http.c) vendor/nginx-1.13.6/src/http/ngx_http.h (from vendor/nginx-1.13.5/src/http/ngx_http.h) vendor/nginx-1.13.6/src/http/ngx_http_cache.h (from vendor/nginx-1.13.5/src/http/ngx_http_cache.h) vendor/nginx-1.13.6/src/http/ngx_http_config.h (from vendor/nginx-1.13.5/src/http/ngx_http_config.h) vendor/nginx-1.13.6/src/http/ngx_http_copy_filter_module.c (from vendor/nginx-1.13.5/src/http/ngx_http_copy_filter_module.c) vendor/nginx-1.13.6/src/http/ngx_http_core_module.c (from vendor/nginx-1.13.5/src/http/ngx_http_core_module.c) vendor/nginx-1.13.6/src/http/ngx_http_core_module.h (from vendor/nginx-1.13.5/src/http/ngx_http_core_module.h) vendor/nginx-1.13.6/src/http/ngx_http_file_cache.c (from vendor/nginx-1.13.5/src/http/ngx_http_file_cache.c) vendor/nginx-1.13.6/src/http/ngx_http_header_filter_module.c (from vendor/nginx-1.13.5/src/http/ngx_http_header_filter_module.c) vendor/nginx-1.13.6/src/http/ngx_http_parse.c (from vendor/nginx-1.13.5/src/http/ngx_http_parse.c) vendor/nginx-1.13.6/src/http/ngx_http_postpone_filter_module.c (from vendor/nginx-1.13.5/src/http/ngx_http_postpone_filter_module.c) vendor/nginx-1.13.6/src/http/ngx_http_request.c (from vendor/nginx-1.13.5/src/http/ngx_http_request.c) vendor/nginx-1.13.6/src/http/ngx_http_request.h (from vendor/nginx-1.13.5/src/http/ngx_http_request.h) vendor/nginx-1.13.6/src/http/ngx_http_request_body.c (from vendor/nginx-1.13.5/src/http/ngx_http_request_body.c) vendor/nginx-1.13.6/src/http/ngx_http_script.c (from vendor/nginx-1.13.5/src/http/ngx_http_script.c) vendor/nginx-1.13.6/src/http/ngx_http_script.h (from vendor/nginx-1.13.5/src/http/ngx_http_script.h) vendor/nginx-1.13.6/src/http/ngx_http_special_response.c (from vendor/nginx-1.13.5/src/http/ngx_http_special_response.c) vendor/nginx-1.13.6/src/http/ngx_http_upstream.c (from vendor/nginx-1.13.5/src/http/ngx_http_upstream.c) vendor/nginx-1.13.6/src/http/ngx_http_upstream.h (from vendor/nginx-1.13.5/src/http/ngx_http_upstream.h) vendor/nginx-1.13.6/src/http/ngx_http_upstream_round_robin.c (from vendor/nginx-1.13.5/src/http/ngx_http_upstream_round_robin.c) vendor/nginx-1.13.6/src/http/ngx_http_upstream_round_robin.h (from vendor/nginx-1.13.5/src/http/ngx_http_upstream_round_robin.h) vendor/nginx-1.13.6/src/http/ngx_http_variables.c (from vendor/nginx-1.13.5/src/http/ngx_http_variables.c) vendor/nginx-1.13.6/src/http/ngx_http_variables.h (from vendor/nginx-1.13.5/src/http/ngx_http_variables.h) vendor/nginx-1.13.6/src/http/ngx_http_write_filter_module.c (from vendor/nginx-1.13.5/src/http/ngx_http_write_filter_module.c) vendor/nginx-1.13.6/src/http/v2/ngx_http_v2.c (from vendor/nginx-1.13.5/src/http/v2/ngx_http_v2.c) vendor/nginx-1.13.6/src/http/v2/ngx_http_v2.h (from vendor/nginx-1.13.5/src/http/v2/ngx_http_v2.h) vendor/nginx-1.13.6/src/http/v2/ngx_http_v2_filter_module.c (from vendor/nginx-1.13.5/src/http/v2/ngx_http_v2_filter_module.c) vendor/nginx-1.13.6/src/http/v2/ngx_http_v2_huff_decode.c (from vendor/nginx-1.13.5/src/http/v2/ngx_http_v2_huff_decode.c) vendor/nginx-1.13.6/src/http/v2/ngx_http_v2_huff_encode.c (from vendor/nginx-1.13.5/src/http/v2/ngx_http_v2_huff_encode.c) vendor/nginx-1.13.6/src/http/v2/ngx_http_v2_module.c (from vendor/nginx-1.13.5/src/http/v2/ngx_http_v2_module.c) vendor/nginx-1.13.6/src/http/v2/ngx_http_v2_module.h (from vendor/nginx-1.13.5/src/http/v2/ngx_http_v2_module.h) vendor/nginx-1.13.6/src/http/v2/ngx_http_v2_table.c (from vendor/nginx-1.13.5/src/http/v2/ngx_http_v2_table.c) vendor/nginx-1.13.6/src/mail/ngx_mail.c (from vendor/nginx-1.13.5/src/mail/ngx_mail.c) vendor/nginx-1.13.6/src/mail/ngx_mail.h (from vendor/nginx-1.13.5/src/mail/ngx_mail.h) vendor/nginx-1.13.6/src/mail/ngx_mail_auth_http_module.c (from vendor/nginx-1.13.5/src/mail/ngx_mail_auth_http_module.c) vendor/nginx-1.13.6/src/mail/ngx_mail_core_module.c (from vendor/nginx-1.13.5/src/mail/ngx_mail_core_module.c) vendor/nginx-1.13.6/src/mail/ngx_mail_handler.c (from vendor/nginx-1.13.5/src/mail/ngx_mail_handler.c) vendor/nginx-1.13.6/src/mail/ngx_mail_imap_handler.c (from vendor/nginx-1.13.5/src/mail/ngx_mail_imap_handler.c) vendor/nginx-1.13.6/src/mail/ngx_mail_imap_module.c (from vendor/nginx-1.13.5/src/mail/ngx_mail_imap_module.c) vendor/nginx-1.13.6/src/mail/ngx_mail_imap_module.h (from vendor/nginx-1.13.5/src/mail/ngx_mail_imap_module.h) vendor/nginx-1.13.6/src/mail/ngx_mail_parse.c (from vendor/nginx-1.13.5/src/mail/ngx_mail_parse.c) vendor/nginx-1.13.6/src/mail/ngx_mail_pop3_handler.c (from vendor/nginx-1.13.5/src/mail/ngx_mail_pop3_handler.c) vendor/nginx-1.13.6/src/mail/ngx_mail_pop3_module.c (from vendor/nginx-1.13.5/src/mail/ngx_mail_pop3_module.c) vendor/nginx-1.13.6/src/mail/ngx_mail_pop3_module.h (from vendor/nginx-1.13.5/src/mail/ngx_mail_pop3_module.h) vendor/nginx-1.13.6/src/mail/ngx_mail_proxy_module.c (from vendor/nginx-1.13.5/src/mail/ngx_mail_proxy_module.c) vendor/nginx-1.13.6/src/mail/ngx_mail_smtp_handler.c (from vendor/nginx-1.13.5/src/mail/ngx_mail_smtp_handler.c) vendor/nginx-1.13.6/src/mail/ngx_mail_smtp_module.c (from vendor/nginx-1.13.5/src/mail/ngx_mail_smtp_module.c) vendor/nginx-1.13.6/src/mail/ngx_mail_smtp_module.h (from vendor/nginx-1.13.5/src/mail/ngx_mail_smtp_module.h) vendor/nginx-1.13.6/src/mail/ngx_mail_ssl_module.c (from vendor/nginx-1.13.5/src/mail/ngx_mail_ssl_module.c) vendor/nginx-1.13.6/src/mail/ngx_mail_ssl_module.h (from vendor/nginx-1.13.5/src/mail/ngx_mail_ssl_module.h) vendor/nginx-1.13.6/src/misc/ngx_cpp_test_module.cpp (from vendor/nginx-1.13.5/src/misc/ngx_cpp_test_module.cpp) vendor/nginx-1.13.6/src/misc/ngx_google_perftools_module.c (from vendor/nginx-1.13.5/src/misc/ngx_google_perftools_module.c) vendor/nginx-1.13.6/src/os/unix/ngx_alloc.c (from vendor/nginx-1.13.5/src/os/unix/ngx_alloc.c) vendor/nginx-1.13.6/src/os/unix/ngx_alloc.h (from vendor/nginx-1.13.5/src/os/unix/ngx_alloc.h) vendor/nginx-1.13.6/src/os/unix/ngx_atomic.h (from vendor/nginx-1.13.5/src/os/unix/ngx_atomic.h) vendor/nginx-1.13.6/src/os/unix/ngx_channel.c (from vendor/nginx-1.13.5/src/os/unix/ngx_channel.c) vendor/nginx-1.13.6/src/os/unix/ngx_channel.h (from vendor/nginx-1.13.5/src/os/unix/ngx_channel.h) vendor/nginx-1.13.6/src/os/unix/ngx_daemon.c (from vendor/nginx-1.13.5/src/os/unix/ngx_daemon.c) vendor/nginx-1.13.6/src/os/unix/ngx_darwin.h (from vendor/nginx-1.13.5/src/os/unix/ngx_darwin.h) vendor/nginx-1.13.6/src/os/unix/ngx_darwin_config.h (from vendor/nginx-1.13.5/src/os/unix/ngx_darwin_config.h) vendor/nginx-1.13.6/src/os/unix/ngx_darwin_init.c (from vendor/nginx-1.13.5/src/os/unix/ngx_darwin_init.c) vendor/nginx-1.13.6/src/os/unix/ngx_darwin_sendfile_chain.c (from vendor/nginx-1.13.5/src/os/unix/ngx_darwin_sendfile_chain.c) vendor/nginx-1.13.6/src/os/unix/ngx_dlopen.c (from vendor/nginx-1.13.5/src/os/unix/ngx_dlopen.c) vendor/nginx-1.13.6/src/os/unix/ngx_dlopen.h (from vendor/nginx-1.13.5/src/os/unix/ngx_dlopen.h) vendor/nginx-1.13.6/src/os/unix/ngx_errno.c (from vendor/nginx-1.13.5/src/os/unix/ngx_errno.c) vendor/nginx-1.13.6/src/os/unix/ngx_errno.h (from vendor/nginx-1.13.5/src/os/unix/ngx_errno.h) vendor/nginx-1.13.6/src/os/unix/ngx_file_aio_read.c (from vendor/nginx-1.13.5/src/os/unix/ngx_file_aio_read.c) vendor/nginx-1.13.6/src/os/unix/ngx_files.c (from vendor/nginx-1.13.5/src/os/unix/ngx_files.c) vendor/nginx-1.13.6/src/os/unix/ngx_files.h (from vendor/nginx-1.13.5/src/os/unix/ngx_files.h) vendor/nginx-1.13.6/src/os/unix/ngx_freebsd.h (from vendor/nginx-1.13.5/src/os/unix/ngx_freebsd.h) vendor/nginx-1.13.6/src/os/unix/ngx_freebsd_config.h (from vendor/nginx-1.13.5/src/os/unix/ngx_freebsd_config.h) vendor/nginx-1.13.6/src/os/unix/ngx_freebsd_init.c (from vendor/nginx-1.13.5/src/os/unix/ngx_freebsd_init.c) vendor/nginx-1.13.6/src/os/unix/ngx_freebsd_sendfile_chain.c (from vendor/nginx-1.13.5/src/os/unix/ngx_freebsd_sendfile_chain.c) vendor/nginx-1.13.6/src/os/unix/ngx_gcc_atomic_amd64.h (from vendor/nginx-1.13.5/src/os/unix/ngx_gcc_atomic_amd64.h) vendor/nginx-1.13.6/src/os/unix/ngx_gcc_atomic_ppc.h (from vendor/nginx-1.13.5/src/os/unix/ngx_gcc_atomic_ppc.h) vendor/nginx-1.13.6/src/os/unix/ngx_gcc_atomic_sparc64.h (from vendor/nginx-1.13.5/src/os/unix/ngx_gcc_atomic_sparc64.h) vendor/nginx-1.13.6/src/os/unix/ngx_gcc_atomic_x86.h (from vendor/nginx-1.13.5/src/os/unix/ngx_gcc_atomic_x86.h) vendor/nginx-1.13.6/src/os/unix/ngx_linux.h (from vendor/nginx-1.13.5/src/os/unix/ngx_linux.h) vendor/nginx-1.13.6/src/os/unix/ngx_linux_aio_read.c (from vendor/nginx-1.13.5/src/os/unix/ngx_linux_aio_read.c) vendor/nginx-1.13.6/src/os/unix/ngx_linux_config.h (from vendor/nginx-1.13.5/src/os/unix/ngx_linux_config.h) vendor/nginx-1.13.6/src/os/unix/ngx_linux_init.c (from vendor/nginx-1.13.5/src/os/unix/ngx_linux_init.c) vendor/nginx-1.13.6/src/os/unix/ngx_linux_sendfile_chain.c (from vendor/nginx-1.13.5/src/os/unix/ngx_linux_sendfile_chain.c) vendor/nginx-1.13.6/src/os/unix/ngx_os.h (from vendor/nginx-1.13.5/src/os/unix/ngx_os.h) vendor/nginx-1.13.6/src/os/unix/ngx_posix_config.h (from vendor/nginx-1.13.5/src/os/unix/ngx_posix_config.h) vendor/nginx-1.13.6/src/os/unix/ngx_posix_init.c (from vendor/nginx-1.13.5/src/os/unix/ngx_posix_init.c) vendor/nginx-1.13.6/src/os/unix/ngx_process.c (from vendor/nginx-1.13.5/src/os/unix/ngx_process.c) vendor/nginx-1.13.6/src/os/unix/ngx_process.h (from vendor/nginx-1.13.5/src/os/unix/ngx_process.h) vendor/nginx-1.13.6/src/os/unix/ngx_process_cycle.c (from vendor/nginx-1.13.5/src/os/unix/ngx_process_cycle.c) vendor/nginx-1.13.6/src/os/unix/ngx_process_cycle.h (from vendor/nginx-1.13.5/src/os/unix/ngx_process_cycle.h) vendor/nginx-1.13.6/src/os/unix/ngx_readv_chain.c (from vendor/nginx-1.13.5/src/os/unix/ngx_readv_chain.c) vendor/nginx-1.13.6/src/os/unix/ngx_recv.c (from vendor/nginx-1.13.5/src/os/unix/ngx_recv.c) vendor/nginx-1.13.6/src/os/unix/ngx_send.c (from vendor/nginx-1.13.5/src/os/unix/ngx_send.c) vendor/nginx-1.13.6/src/os/unix/ngx_setaffinity.c (from vendor/nginx-1.13.5/src/os/unix/ngx_setaffinity.c) vendor/nginx-1.13.6/src/os/unix/ngx_setaffinity.h (from vendor/nginx-1.13.5/src/os/unix/ngx_setaffinity.h) vendor/nginx-1.13.6/src/os/unix/ngx_setproctitle.c (from vendor/nginx-1.13.5/src/os/unix/ngx_setproctitle.c) vendor/nginx-1.13.6/src/os/unix/ngx_setproctitle.h (from vendor/nginx-1.13.5/src/os/unix/ngx_setproctitle.h) vendor/nginx-1.13.6/src/os/unix/ngx_shmem.c (from vendor/nginx-1.13.5/src/os/unix/ngx_shmem.c) vendor/nginx-1.13.6/src/os/unix/ngx_shmem.h (from vendor/nginx-1.13.5/src/os/unix/ngx_shmem.h) vendor/nginx-1.13.6/src/os/unix/ngx_socket.c (from vendor/nginx-1.13.5/src/os/unix/ngx_socket.c) vendor/nginx-1.13.6/src/os/unix/ngx_socket.h (from vendor/nginx-1.13.5/src/os/unix/ngx_socket.h) vendor/nginx-1.13.6/src/os/unix/ngx_solaris.h (from vendor/nginx-1.13.5/src/os/unix/ngx_solaris.h) vendor/nginx-1.13.6/src/os/unix/ngx_solaris_config.h (from vendor/nginx-1.13.5/src/os/unix/ngx_solaris_config.h) vendor/nginx-1.13.6/src/os/unix/ngx_solaris_init.c (from vendor/nginx-1.13.5/src/os/unix/ngx_solaris_init.c) vendor/nginx-1.13.6/src/os/unix/ngx_solaris_sendfilev_chain.c (from vendor/nginx-1.13.5/src/os/unix/ngx_solaris_sendfilev_chain.c) vendor/nginx-1.13.6/src/os/unix/ngx_sunpro_amd64.il (from vendor/nginx-1.13.5/src/os/unix/ngx_sunpro_amd64.il) vendor/nginx-1.13.6/src/os/unix/ngx_sunpro_atomic_sparc64.h (from vendor/nginx-1.13.5/src/os/unix/ngx_sunpro_atomic_sparc64.h) vendor/nginx-1.13.6/src/os/unix/ngx_sunpro_sparc64.il (from vendor/nginx-1.13.5/src/os/unix/ngx_sunpro_sparc64.il) vendor/nginx-1.13.6/src/os/unix/ngx_sunpro_x86.il (from vendor/nginx-1.13.5/src/os/unix/ngx_sunpro_x86.il) vendor/nginx-1.13.6/src/os/unix/ngx_thread.h (from vendor/nginx-1.13.5/src/os/unix/ngx_thread.h) vendor/nginx-1.13.6/src/os/unix/ngx_thread_cond.c (from vendor/nginx-1.13.5/src/os/unix/ngx_thread_cond.c) vendor/nginx-1.13.6/src/os/unix/ngx_thread_id.c (from vendor/nginx-1.13.5/src/os/unix/ngx_thread_id.c) vendor/nginx-1.13.6/src/os/unix/ngx_thread_mutex.c (from vendor/nginx-1.13.5/src/os/unix/ngx_thread_mutex.c) vendor/nginx-1.13.6/src/os/unix/ngx_time.c (from vendor/nginx-1.13.5/src/os/unix/ngx_time.c) vendor/nginx-1.13.6/src/os/unix/ngx_time.h (from vendor/nginx-1.13.5/src/os/unix/ngx_time.h) vendor/nginx-1.13.6/src/os/unix/ngx_udp_recv.c (from vendor/nginx-1.13.5/src/os/unix/ngx_udp_recv.c) vendor/nginx-1.13.6/src/os/unix/ngx_udp_send.c (from vendor/nginx-1.13.5/src/os/unix/ngx_udp_send.c) vendor/nginx-1.13.6/src/os/unix/ngx_udp_sendmsg_chain.c (from vendor/nginx-1.13.5/src/os/unix/ngx_udp_sendmsg_chain.c) vendor/nginx-1.13.6/src/os/unix/ngx_user.c (from vendor/nginx-1.13.5/src/os/unix/ngx_user.c) vendor/nginx-1.13.6/src/os/unix/ngx_user.h (from vendor/nginx-1.13.5/src/os/unix/ngx_user.h) vendor/nginx-1.13.6/src/os/unix/ngx_writev_chain.c (from vendor/nginx-1.13.5/src/os/unix/ngx_writev_chain.c) vendor/nginx-1.13.6/src/os/win32/nginx.ico (from vendor/nginx-1.13.5/src/os/win32/nginx.ico) vendor/nginx-1.13.6/src/os/win32/nginx.rc (from vendor/nginx-1.13.5/src/os/win32/nginx.rc) vendor/nginx-1.13.6/src/os/win32/nginx_icon16.xpm (from vendor/nginx-1.13.5/src/os/win32/nginx_icon16.xpm) vendor/nginx-1.13.6/src/os/win32/nginx_icon32.xpm (from vendor/nginx-1.13.5/src/os/win32/nginx_icon32.xpm) vendor/nginx-1.13.6/src/os/win32/nginx_icon48.xpm (from vendor/nginx-1.13.5/src/os/win32/nginx_icon48.xpm) vendor/nginx-1.13.6/src/os/win32/ngx_alloc.c (from vendor/nginx-1.13.5/src/os/win32/ngx_alloc.c) vendor/nginx-1.13.6/src/os/win32/ngx_alloc.h (from vendor/nginx-1.13.5/src/os/win32/ngx_alloc.h) vendor/nginx-1.13.6/src/os/win32/ngx_atomic.h (from vendor/nginx-1.13.5/src/os/win32/ngx_atomic.h) vendor/nginx-1.13.6/src/os/win32/ngx_dlopen.c (from vendor/nginx-1.13.5/src/os/win32/ngx_dlopen.c) vendor/nginx-1.13.6/src/os/win32/ngx_dlopen.h (from vendor/nginx-1.13.5/src/os/win32/ngx_dlopen.h) vendor/nginx-1.13.6/src/os/win32/ngx_errno.c (from vendor/nginx-1.13.5/src/os/win32/ngx_errno.c) vendor/nginx-1.13.6/src/os/win32/ngx_errno.h (from vendor/nginx-1.13.5/src/os/win32/ngx_errno.h) vendor/nginx-1.13.6/src/os/win32/ngx_event_log.c (from vendor/nginx-1.13.5/src/os/win32/ngx_event_log.c) vendor/nginx-1.13.6/src/os/win32/ngx_files.c (from vendor/nginx-1.13.5/src/os/win32/ngx_files.c) vendor/nginx-1.13.6/src/os/win32/ngx_files.h (from vendor/nginx-1.13.5/src/os/win32/ngx_files.h) vendor/nginx-1.13.6/src/os/win32/ngx_os.h (from vendor/nginx-1.13.5/src/os/win32/ngx_os.h) vendor/nginx-1.13.6/src/os/win32/ngx_process.c (from vendor/nginx-1.13.5/src/os/win32/ngx_process.c) vendor/nginx-1.13.6/src/os/win32/ngx_process.h (from vendor/nginx-1.13.5/src/os/win32/ngx_process.h) vendor/nginx-1.13.6/src/os/win32/ngx_process_cycle.c (from vendor/nginx-1.13.5/src/os/win32/ngx_process_cycle.c) vendor/nginx-1.13.6/src/os/win32/ngx_process_cycle.h (from vendor/nginx-1.13.5/src/os/win32/ngx_process_cycle.h) vendor/nginx-1.13.6/src/os/win32/ngx_service.c (from vendor/nginx-1.13.5/src/os/win32/ngx_service.c) vendor/nginx-1.13.6/src/os/win32/ngx_shmem.c (from vendor/nginx-1.13.5/src/os/win32/ngx_shmem.c) vendor/nginx-1.13.6/src/os/win32/ngx_shmem.h (from vendor/nginx-1.13.5/src/os/win32/ngx_shmem.h) vendor/nginx-1.13.6/src/os/win32/ngx_socket.c (from vendor/nginx-1.13.5/src/os/win32/ngx_socket.c) vendor/nginx-1.13.6/src/os/win32/ngx_socket.h (from vendor/nginx-1.13.5/src/os/win32/ngx_socket.h) vendor/nginx-1.13.6/src/os/win32/ngx_stat.c (from vendor/nginx-1.13.5/src/os/win32/ngx_stat.c) vendor/nginx-1.13.6/src/os/win32/ngx_thread.c (from vendor/nginx-1.13.5/src/os/win32/ngx_thread.c) vendor/nginx-1.13.6/src/os/win32/ngx_thread.h (from vendor/nginx-1.13.5/src/os/win32/ngx_thread.h) vendor/nginx-1.13.6/src/os/win32/ngx_time.c (from vendor/nginx-1.13.5/src/os/win32/ngx_time.c) vendor/nginx-1.13.6/src/os/win32/ngx_time.h (from vendor/nginx-1.13.5/src/os/win32/ngx_time.h) vendor/nginx-1.13.6/src/os/win32/ngx_udp_wsarecv.c (from vendor/nginx-1.13.5/src/os/win32/ngx_udp_wsarecv.c) vendor/nginx-1.13.6/src/os/win32/ngx_user.c (from vendor/nginx-1.13.5/src/os/win32/ngx_user.c) vendor/nginx-1.13.6/src/os/win32/ngx_user.h (from vendor/nginx-1.13.5/src/os/win32/ngx_user.h) vendor/nginx-1.13.6/src/os/win32/ngx_win32_config.h (from vendor/nginx-1.13.5/src/os/win32/ngx_win32_config.h) vendor/nginx-1.13.6/src/os/win32/ngx_win32_init.c (from vendor/nginx-1.13.5/src/os/win32/ngx_win32_init.c) vendor/nginx-1.13.6/src/os/win32/ngx_wsarecv.c (from vendor/nginx-1.13.5/src/os/win32/ngx_wsarecv.c) vendor/nginx-1.13.6/src/os/win32/ngx_wsarecv_chain.c (from vendor/nginx-1.13.5/src/os/win32/ngx_wsarecv_chain.c) vendor/nginx-1.13.6/src/os/win32/ngx_wsasend.c (from vendor/nginx-1.13.5/src/os/win32/ngx_wsasend.c) vendor/nginx-1.13.6/src/os/win32/ngx_wsasend_chain.c (from vendor/nginx-1.13.5/src/os/win32/ngx_wsasend_chain.c) vendor/nginx-1.13.6/src/stream/ngx_stream.c (from vendor/nginx-1.13.5/src/stream/ngx_stream.c) vendor/nginx-1.13.6/src/stream/ngx_stream.h (from vendor/nginx-1.13.5/src/stream/ngx_stream.h) vendor/nginx-1.13.6/src/stream/ngx_stream_access_module.c (from vendor/nginx-1.13.5/src/stream/ngx_stream_access_module.c) vendor/nginx-1.13.6/src/stream/ngx_stream_core_module.c (from vendor/nginx-1.13.5/src/stream/ngx_stream_core_module.c) vendor/nginx-1.13.6/src/stream/ngx_stream_geo_module.c (from vendor/nginx-1.13.5/src/stream/ngx_stream_geo_module.c) vendor/nginx-1.13.6/src/stream/ngx_stream_geoip_module.c (from vendor/nginx-1.13.5/src/stream/ngx_stream_geoip_module.c) vendor/nginx-1.13.6/src/stream/ngx_stream_handler.c (from vendor/nginx-1.13.5/src/stream/ngx_stream_handler.c) vendor/nginx-1.13.6/src/stream/ngx_stream_limit_conn_module.c (from vendor/nginx-1.13.5/src/stream/ngx_stream_limit_conn_module.c) vendor/nginx-1.13.6/src/stream/ngx_stream_log_module.c (from vendor/nginx-1.13.5/src/stream/ngx_stream_log_module.c) vendor/nginx-1.13.6/src/stream/ngx_stream_map_module.c (from vendor/nginx-1.13.5/src/stream/ngx_stream_map_module.c) vendor/nginx-1.13.6/src/stream/ngx_stream_proxy_module.c (from vendor/nginx-1.13.5/src/stream/ngx_stream_proxy_module.c) vendor/nginx-1.13.6/src/stream/ngx_stream_realip_module.c (from vendor/nginx-1.13.5/src/stream/ngx_stream_realip_module.c) vendor/nginx-1.13.6/src/stream/ngx_stream_return_module.c (from vendor/nginx-1.13.5/src/stream/ngx_stream_return_module.c) vendor/nginx-1.13.6/src/stream/ngx_stream_script.c (from vendor/nginx-1.13.5/src/stream/ngx_stream_script.c) vendor/nginx-1.13.6/src/stream/ngx_stream_script.h (from vendor/nginx-1.13.5/src/stream/ngx_stream_script.h) vendor/nginx-1.13.6/src/stream/ngx_stream_split_clients_module.c (from vendor/nginx-1.13.5/src/stream/ngx_stream_split_clients_module.c) vendor/nginx-1.13.6/src/stream/ngx_stream_ssl_module.c (from vendor/nginx-1.13.5/src/stream/ngx_stream_ssl_module.c) vendor/nginx-1.13.6/src/stream/ngx_stream_ssl_module.h (from vendor/nginx-1.13.5/src/stream/ngx_stream_ssl_module.h) vendor/nginx-1.13.6/src/stream/ngx_stream_ssl_preread_module.c (from vendor/nginx-1.13.5/src/stream/ngx_stream_ssl_preread_module.c) vendor/nginx-1.13.6/src/stream/ngx_stream_upstream.c (from vendor/nginx-1.13.5/src/stream/ngx_stream_upstream.c) vendor/nginx-1.13.6/src/stream/ngx_stream_upstream.h (from vendor/nginx-1.13.5/src/stream/ngx_stream_upstream.h) vendor/nginx-1.13.6/src/stream/ngx_stream_upstream_hash_module.c (from vendor/nginx-1.13.5/src/stream/ngx_stream_upstream_hash_module.c) vendor/nginx-1.13.6/src/stream/ngx_stream_upstream_least_conn_module.c (from vendor/nginx-1.13.5/src/stream/ngx_stream_upstream_least_conn_module.c) vendor/nginx-1.13.6/src/stream/ngx_stream_upstream_round_robin.c (from vendor/nginx-1.13.5/src/stream/ngx_stream_upstream_round_robin.c) vendor/nginx-1.13.6/src/stream/ngx_stream_upstream_round_robin.h (from vendor/nginx-1.13.5/src/stream/ngx_stream_upstream_round_robin.h) vendor/nginx-1.13.6/src/stream/ngx_stream_upstream_zone_module.c (from vendor/nginx-1.13.5/src/stream/ngx_stream_upstream_zone_module.c) vendor/nginx-1.13.6/src/stream/ngx_stream_variables.c (from vendor/nginx-1.13.5/src/stream/ngx_stream_variables.c) vendor/nginx-1.13.6/src/stream/ngx_stream_variables.h (from vendor/nginx-1.13.5/src/stream/ngx_stream_variables.h) vendor/nginx-1.13.6/src/stream/ngx_stream_write_filter_module.c (from vendor/nginx-1.13.5/src/stream/ngx_stream_write_filter_module.c) Modified: nginx_version (+1 -1) =================================================================== --- nginx_version 2017-10-24 17:54:56 +0900 (43ded9062) +++ nginx_version 2017-10-24 17:57:33 +0900 (2e3a551fe) @@ -1 +1 @@ -1.13.5 +1.13.6 Deleted: vendor/nginx-1.13.5/conf/mime.types (+0 -89) 100644 =================================================================== --- vendor/nginx-1.13.5/conf/mime.types 2017-10-24 17:54:56 +0900 (89be9a4cd) +++ /dev/null @@ -1,89 +0,0 @@ - -types { - text/html html htm shtml; - text/css css; - text/xml xml; - image/gif gif; - image/jpeg jpeg jpg; - application/javascript js; - application/atom+xml atom; - application/rss+xml rss; - - text/mathml mml; - text/plain txt; - text/vnd.sun.j2me.app-descriptor jad; - text/vnd.wap.wml wml; - text/x-component htc; - - image/png png; - image/tiff tif tiff; - image/vnd.wap.wbmp wbmp; - image/x-icon ico; - image/x-jng jng; - image/x-ms-bmp bmp; - image/svg+xml svg svgz; - image/webp webp; - - application/font-woff woff; - application/java-archive jar war ear; - application/json json; - application/mac-binhex40 hqx; - application/msword doc; - application/pdf pdf; - application/postscript ps eps ai; - application/rtf rtf; - application/vnd.apple.mpegurl m3u8; - application/vnd.ms-excel xls; - application/vnd.ms-fontobject eot; - application/vnd.ms-powerpoint ppt; - application/vnd.wap.wmlc wmlc; - application/vnd.google-earth.kml+xml kml; - application/vnd.google-earth.kmz kmz; - application/x-7z-compressed 7z; - application/x-cocoa cco; - application/x-java-archive-diff jardiff; - application/x-java-jnlp-file jnlp; - application/x-makeself run; - application/x-perl pl pm; - application/x-pilot prc pdb; - application/x-rar-compressed rar; - application/x-redhat-package-manager rpm; - application/x-sea sea; - application/x-shockwave-flash swf; - application/x-stuffit sit; - application/x-tcl tcl tk; - application/x-x509-ca-cert der pem crt; - application/x-xpinstall xpi; - application/xhtml+xml xhtml; - application/xspf+xml xspf; - application/zip zip; - - application/octet-stream bin exe dll; - application/octet-stream deb; - application/octet-stream dmg; - application/octet-stream iso img; - application/octet-stream msi msp msm; - - application/vnd.openxmlformats-officedocument.wordprocessingml.document docx; - application/vnd.openxmlformats-officedocument.spreadsheetml.sheet xlsx; - application/vnd.openxmlformats-officedocument.presentationml.presentation pptx; - - audio/midi mid midi kar; - audio/mpeg mp3; - audio/ogg ogg; - audio/x-m4a m4a; - audio/x-realaudio ra; - - video/3gpp 3gpp 3gp; - video/mp2t ts; - video/mp4 mp4; - video/mpeg mpeg mpg; - video/quicktime mov; - video/webm webm; - video/x-flv flv; - video/x-m4v m4v; - video/x-mng mng; - video/x-ms-asf asx asf; - video/x-ms-wmv wmv; - video/x-msvideo avi; -} Renamed: vendor/nginx-1.13.6/auto/cc/acc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/cc/bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/cc/ccc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/cc/clang (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/cc/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/cc/gcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/cc/icc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/cc/msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/cc/name (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/cc/owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/cc/sunc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/configure (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/define (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/endianness (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/feature (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/have (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/have_headers (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/headers (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/include (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/init (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/install (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/lib/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/lib/geoip/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/lib/google-perftools/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/lib/libatomic/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/lib/libatomic/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/lib/libgd/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/lib/libxslt/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/lib/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/lib/openssl/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/lib/openssl/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/lib/openssl/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/lib/openssl/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/lib/pcre/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/lib/pcre/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/lib/pcre/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/lib/pcre/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/lib/pcre/makefile.owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/lib/perl/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/lib/perl/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/lib/zlib/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/lib/zlib/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/lib/zlib/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/lib/zlib/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/lib/zlib/makefile.owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/module (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/modules (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/nohave (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/options (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/os/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/os/darwin (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/os/freebsd (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/os/linux (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/os/solaris (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/os/win32 (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/sources (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/stubs (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/summary (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/threads (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/types/sizeof (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/types/typedef (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/types/uintptr_t (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/types/value (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/auto/unix (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/conf/fastcgi.conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/conf/fastcgi_params (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/conf/koi-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/conf/koi-win (+0 -0) 100% =================================================================== Added: vendor/nginx-1.13.6/conf/mime.types (+95 -0) 100644 =================================================================== --- /dev/null +++ vendor/nginx-1.13.6/conf/mime.types 2017-10-24 17:57:33 +0900 (8a2348ab0) @@ -0,0 +1,95 @@ + +types { + text/html html htm shtml; + text/css css; + text/xml xml; + image/gif gif; + image/jpeg jpeg jpg; + application/javascript js; + application/atom+xml atom; + application/rss+xml rss; + + text/mathml mml; + text/plain txt; + text/vnd.sun.j2me.app-descriptor jad; + text/vnd.wap.wml wml; + text/x-component htc; + + image/png png; + image/svg+xml svg svgz; + image/tiff tif tiff; + image/vnd.wap.wbmp wbmp; + image/webp webp; + image/x-icon ico; + image/x-jng jng; + image/x-ms-bmp bmp; + + application/font-woff woff; + application/java-archive jar war ear; + application/json json; + application/mac-binhex40 hqx; + application/msword doc; + application/pdf pdf; + application/postscript ps eps ai; + application/rtf rtf; + application/vnd.apple.mpegurl m3u8; + application/vnd.google-earth.kml+xml kml; + application/vnd.google-earth.kmz kmz; + application/vnd.ms-excel xls; + application/vnd.ms-fontobject eot; + application/vnd.ms-powerpoint ppt; + application/vnd.oasis.opendocument.graphics odg; + application/vnd.oasis.opendocument.presentation odp; + application/vnd.oasis.opendocument.spreadsheet ods; + application/vnd.oasis.opendocument.text odt; + application/vnd.openxmlformats-officedocument.presentationml.presentation + pptx; + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet + xlsx; + application/vnd.openxmlformats-officedocument.wordprocessingml.document + docx; + application/vnd.wap.wmlc wmlc; + application/x-7z-compressed 7z; + application/x-cocoa cco; + application/x-java-archive-diff jardiff; + application/x-java-jnlp-file jnlp; + application/x-makeself run; + application/x-perl pl pm; + application/x-pilot prc pdb; + application/x-rar-compressed rar; + application/x-redhat-package-manager rpm; + application/x-sea sea; + application/x-shockwave-flash swf; + application/x-stuffit sit; + application/x-tcl tcl tk; + application/x-x509-ca-cert der pem crt; + application/x-xpinstall xpi; + application/xhtml+xml xhtml; + application/xspf+xml xspf; + application/zip zip; + + application/octet-stream bin exe dll; + application/octet-stream deb; + application/octet-stream dmg; + application/octet-stream iso img; + application/octet-stream msi msp msm; + + audio/midi mid midi kar; + audio/mpeg mp3; + audio/ogg ogg; + audio/x-m4a m4a; + audio/x-realaudio ra; + + video/3gpp 3gpp 3gp; + video/mp2t ts; + video/mp4 mp4; + video/mpeg mpeg mpg; + video/quicktime mov; + video/webm webm; + video/x-flv flv; + video/x-m4v m4v; + video/x-mng mng; + video/x-ms-asf asx asf; + video/x-ms-wmv wmv; + video/x-msvideo avi; +} Renamed: vendor/nginx-1.13.6/conf/nginx.conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/conf/scgi_params (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/conf/uwsgi_params (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/conf/win-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/contrib/README (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/contrib/geo2nginx.pl (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/contrib/unicode2nginx/koi-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/contrib/unicode2nginx/unicode-to-nginx.pl (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/contrib/unicode2nginx/win-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/contrib/vim/ftdetect/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/contrib/vim/ftplugin/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/contrib/vim/indent/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/contrib/vim/syntax/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/docs/GNUmakefile (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/docs/dtd/change_log_conf.dtd (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/docs/dtd/changes.dtd (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/docs/html/50x.html (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/docs/html/index.html (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/docs/man/nginx.8 (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/docs/text/LICENSE (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/docs/text/README (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/docs/xml/change_log_conf.xml (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/docs/xml/nginx/changes.xml (+121 -1) 99% =================================================================== --- vendor/nginx-1.13.5/docs/xml/nginx/changes.xml 2017-10-24 17:54:56 +0900 (28988142f) +++ vendor/nginx-1.13.6/docs/xml/nginx/changes.xml 2017-10-24 17:57:33 +0900 (30584626e) @@ -5,6 +5,126 @@ <change_log title="nginx"> +<changes ver="1.13.6" date="2017-10-10"> + +<change type="bugfix"> +<para lang="ru"> +при использовании директивы ssl_preread +в модуле stream не работало переключение на следующий бэкенд. +</para> +<para lang="en"> +switching to the next upstream server in the stream module did not work +when using the "ssl_preread" directive. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +в модуле ngx_http_v2_module.<br/> +Спасибо Piotr Sikora. +</para> +<para lang="en"> +in the ngx_http_v2_module.<br/> +Thanks to Piotr Sikora. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +nginx не поддерживал даты после 2038 года +на 32-битных платформах с 64-битным time_t. +</para> +<para lang="en"> +nginx did not support dates after the year 2038 +on 32-bit platforms with 64-bit time_t. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +в обработке дат до 1970 года и после 10000 года. +</para> +<para lang="en"> +in handling of dates prior to the year 1970 and after the year 10000. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +в модуле stream таймауты ожидания UDP-пакетов от бэкендов +не логгировались или логгировались на уровне info вместо error. +</para> +<para lang="en"> +in the stream module timeouts waiting for UDP datagrams from upstream servers +were not logged or logged at the "info" level instead of "error". +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +при использовании HTTP/2 nginx мог вернуть ошибку 400, +не указав в логе причину. +</para> +<para lang="en"> +when using HTTP/2 nginx might return the 400 response +without logging the reason. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +в обработке повреждённых файлов кэша. +</para> +<para lang="en"> +in processing of corrupted cache files. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +при кэшировании ошибок, перехваченных error_page, +не учитывались заголовки управления кэшированием. +</para> +<para lang="en"> +cache control headers were ignored +when caching errors intercepted by error_page. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +при использовании HTTP/2 тело запроса могло быть повреждено. +</para> +<para lang="en"> +when using HTTP/2 client request body might be corrupted. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +в обработке адресов клиентов при использовании unix domain сокетов. +</para> +<para lang="en"> +in handling of client addresses when using unix domain sockets. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +при использовании директивы "hash ... consistent" в блоке upstream +nginx нагружал процессор, если использовались большие веса +и все или почти все бэкенды были недоступны. +</para> +<para lang="en"> +nginx hogged CPU +when using the "hash ... consistent" directive in the upstream block +if large weights were used and all or most of the servers were unavailable. +</para> +</change> + +</changes> + + <changes ver="1.13.5" date="2017-09-05"> <change type="feature"> @@ -50,7 +170,7 @@ with multiple ranges. <para lang="en"> the "expires modified" directive and processing of the "If-Range" request header line -did not use the response last modification time +did not use the response last modification time if proxying without caching was used. </para> </change> Renamed: vendor/nginx-1.13.6/docs/xsls/changes.xsls (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/docs/xslt/changes.xslt (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/misc/GNUmakefile (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/misc/README (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/nginx.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/nginx.h (+2 -2) 85% =================================================================== --- vendor/nginx-1.13.5/src/core/nginx.h 2017-10-24 17:54:56 +0900 (a3c0ef8ad) +++ vendor/nginx-1.13.6/src/core/nginx.h 2017-10-24 17:57:33 +0900 (580683705) @@ -9,8 +9,8 @@ #define _NGINX_H_INCLUDED_ -#define nginx_version 1013005 -#define NGINX_VERSION "1.13.5" +#define nginx_version 1013006 +#define NGINX_VERSION "1.13.6" #define NGINX_VER "nginx/" NGINX_VERSION #ifdef NGX_BUILD Renamed: vendor/nginx-1.13.6/src/core/ngx_array.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_array.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_buf.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_buf.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_conf_file.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_conf_file.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_connection.c (+4 -0) 99% =================================================================== --- vendor/nginx-1.13.5/src/core/ngx_connection.c 2017-10-24 17:54:56 +0900 (392fc3587) +++ vendor/nginx-1.13.6/src/core/ngx_connection.c 2017-10-24 17:57:33 +0900 (9a747589c) @@ -165,6 +165,10 @@ ngx_set_inherited_sockets(ngx_cycle_t *cycle) continue; } + if (ls[i].socklen > (socklen_t) sizeof(ngx_sockaddr_t)) { + ls[i].socklen = sizeof(ngx_sockaddr_t); + } + switch (ls[i].sockaddr->sa_family) { #if (NGX_HAVE_INET6) Renamed: vendor/nginx-1.13.6/src/core/ngx_connection.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_core.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_cpuinfo.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_crc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_crc32.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_crc32.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_crypt.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_crypt.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_cycle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_cycle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_file.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_file.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_hash.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_hash.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_inet.c (+6 -2) 99% =================================================================== --- vendor/nginx-1.13.5/src/core/ngx_inet.c 2017-10-24 17:54:56 +0900 (3bcd3e799) +++ vendor/nginx-1.13.6/src/core/ngx_inet.c 2017-10-24 17:57:33 +0900 (db48b93c1) @@ -182,9 +182,11 @@ ngx_sock_ntop(struct sockaddr *sa, socklen_t socklen, u_char *text, size_t len, ngx_uint_t port) { u_char *p; +#if (NGX_HAVE_INET6 || NGX_HAVE_UNIX_DOMAIN) + size_t n; +#endif struct sockaddr_in *sin; #if (NGX_HAVE_INET6) - size_t n; struct sockaddr_in6 *sin6; #endif #if (NGX_HAVE_UNIX_DOMAIN) @@ -241,7 +243,9 @@ ngx_sock_ntop(struct sockaddr *sa, socklen_t socklen, u_char *text, size_t len, p = ngx_snprintf(text, len, "unix:%Z"); } else { - p = ngx_snprintf(text, len, "unix:%s%Z", saun->sun_path); + n = ngx_strnlen((u_char *) saun->sun_path, + socklen - offsetof(struct sockaddr_un, sun_path)); + p = ngx_snprintf(text, len, "unix:%*s%Z", n, saun->sun_path); } /* we do not include trailing zero in address length */ Renamed: vendor/nginx-1.13.6/src/core/ngx_inet.h (+3 -2) 94% =================================================================== --- vendor/nginx-1.13.5/src/core/ngx_inet.h 2017-10-24 17:54:56 +0900 (538771e11) +++ vendor/nginx-1.13.6/src/core/ngx_inet.h 2017-10-24 17:57:33 +0900 (a3b392ee7) @@ -17,10 +17,11 @@ #define NGX_INET6_ADDRSTRLEN \ (sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255") - 1) #define NGX_UNIX_ADDRSTRLEN \ - (sizeof(struct sockaddr_un) - offsetof(struct sockaddr_un, sun_path)) + (sizeof("unix:") - 1 + \ + sizeof(struct sockaddr_un) - offsetof(struct sockaddr_un, sun_path)) #if (NGX_HAVE_UNIX_DOMAIN) -#define NGX_SOCKADDR_STRLEN (sizeof("unix:") - 1 + NGX_UNIX_ADDRSTRLEN) +#define NGX_SOCKADDR_STRLEN NGX_UNIX_ADDRSTRLEN #elif (NGX_HAVE_INET6) #define NGX_SOCKADDR_STRLEN (NGX_INET6_ADDRSTRLEN + sizeof("[]:65535") - 1) #else Renamed: vendor/nginx-1.13.6/src/core/ngx_list.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_list.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_log.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_log.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_md5.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_md5.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_murmurhash.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_murmurhash.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_open_file_cache.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_open_file_cache.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_output_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_palloc.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_palloc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_parse.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_parse.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_parse_time.c (+3 -2) 99% =================================================================== --- vendor/nginx-1.13.5/src/core/ngx_parse_time.c 2017-10-24 17:54:56 +0900 (a5c503424) +++ vendor/nginx-1.13.6/src/core/ngx_parse_time.c 2017-10-24 17:57:33 +0900 (232ac91dd) @@ -44,14 +44,15 @@ ngx_parse_http_time(u_char *value, size_t len) } } - for (p++; p < end; p++) + for (p++; p < end; p++) { if (*p != ' ') { break; } + } if (end - p < 18) { return NGX_ERROR; - } + } if (fmt != isoc) { if (*p < '0' || *p > '9' || *(p + 1) < '0' || *(p + 1) > '9') { Renamed: vendor/nginx-1.13.6/src/core/ngx_parse_time.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_proxy_protocol.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_proxy_protocol.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_queue.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_queue.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_radix_tree.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_radix_tree.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_rbtree.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_rbtree.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_regex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_regex.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_resolver.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_resolver.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_rwlock.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_rwlock.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_sha1.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_sha1.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_shmtx.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_shmtx.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_slab.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_slab.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_spinlock.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_string.c (+16 -0) 99% =================================================================== --- vendor/nginx-1.13.5/src/core/ngx_string.c 2017-10-24 17:54:56 +0900 (de10a064d) +++ vendor/nginx-1.13.6/src/core/ngx_string.c 2017-10-24 17:57:33 +0900 (2ee07bfc8) @@ -29,6 +29,22 @@ ngx_strlow(u_char *dst, u_char *src, size_t n) } +size_t +ngx_strnlen(u_char *p, size_t n) +{ + size_t i; + + for (i = 0; i < n; i++) { + + if (p[i] == '\0') { + return i; + } + } + + return n; +} + + u_char * ngx_cpystrn(u_char *dst, u_char *src, size_t n) { Renamed: vendor/nginx-1.13.6/src/core/ngx_string.h (+2 -0) 99% =================================================================== --- vendor/nginx-1.13.5/src/core/ngx_string.h 2017-10-24 17:54:56 +0900 (7363bd242) +++ vendor/nginx-1.13.6/src/core/ngx_string.h 2017-10-24 17:57:33 +0900 (882ae7cea) @@ -60,6 +60,8 @@ void ngx_strlow(u_char *dst, u_char *src, size_t n); #define ngx_strstr(s1, s2) strstr((const char *) s1, (const char *) s2) #define ngx_strlen(s) strlen((const char *) s) +size_t ngx_strnlen(u_char *p, size_t n); + #define ngx_strchr(s1, c) strchr((const char *) s1, (int) c) static ngx_inline u_char * Renamed: vendor/nginx-1.13.6/src/core/ngx_syslog.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_syslog.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_thread_pool.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_thread_pool.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/core/ngx_times.c (+21 -9) 96% =================================================================== --- vendor/nginx-1.13.5/src/core/ngx_times.c 2017-10-24 17:54:56 +0900 (843314aba) +++ vendor/nginx-1.13.6/src/core/ngx_times.c 2017-10-24 17:57:33 +0900 (b2edf1a5f) @@ -300,27 +300,39 @@ void ngx_gmtime(time_t t, ngx_tm_t *tp) { ngx_int_t yday; - ngx_uint_t n, sec, min, hour, mday, mon, year, wday, days, leap; + ngx_uint_t sec, min, hour, mday, mon, year, wday, days, leap; /* the calculation is valid for positive time_t only */ - n = (ngx_uint_t) t; + if (t < 0) { + t = 0; + } + + days = t / 86400; + sec = t % 86400; + + /* + * no more than 4 year digits supported, + * truncate to December 31, 9999, 23:59:59 + */ - days = n / 86400; + if (days > 2932896) { + days = 2932896; + sec = 86399; + } /* January 1, 1970 was Thursday */ wday = (4 + days) % 7; - n %= 86400; - hour = n / 3600; - n %= 3600; - min = n / 60; - sec = n % 60; + hour = sec / 3600; + sec %= 3600; + min = sec / 60; + sec %= 60; /* * the algorithm based on Gauss' formula, - * see src/http/ngx_http_parse_time.c + * see src/core/ngx_parse_time.c */ /* days since March 1, 1 BC */ Renamed: vendor/nginx-1.13.6/src/core/ngx_times.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/event/modules/ngx_devpoll_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/event/modules/ngx_epoll_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/event/modules/ngx_eventport_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/event/modules/ngx_iocp_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/event/modules/ngx_iocp_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/event/modules/ngx_kqueue_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/event/modules/ngx_poll_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/event/modules/ngx_select_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/event/modules/ngx_win32_select_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/event/ngx_event.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/event/ngx_event.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/event/ngx_event_accept.c (+8 -0) 98% =================================================================== --- vendor/nginx-1.13.5/src/event/ngx_event_accept.c 2017-10-24 17:54:56 +0900 (87447d089) +++ vendor/nginx-1.13.6/src/event/ngx_event_accept.c 2017-10-24 17:57:33 +0900 (775637090) @@ -164,6 +164,10 @@ ngx_event_accept(ngx_event_t *ev) return; } + if (socklen > (socklen_t) sizeof(ngx_sockaddr_t)) { + socklen = sizeof(ngx_sockaddr_t); + } + c->sockaddr = ngx_palloc(c->pool, socklen); if (c->sockaddr == NULL) { ngx_close_accepted_connection(c); @@ -440,6 +444,10 @@ ngx_event_recvmsg(ngx_event_t *ev) c->type = SOCK_DGRAM; c->socklen = msg.msg_namelen; + if (c->socklen > (socklen_t) sizeof(ngx_sockaddr_t)) { + c->socklen = sizeof(ngx_sockaddr_t); + } + #if (NGX_STAT_STUB) (void) ngx_atomic_fetch_add(ngx_stat_active, 1); #endif Renamed: vendor/nginx-1.13.6/src/event/ngx_event_acceptex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/event/ngx_event_connect.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/event/ngx_event_connect.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/event/ngx_event_connectex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/event/ngx_event_openssl.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/event/ngx_event_openssl.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/event/ngx_event_openssl_stapling.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/event/ngx_event_pipe.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/event/ngx_event_pipe.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/event/ngx_event_posted.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/event/ngx_event_posted.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/event/ngx_event_timer.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/event/ngx_event_timer.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_access_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_addition_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_auth_basic_module.c (+15 -55) 86% =================================================================== --- vendor/nginx-1.13.5/src/http/modules/ngx_http_auth_basic_module.c 2017-10-24 17:54:56 +0900 (4aa684f8a) +++ vendor/nginx-1.13.6/src/http/modules/ngx_http_auth_basic_module.c 2017-10-24 17:57:33 +0900 (2f345b6d5) @@ -15,11 +15,6 @@ typedef struct { - ngx_str_t passwd; -} ngx_http_auth_basic_ctx_t; - - -typedef struct { ngx_http_complex_value_t *realm; ngx_http_complex_value_t user_file; } ngx_http_auth_basic_loc_conf_t; @@ -27,7 +22,7 @@ typedef struct { static ngx_int_t ngx_http_auth_basic_handler(ngx_http_request_t *r); static ngx_int_t ngx_http_auth_basic_crypt_handler(ngx_http_request_t *r, - ngx_http_auth_basic_ctx_t *ctx, ngx_str_t *passwd, ngx_str_t *realm); + ngx_str_t *passwd, ngx_str_t *realm); static ngx_int_t ngx_http_auth_basic_set_realm(ngx_http_request_t *r, ngx_str_t *realm); static void ngx_http_auth_basic_close(ngx_file_t *file); @@ -103,7 +98,6 @@ ngx_http_auth_basic_handler(ngx_http_request_t *r) ngx_str_t pwd, realm, user_file; ngx_uint_t i, level, login, left, passwd; ngx_file_t file; - ngx_http_auth_basic_ctx_t *ctx; ngx_http_auth_basic_loc_conf_t *alcf; u_char buf[NGX_HTTP_AUTH_BUF_SIZE]; enum { @@ -126,13 +120,6 @@ ngx_http_auth_basic_handler(ngx_http_request_t *r) return NGX_DECLINED; } - ctx = ngx_http_get_module_ctx(r, ngx_http_auth_basic_module); - - if (ctx) { - return ngx_http_auth_basic_crypt_handler(r, ctx, &ctx->passwd, - &realm); - } - rc = ngx_http_auth_basic_user(r); if (rc == NGX_DECLINED) { @@ -237,8 +224,7 @@ ngx_http_auth_basic_handler(ngx_http_request_t *r) pwd.len = i - passwd; pwd.data = &buf[passwd]; - return ngx_http_auth_basic_crypt_handler(r, NULL, &pwd, - &realm); + return ngx_http_auth_basic_crypt_handler(r, &pwd, &realm); } break; @@ -276,7 +262,7 @@ ngx_http_auth_basic_handler(ngx_http_request_t *r) ngx_cpystrn(pwd.data, &buf[passwd], pwd.len + 1); - return ngx_http_auth_basic_crypt_handler(r, NULL, &pwd, &realm); + return ngx_http_auth_basic_crypt_handler(r, &pwd, &realm); } ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, @@ -288,8 +274,8 @@ ngx_http_auth_basic_handler(ngx_http_request_t *r) static ngx_int_t -ngx_http_auth_basic_crypt_handler(ngx_http_request_t *r, - ngx_http_auth_basic_ctx_t *ctx, ngx_str_t *passwd, ngx_str_t *realm) +ngx_http_auth_basic_crypt_handler(ngx_http_request_t *r, ngx_str_t *passwd, + ngx_str_t *realm) { ngx_int_t rc; u_char *encrypted; @@ -301,48 +287,22 @@ ngx_http_auth_basic_crypt_handler(ngx_http_request_t *r, "rc: %i user: \"%V\" salt: \"%s\"", rc, &r->headers_in.user, passwd->data); - if (rc == NGX_OK) { - if (ngx_strcmp(encrypted, passwd->data) == 0) { - return NGX_OK; - } - - ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, - "encrypted: \"%s\"", encrypted); - - ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, - "user \"%V\": password mismatch", - &r->headers_in.user); - - return ngx_http_auth_basic_set_realm(r, realm); - } - - if (rc == NGX_ERROR) { + if (rc != NGX_OK) { return NGX_HTTP_INTERNAL_SERVER_ERROR; } - /* rc == NGX_AGAIN */ - - if (ctx == NULL) { - ctx = ngx_palloc(r->pool, sizeof(ngx_http_auth_basic_ctx_t)); - if (ctx == NULL) { - return NGX_HTTP_INTERNAL_SERVER_ERROR; - } - - ngx_http_set_ctx(r, ctx, ngx_http_auth_basic_module); - - ctx->passwd.len = passwd->len; - passwd->len++; - - ctx->passwd.data = ngx_pstrdup(r->pool, passwd); - if (ctx->passwd.data == NULL) { - return NGX_HTTP_INTERNAL_SERVER_ERROR; - } - + if (ngx_strcmp(encrypted, passwd->data) == 0) { + return NGX_OK; } - /* TODO: add mutex event */ + ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, + "encrypted: \"%s\"", encrypted); + + ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, + "user \"%V\": password mismatch", + &r->headers_in.user); - return rc; + return ngx_http_auth_basic_set_realm(r, realm); } Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_auth_request_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_autoindex_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_browser_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_charset_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_chunked_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_dav_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_degradation_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_empty_gif_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_fastcgi_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_flv_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_geo_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_geoip_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_gunzip_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_gzip_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_gzip_static_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_headers_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_image_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_index_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_limit_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_limit_req_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_log_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_map_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_memcached_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_mirror_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_mp4_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_not_modified_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_proxy_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_random_index_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_range_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_realip_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_referer_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_rewrite_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_scgi_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_secure_link_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_slice_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_split_clients_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_ssi_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_ssi_filter_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_ssl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_ssl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_static_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_stub_status_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_sub_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_try_files_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_upstream_hash_module.c (+14 -10) 98% =================================================================== --- vendor/nginx-1.13.5/src/http/modules/ngx_http_upstream_hash_module.c 2017-10-24 17:54:56 +0900 (6c28c6456) +++ vendor/nginx-1.13.6/src/http/modules/ngx_http_upstream_hash_module.c 2017-10-24 17:57:33 +0900 (d67f34d58) @@ -503,6 +503,11 @@ ngx_http_upstream_get_chash_peer(ngx_peer_connection_t *pc, void *data) ngx_http_upstream_rr_peers_wlock(hp->rrp.peers); + if (hp->tries > 20 || hp->rrp.peers->single) { + ngx_http_upstream_rr_peers_unlock(hp->rrp.peers); + return hp->get_rr_peer(pc, &hp->rrp); + } + pc->cached = 0; pc->connection = NULL; @@ -538,13 +543,6 @@ ngx_http_upstream_get_chash_peer(ngx_peer_connection_t *pc, void *data) continue; } - if (peer->server.len != server->len - || ngx_strncmp(peer->server.data, server->data, server->len) - != 0) - { - continue; - } - if (peer->max_fails && peer->fails >= peer->max_fails && now - peer->checked <= peer->fail_timeout) @@ -556,6 +554,13 @@ ngx_http_upstream_get_chash_peer(ngx_peer_connection_t *pc, void *data) continue; } + if (peer->server.len != server->len + || ngx_strncmp(peer->server.data, server->data, server->len) + != 0) + { + continue; + } + peer->current_weight += peer->effective_weight; total += peer->effective_weight; @@ -577,10 +582,9 @@ ngx_http_upstream_get_chash_peer(ngx_peer_connection_t *pc, void *data) hp->hash++; hp->tries++; - if (hp->tries >= points->number) { - pc->name = hp->rrp.peers->name; + if (hp->tries > 20) { ngx_http_upstream_rr_peers_unlock(hp->rrp.peers); - return NGX_BUSY; + return hp->get_rr_peer(pc, &hp->rrp); } } Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_upstream_ip_hash_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_upstream_keepalive_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_upstream_least_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_upstream_zone_module.c (+1 -1) 99% =================================================================== --- vendor/nginx-1.13.5/src/http/modules/ngx_http_upstream_zone_module.c 2017-10-24 17:54:56 +0900 (d340b481f) +++ vendor/nginx-1.13.6/src/http/modules/ngx_http_upstream_zone_module.c 2017-10-24 17:57:33 +0900 (3229cfe84) @@ -281,7 +281,7 @@ ngx_http_upstream_zone_copy_peer(ngx_http_upstream_rr_peers_t *peers, dst->server.data = NULL; } - dst->sockaddr = ngx_slab_calloc_locked(pool, NGX_SOCKADDRLEN); + dst->sockaddr = ngx_slab_calloc_locked(pool, sizeof(ngx_sockaddr_t)); if (dst->sockaddr == NULL) { goto failed; } Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_userid_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_uwsgi_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/ngx_http_xslt_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/perl/Makefile.PL (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/perl/nginx.pm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/perl/nginx.xs (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/perl/ngx_http_perl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/perl/ngx_http_perl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/modules/perl/typemap (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/ngx_http.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/ngx_http.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/ngx_http_cache.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/ngx_http_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/ngx_http_copy_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/ngx_http_core_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/ngx_http_core_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/ngx_http_file_cache.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/ngx_http_header_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/ngx_http_parse.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/ngx_http_postpone_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/ngx_http_request.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/ngx_http_request.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/ngx_http_request_body.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/ngx_http_script.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/ngx_http_script.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/ngx_http_special_response.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/ngx_http_upstream.c (+62 -11) 98% =================================================================== --- vendor/nginx-1.13.5/src/http/ngx_http_upstream.c 2017-10-24 17:54:56 +0900 (73a58824a) +++ vendor/nginx-1.13.6/src/http/ngx_http_upstream.c 2017-10-24 17:57:33 +0900 (2ea521b07) @@ -582,6 +582,9 @@ ngx_http_upstream_init_request(ngx_http_request_t *r) if (rc == NGX_HTTP_UPSTREAM_INVALID_HEADER) { rc = NGX_DECLINED; r->cached = 0; + u->buffer.start = NULL; + u->cache_status = NGX_HTTP_CACHE_MISS; + u->request_sent = 1; } if (ngx_http_upstream_cache_background_update(r, u) != NGX_OK) { @@ -1059,8 +1062,16 @@ ngx_http_upstream_cache_send(ngx_http_request_t *r, ngx_http_upstream_t *u) return NGX_ERROR; } + if (rc == NGX_AGAIN) { + rc = NGX_HTTP_UPSTREAM_INVALID_HEADER; + } + /* rc == NGX_HTTP_UPSTREAM_INVALID_HEADER */ + ngx_log_error(NGX_LOG_CRIT, r->connection->log, 0, + "cache file \"%s\" contains invalid header", + c->file.name.data); + /* TODO: delete file */ return rc; @@ -2393,9 +2404,20 @@ ngx_http_upstream_test_next(ngx_http_request_t *r, ngx_http_upstream_t *u) rc = u->reinit_request(r); - if (rc == NGX_OK) { - u->cache_status = NGX_HTTP_CACHE_STALE; - rc = ngx_http_upstream_cache_send(r, u); + if (rc != NGX_OK) { + ngx_http_upstream_finalize_request(r, u, rc); + return NGX_OK; + } + + u->cache_status = NGX_HTTP_CACHE_STALE; + rc = ngx_http_upstream_cache_send(r, u); + + if (rc == NGX_DONE) { + return NGX_OK; + } + + if (rc == NGX_HTTP_UPSTREAM_INVALID_HEADER) { + rc = NGX_HTTP_INTERNAL_SERVER_ERROR; } ngx_http_upstream_finalize_request(r, u, rc); @@ -2433,6 +2455,14 @@ ngx_http_upstream_test_next(ngx_http_request_t *r, ngx_http_upstream_t *u) u->cache_status = NGX_HTTP_CACHE_REVALIDATED; rc = ngx_http_upstream_cache_send(r, u); + if (rc == NGX_DONE) { + return NGX_OK; + } + + if (rc == NGX_HTTP_UPSTREAM_INVALID_HEADER) { + rc = NGX_HTTP_INTERNAL_SERVER_ERROR; + } + if (valid == 0) { valid = r->cache->valid_sec; updating = r->cache->updating_sec; @@ -2518,13 +2548,23 @@ ngx_http_upstream_intercept_errors(ngx_http_request_t *r, #if (NGX_HTTP_CACHE) if (r->cache) { - time_t valid; - valid = ngx_http_file_cache_valid(u->conf->cache_valid, status); + if (u->cacheable) { + time_t valid; - if (valid) { - r->cache->valid_sec = ngx_time() + valid; - r->cache->error = status; + valid = r->cache->valid_sec; + + if (valid == 0) { + valid = ngx_http_file_cache_valid(u->conf->cache_valid, + status); + if (valid) { + r->cache->valid_sec = ngx_time() + valid; + } + } + + if (valid) { + r->cache->error = status; + } } ngx_http_file_cache_free(r->cache, u->pipe->temp_file); @@ -4129,9 +4169,20 @@ ngx_http_upstream_next(ngx_http_request_t *r, ngx_http_upstream_t *u, rc = u->reinit_request(r); - if (rc == NGX_OK) { - u->cache_status = NGX_HTTP_CACHE_STALE; - rc = ngx_http_upstream_cache_send(r, u); + if (rc != NGX_OK) { + ngx_http_upstream_finalize_request(r, u, rc); + return; + } + + u->cache_status = NGX_HTTP_CACHE_STALE; + rc = ngx_http_upstream_cache_send(r, u); + + if (rc == NGX_DONE) { + return; + } + + if (rc == NGX_HTTP_UPSTREAM_INVALID_HEADER) { + rc = NGX_HTTP_INTERNAL_SERVER_ERROR; } ngx_http_upstream_finalize_request(r, u, rc); Renamed: vendor/nginx-1.13.6/src/http/ngx_http_upstream.h (+1 -1) 99% =================================================================== --- vendor/nginx-1.13.5/src/http/ngx_http_upstream.h 2017-10-24 17:54:56 +0900 (c552ac0c6) +++ vendor/nginx-1.13.6/src/http/ngx_http_upstream.h 2017-10-24 17:57:33 +0900 (3e714e5b1) @@ -98,8 +98,8 @@ typedef struct { ngx_uint_t max_fails; time_t fail_timeout; ngx_msec_t slow_start; + ngx_uint_t down; - unsigned down:1; unsigned backup:1; NGX_COMPAT_BEGIN(6) Renamed: vendor/nginx-1.13.6/src/http/ngx_http_upstream_round_robin.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/ngx_http_upstream_round_robin.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/ngx_http_variables.c (+12 -0) 99% =================================================================== --- vendor/nginx-1.13.5/src/http/ngx_http_variables.c 2017-10-24 17:54:56 +0900 (afeb4ce65) +++ vendor/nginx-1.13.6/src/http/ngx_http_variables.c 2017-10-24 17:57:33 +0900 (ab82177ca) @@ -1240,6 +1240,18 @@ ngx_http_variable_binary_remote_addr(ngx_http_request_t *r, break; #endif +#if (NGX_HAVE_UNIX_DOMAIN) + case AF_UNIX: + + v->len = r->connection->addr_text.len; + v->valid = 1; + v->no_cacheable = 0; + v->not_found = 0; + v->data = r->connection->addr_text.data; + + break; +#endif + default: /* AF_INET */ sin = (struct sockaddr_in *) r->connection->sockaddr; Renamed: vendor/nginx-1.13.6/src/http/ngx_http_variables.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/ngx_http_write_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/v2/ngx_http_v2.c (+22 -10) 99% =================================================================== --- vendor/nginx-1.13.5/src/http/v2/ngx_http_v2.c 2017-10-24 17:54:56 +0900 (772561640) +++ vendor/nginx-1.13.6/src/http/v2/ngx_http_v2.c 2017-10-24 17:57:33 +0900 (2c621907b) @@ -245,6 +245,8 @@ ngx_http_v2_init(ngx_event_t *rev) h2c->frame_size = NGX_HTTP_V2_DEFAULT_FRAME_SIZE; + h2c->table_update = 1; + h2scf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_v2_module); h2c->pool = ngx_create_pool(h2scf->pool_size, h2c->connection->log); @@ -746,7 +748,7 @@ ngx_http_v2_state_head(ngx_http_v2_connection_t *h2c, u_char *pos, u_char *end) type = ngx_http_v2_parse_type(head); ngx_log_debug4(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0, - "process http2 frame type:%ui f:%Xd l:%uz sid:%ui", + "http2 frame type:%ui f:%Xd l:%uz sid:%ui", type, h2c->state.flags, h2c->state.length, h2c->state.sid); if (type >= NGX_HTTP_V2_FRAME_STATES) { @@ -1314,7 +1316,7 @@ ngx_http_v2_state_field_len(ngx_http_v2_connection_t *h2c, u_char *pos, } ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0, - "http2 hpack %s string length: %i", + "http2 %s string, len:%i", huff ? "encoded" : "raw", len); h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx, @@ -1569,7 +1571,7 @@ ngx_http_v2_state_process_header(ngx_http_v2_connection_t *h2c, u_char *pos, if (rc == NGX_OK) { ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, - "http2 pseudo-header: \":%V: %V\"", + "http2 header: \":%V: %V\"", &header->name, &header->value); return ngx_http_v2_state_header_complete(h2c, pos, end); @@ -1645,7 +1647,7 @@ ngx_http_v2_state_process_header(ngx_http_v2_connection_t *h2c, u_char *pos, } ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, - "http2 http header: \"%V: %V\"", + "http2 header: \"%V: %V\"", &header->name, &header->value); return ngx_http_v2_state_header_complete(h2c, pos, end); @@ -3335,6 +3337,19 @@ ngx_http_v2_construct_request_line(ngx_http_request_t *r) || r->schema_start == NULL || r->unparsed_uri.len == 0) { + if (r->method_name.len == 0) { + ngx_log_error(NGX_LOG_INFO, r->connection->log, 0, + "client sent no :method header"); + + } else if (r->schema_start == NULL) { + ngx_log_error(NGX_LOG_INFO, r->connection->log, 0, + "client sent no :schema header"); + + } else { + ngx_log_error(NGX_LOG_INFO, r->connection->log, 0, + "client sent no :path header"); + } + ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST); return NGX_ERROR; } @@ -3360,7 +3375,7 @@ ngx_http_v2_construct_request_line(ngx_http_request_t *r) ngx_memcpy(p, ending, sizeof(ending)); ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, - "http2 http request line: \"%V\"", &r->request_line); + "http2 request line: \"%V\"", &r->request_line); return NGX_OK; } @@ -3574,11 +3589,6 @@ ngx_http_v2_read_request_body(ngx_http_request_t *r) rb->buf = ngx_create_temp_buf(r->pool, (size_t) len); } else { - if (stream->preread) { - /* enforce writing preread buffer to file */ - r->request_body_in_file_only = 1; - } - rb->buf = ngx_calloc_buf(r->pool); if (rb->buf != NULL) { @@ -3679,6 +3689,8 @@ ngx_http_v2_process_request_body(ngx_http_request_t *r, u_char *pos, buf->pos = buf->start = pos; buf->last = buf->end = pos + size; + r->request_body_in_file_only = 1; + } else { if (size > (size_t) (buf->end - buf->last)) { ngx_log_error(NGX_LOG_INFO, fc->log, 0, Renamed: vendor/nginx-1.13.6/src/http/v2/ngx_http_v2.h (+1 -0) 99% =================================================================== --- vendor/nginx-1.13.5/src/http/v2/ngx_http_v2.h 2017-10-24 17:54:56 +0900 (4804658eb) +++ vendor/nginx-1.13.6/src/http/v2/ngx_http_v2.h 2017-10-24 17:57:33 +0900 (42e0eb132) @@ -144,6 +144,7 @@ struct ngx_http_v2_connection_s { unsigned closed_nodes:8; unsigned settings_ack:1; + unsigned table_update:1; unsigned blocked:1; unsigned goaway:1; }; Renamed: vendor/nginx-1.13.6/src/http/v2/ngx_http_v2_filter_module.c (+14 -2) 98% =================================================================== --- vendor/nginx-1.13.5/src/http/v2/ngx_http_v2_filter_module.c 2017-10-24 17:54:56 +0900 (8621e7a4d) +++ vendor/nginx-1.13.6/src/http/v2/ngx_http_v2_filter_module.c 2017-10-24 17:57:33 +0900 (907078506) @@ -139,6 +139,7 @@ ngx_http_v2_header_filter(ngx_http_request_t *r) ngx_connection_t *fc; ngx_http_cleanup_t *cln; ngx_http_v2_out_frame_t *frame; + ngx_http_v2_connection_t *h2c; ngx_http_core_loc_conf_t *clcf; ngx_http_core_srv_conf_t *cscf; u_char addr[NGX_SOCKADDR_STRLEN]; @@ -235,7 +236,11 @@ ngx_http_v2_header_filter(ngx_http_request_t *r) } } - len = status ? 1 : 1 + ngx_http_v2_literal_size("418"); + h2c = r->stream->connection; + + len = h2c->table_update ? 1 : 0; + + len += status ? 1 : 1 + ngx_http_v2_literal_size("418"); clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); @@ -423,6 +428,13 @@ ngx_http_v2_header_filter(ngx_http_request_t *r) start = pos; + if (h2c->table_update) { + ngx_log_debug0(NGX_LOG_DEBUG_HTTP, fc->log, 0, + "http2 table size update: 0"); + *pos++ = (1 << 5) | 0; + h2c->table_update = 0; + } + ngx_log_debug1(NGX_LOG_DEBUG_HTTP, fc->log, 0, "http2 output header: \":status: %03ui\"", r->headers_out.status); @@ -1257,7 +1269,7 @@ ngx_http_v2_flow_control(ngx_http_v2_connection_t *h2c, ngx_http_v2_stream_t *stream) { ngx_log_debug3(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0, - "http2:%ui available windows: conn:%uz stream:%z", + "http2:%ui windows: conn:%uz stream:%z", stream->node->id, h2c->send_window, stream->send_window); if (stream->send_window <= 0) { Renamed: vendor/nginx-1.13.6/src/http/v2/ngx_http_v2_huff_decode.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/v2/ngx_http_v2_huff_encode.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/v2/ngx_http_v2_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/v2/ngx_http_v2_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/http/v2/ngx_http_v2_table.c (+3 -3) 98% =================================================================== --- vendor/nginx-1.13.5/src/http/v2/ngx_http_v2_table.c 2017-10-24 17:54:56 +0900 (a73748a98) +++ vendor/nginx-1.13.6/src/http/v2/ngx_http_v2_table.c 2017-10-24 17:57:33 +0900 (62025c426) @@ -102,7 +102,7 @@ ngx_http_v2_get_indexed_header(ngx_http_v2_connection_t *h2c, ngx_uint_t index, ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0, "http2 get indexed %s: %ui", - name_only ? "header" : "header name", index); + name_only ? "name" : "header", index); index--; @@ -180,7 +180,7 @@ ngx_http_v2_add_header(ngx_http_v2_connection_t *h2c, ngx_http_v2_header_t *entry, **entries; ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0, - "http2 add header to hpack table: \"%V: %V\"", + "http2 table add: \"%V: %V\"", &header->name, &header->value); if (h2c->hpack.entries == NULL) { @@ -293,7 +293,7 @@ ngx_http_v2_table_account(ngx_http_v2_connection_t *h2c, size_t size) size += 32; ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0, - "http2 hpack table account: %uz free:%uz", + "http2 table account: %uz free:%uz", size, h2c->hpack.free); if (size <= h2c->hpack.free) { Renamed: vendor/nginx-1.13.6/src/mail/ngx_mail.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/mail/ngx_mail.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/mail/ngx_mail_auth_http_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/mail/ngx_mail_core_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/mail/ngx_mail_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/mail/ngx_mail_imap_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/mail/ngx_mail_imap_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/mail/ngx_mail_imap_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/mail/ngx_mail_parse.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/mail/ngx_mail_pop3_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/mail/ngx_mail_pop3_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/mail/ngx_mail_pop3_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/mail/ngx_mail_proxy_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/mail/ngx_mail_smtp_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/mail/ngx_mail_smtp_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/mail/ngx_mail_smtp_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/mail/ngx_mail_ssl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/mail/ngx_mail_ssl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/misc/ngx_cpp_test_module.cpp (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/misc/ngx_google_perftools_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_alloc.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_alloc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_atomic.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_channel.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_channel.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_daemon.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_darwin.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_darwin_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_darwin_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_darwin_sendfile_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_dlopen.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_dlopen.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_errno.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_errno.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_file_aio_read.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_files.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_files.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_freebsd.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_freebsd_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_freebsd_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_freebsd_sendfile_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_gcc_atomic_amd64.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_gcc_atomic_ppc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_gcc_atomic_sparc64.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_gcc_atomic_x86.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_linux.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_linux_aio_read.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_linux_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_linux_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_linux_sendfile_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_os.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_posix_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_posix_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_process.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_process.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_process_cycle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_process_cycle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_readv_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_recv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_send.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_setaffinity.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_setaffinity.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_setproctitle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_setproctitle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_shmem.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_shmem.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_socket.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_socket.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_solaris.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_solaris_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_solaris_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_solaris_sendfilev_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_sunpro_amd64.il (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_sunpro_atomic_sparc64.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_sunpro_sparc64.il (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_sunpro_x86.il (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_thread.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_thread_cond.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_thread_id.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_thread_mutex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_time.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_time.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_udp_recv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_udp_send.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_udp_sendmsg_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_user.c (+0 -10) 87% =================================================================== --- vendor/nginx-1.13.5/src/os/unix/ngx_user.c 2017-10-24 17:54:56 +0900 (27c76ef80) +++ vendor/nginx-1.13.6/src/os/unix/ngx_user.c 2017-10-24 17:57:33 +0900 (7ebe2b576) @@ -9,16 +9,6 @@ #include <ngx_core.h> -/* - * Solaris has thread-safe crypt() - * Linux has crypt_r(); "struct crypt_data" is more than 128K - * FreeBSD needs the mutex to protect crypt() - * - * TODO: - * ngx_crypt_init() to init mutex - */ - - #if (NGX_CRYPT) #if (NGX_HAVE_GNU_CRYPT_R) Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_user.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/unix/ngx_writev_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/nginx.ico (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/nginx.rc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/nginx_icon16.xpm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/nginx_icon32.xpm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/nginx_icon48.xpm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/ngx_alloc.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/ngx_alloc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/ngx_atomic.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/ngx_dlopen.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/ngx_dlopen.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/ngx_errno.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/ngx_errno.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/ngx_event_log.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/ngx_files.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/ngx_files.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/ngx_os.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/ngx_process.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/ngx_process.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/ngx_process_cycle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/ngx_process_cycle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/ngx_service.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/ngx_shmem.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/ngx_shmem.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/ngx_socket.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/ngx_socket.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/ngx_stat.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/ngx_thread.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/ngx_thread.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/ngx_time.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/ngx_time.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/ngx_udp_wsarecv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/ngx_user.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/ngx_user.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/ngx_win32_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/ngx_win32_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/ngx_wsarecv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/ngx_wsarecv_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/ngx_wsasend.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/os/win32/ngx_wsasend_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/stream/ngx_stream.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/stream/ngx_stream.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/stream/ngx_stream_access_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/stream/ngx_stream_core_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/stream/ngx_stream_geo_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/stream/ngx_stream_geoip_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/stream/ngx_stream_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/stream/ngx_stream_limit_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/stream/ngx_stream_log_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/stream/ngx_stream_map_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/stream/ngx_stream_proxy_module.c (+11 -3) 99% =================================================================== --- vendor/nginx-1.13.5/src/stream/ngx_stream_proxy_module.c 2017-10-24 17:54:56 +0900 (0afde1c40) +++ vendor/nginx-1.13.6/src/stream/ngx_stream_proxy_module.c 2017-10-24 17:57:33 +0900 (9d4b075fb) @@ -1331,13 +1331,17 @@ ngx_stream_proxy_process_connection(ngx_event_t *ev, ngx_uint_t from_upstream) return; } + ngx_connection_error(pc, NGX_ETIMEDOUT, "upstream timed out"); + if (u->received == 0) { ngx_stream_proxy_next_upstream(s); return; } + + } else { + ngx_connection_error(c, NGX_ETIMEDOUT, "connection timed out"); } - ngx_connection_error(c, NGX_ETIMEDOUT, "connection timed out"); ngx_stream_proxy_finalize(s, NGX_STREAM_OK); return; } @@ -1665,13 +1669,17 @@ ngx_stream_proxy_next_upstream(ngx_stream_session_t *s) u = s->upstream; pc = u->peer.connection; - if (u->upstream_out || u->upstream_busy || (pc && pc->buffered)) { + if (pc && pc->buffered) { ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, - "pending buffers on next upstream"); + "buffered data on next upstream"); ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR); return; } + if (s->connection->type == SOCK_DGRAM) { + u->upstream_out = NULL; + } + if (u->peer.sockaddr) { u->peer.free(&u->peer, u->peer.data, NGX_PEER_FAILED); u->peer.sockaddr = NULL; Renamed: vendor/nginx-1.13.6/src/stream/ngx_stream_realip_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/stream/ngx_stream_return_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/stream/ngx_stream_script.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/stream/ngx_stream_script.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/stream/ngx_stream_split_clients_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/stream/ngx_stream_ssl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/stream/ngx_stream_ssl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/stream/ngx_stream_ssl_preread_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/stream/ngx_stream_upstream.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/stream/ngx_stream_upstream.h (+1 -1) 98% =================================================================== --- vendor/nginx-1.13.5/src/stream/ngx_stream_upstream.h 2017-10-24 17:54:56 +0900 (90076e0c6) +++ vendor/nginx-1.13.6/src/stream/ngx_stream_upstream.h 2017-10-24 17:57:33 +0900 (73947f465) @@ -58,8 +58,8 @@ typedef struct { ngx_uint_t max_fails; time_t fail_timeout; ngx_msec_t slow_start; + ngx_uint_t down; - unsigned down:1; unsigned backup:1; NGX_COMPAT_BEGIN(4) Renamed: vendor/nginx-1.13.6/src/stream/ngx_stream_upstream_hash_module.c (+14 -10) 98% =================================================================== --- vendor/nginx-1.13.5/src/stream/ngx_stream_upstream_hash_module.c 2017-10-24 17:54:56 +0900 (cb44fcdad) +++ vendor/nginx-1.13.6/src/stream/ngx_stream_upstream_hash_module.c 2017-10-24 17:57:33 +0900 (79ad742cf) @@ -505,6 +505,11 @@ ngx_stream_upstream_get_chash_peer(ngx_peer_connection_t *pc, void *data) ngx_stream_upstream_rr_peers_wlock(hp->rrp.peers); + if (hp->tries > 20 || hp->rrp.peers->single) { + ngx_stream_upstream_rr_peers_unlock(hp->rrp.peers); + return hp->get_rr_peer(pc, &hp->rrp); + } + pc->connection = NULL; now = ngx_time(); @@ -539,13 +544,6 @@ ngx_stream_upstream_get_chash_peer(ngx_peer_connection_t *pc, void *data) continue; } - if (peer->server.len != server->len - || ngx_strncmp(peer->server.data, server->data, server->len) - != 0) - { - continue; - } - if (peer->max_fails && peer->fails >= peer->max_fails && now - peer->checked <= peer->fail_timeout) @@ -557,6 +555,13 @@ ngx_stream_upstream_get_chash_peer(ngx_peer_connection_t *pc, void *data) continue; } + if (peer->server.len != server->len + || ngx_strncmp(peer->server.data, server->data, server->len) + != 0) + { + continue; + } + peer->current_weight += peer->effective_weight; total += peer->effective_weight; @@ -578,10 +583,9 @@ ngx_stream_upstream_get_chash_peer(ngx_peer_connection_t *pc, void *data) hp->hash++; hp->tries++; - if (hp->tries >= points->number) { - pc->name = hp->rrp.peers->name; + if (hp->tries > 20) { ngx_stream_upstream_rr_peers_unlock(hp->rrp.peers); - return NGX_BUSY; + return hp->get_rr_peer(pc, &hp->rrp); } } Renamed: vendor/nginx-1.13.6/src/stream/ngx_stream_upstream_least_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/stream/ngx_stream_upstream_round_robin.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/stream/ngx_stream_upstream_round_robin.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/stream/ngx_stream_upstream_zone_module.c (+1 -1) 99% =================================================================== --- vendor/nginx-1.13.5/src/stream/ngx_stream_upstream_zone_module.c 2017-10-24 17:54:56 +0900 (4f72188f6) +++ vendor/nginx-1.13.6/src/stream/ngx_stream_upstream_zone_module.c 2017-10-24 17:57:33 +0900 (80d42fa00) @@ -278,7 +278,7 @@ ngx_stream_upstream_zone_copy_peer(ngx_stream_upstream_rr_peers_t *peers, dst->server.data = NULL; } - dst->sockaddr = ngx_slab_calloc_locked(pool, NGX_SOCKADDRLEN); + dst->sockaddr = ngx_slab_calloc_locked(pool, sizeof(ngx_sockaddr_t)); if (dst->sockaddr == NULL) { goto failed; } Renamed: vendor/nginx-1.13.6/src/stream/ngx_stream_variables.c (+13 -1) 99% =================================================================== --- vendor/nginx-1.13.5/src/stream/ngx_stream_variables.c 2017-10-24 17:54:56 +0900 (45d6e60c8) +++ vendor/nginx-1.13.6/src/stream/ngx_stream_variables.c 2017-10-24 17:57:33 +0900 (95ae12b1f) @@ -460,7 +460,7 @@ ngx_stream_get_variable(ngx_stream_session_t *s, ngx_str_t *name, static ngx_int_t ngx_stream_variable_binary_remote_addr(ngx_stream_session_t *s, ngx_stream_variable_value_t *v, uintptr_t data) - { +{ struct sockaddr_in *sin; #if (NGX_HAVE_INET6) struct sockaddr_in6 *sin6; @@ -481,6 +481,18 @@ ngx_stream_variable_binary_remote_addr(ngx_stream_session_t *s, break; #endif +#if (NGX_HAVE_UNIX_DOMAIN) + case AF_UNIX: + + v->len = s->connection->addr_text.len; + v->valid = 1; + v->no_cacheable = 0; + v->not_found = 0; + v->data = s->connection->addr_text.data; + + break; +#endif + default: /* AF_INET */ sin = (struct sockaddr_in *) s->connection->sockaddr; Renamed: vendor/nginx-1.13.6/src/stream/ngx_stream_variables.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.6/src/stream/ngx_stream_write_filter_module.c (+0 -0) 100% ===================================================================
