Kentaro Hayashi 2018-11-28 08:32:06 +0900 (Wed, 28 Nov 2018) Revision: 8b4e941e1f719fd9106f903b32bb4f8c7222e27a https://github.com/groonga/groonga/commit/8b4e941e1f719fd9106f903b32bb4f8c7222e27a Message: nginx: update nginx % ./update_nginx.sh 1.15.7 This update contains a fix for memory leak. Modified files: nginx_version Renamed files: vendor/nginx-1.15.7/auto/cc/acc (from vendor/nginx-1.15.6/auto/cc/acc) vendor/nginx-1.15.7/auto/cc/bcc (from vendor/nginx-1.15.6/auto/cc/bcc) vendor/nginx-1.15.7/auto/cc/ccc (from vendor/nginx-1.15.6/auto/cc/ccc) vendor/nginx-1.15.7/auto/cc/clang (from vendor/nginx-1.15.6/auto/cc/clang) vendor/nginx-1.15.7/auto/cc/conf (from vendor/nginx-1.15.6/auto/cc/conf) vendor/nginx-1.15.7/auto/cc/gcc (from vendor/nginx-1.15.6/auto/cc/gcc) vendor/nginx-1.15.7/auto/cc/icc (from vendor/nginx-1.15.6/auto/cc/icc) vendor/nginx-1.15.7/auto/cc/msvc (from vendor/nginx-1.15.6/auto/cc/msvc) vendor/nginx-1.15.7/auto/cc/name (from vendor/nginx-1.15.6/auto/cc/name) vendor/nginx-1.15.7/auto/cc/owc (from vendor/nginx-1.15.6/auto/cc/owc) vendor/nginx-1.15.7/auto/cc/sunc (from vendor/nginx-1.15.6/auto/cc/sunc) vendor/nginx-1.15.7/auto/configure (from vendor/nginx-1.15.6/auto/configure) vendor/nginx-1.15.7/auto/define (from vendor/nginx-1.15.6/auto/define) vendor/nginx-1.15.7/auto/endianness (from vendor/nginx-1.15.6/auto/endianness) vendor/nginx-1.15.7/auto/feature (from vendor/nginx-1.15.6/auto/feature) vendor/nginx-1.15.7/auto/have (from vendor/nginx-1.15.6/auto/have) vendor/nginx-1.15.7/auto/have_headers (from vendor/nginx-1.15.6/auto/have_headers) vendor/nginx-1.15.7/auto/headers (from vendor/nginx-1.15.6/auto/headers) vendor/nginx-1.15.7/auto/include (from vendor/nginx-1.15.6/auto/include) vendor/nginx-1.15.7/auto/init (from vendor/nginx-1.15.6/auto/init) vendor/nginx-1.15.7/auto/install (from vendor/nginx-1.15.6/auto/install) vendor/nginx-1.15.7/auto/lib/conf (from vendor/nginx-1.15.6/auto/lib/conf) vendor/nginx-1.15.7/auto/lib/geoip/conf (from vendor/nginx-1.15.6/auto/lib/geoip/conf) vendor/nginx-1.15.7/auto/lib/google-perftools/conf (from vendor/nginx-1.15.6/auto/lib/google-perftools/conf) vendor/nginx-1.15.7/auto/lib/libatomic/conf (from vendor/nginx-1.15.6/auto/lib/libatomic/conf) vendor/nginx-1.15.7/auto/lib/libatomic/make (from vendor/nginx-1.15.6/auto/lib/libatomic/make) vendor/nginx-1.15.7/auto/lib/libgd/conf (from vendor/nginx-1.15.6/auto/lib/libgd/conf) vendor/nginx-1.15.7/auto/lib/libxslt/conf (from vendor/nginx-1.15.6/auto/lib/libxslt/conf) vendor/nginx-1.15.7/auto/lib/make (from vendor/nginx-1.15.6/auto/lib/make) vendor/nginx-1.15.7/auto/lib/openssl/conf (from vendor/nginx-1.15.6/auto/lib/openssl/conf) vendor/nginx-1.15.7/auto/lib/openssl/make (from vendor/nginx-1.15.6/auto/lib/openssl/make) vendor/nginx-1.15.7/auto/lib/openssl/makefile.bcc (from vendor/nginx-1.15.6/auto/lib/openssl/makefile.bcc) vendor/nginx-1.15.7/auto/lib/openssl/makefile.msvc (from vendor/nginx-1.15.6/auto/lib/openssl/makefile.msvc) vendor/nginx-1.15.7/auto/lib/pcre/conf (from vendor/nginx-1.15.6/auto/lib/pcre/conf) vendor/nginx-1.15.7/auto/lib/pcre/make (from vendor/nginx-1.15.6/auto/lib/pcre/make) vendor/nginx-1.15.7/auto/lib/pcre/makefile.bcc (from vendor/nginx-1.15.6/auto/lib/pcre/makefile.bcc) vendor/nginx-1.15.7/auto/lib/pcre/makefile.msvc (from vendor/nginx-1.15.6/auto/lib/pcre/makefile.msvc) vendor/nginx-1.15.7/auto/lib/pcre/makefile.owc (from vendor/nginx-1.15.6/auto/lib/pcre/makefile.owc) vendor/nginx-1.15.7/auto/lib/perl/conf (from vendor/nginx-1.15.6/auto/lib/perl/conf) vendor/nginx-1.15.7/auto/lib/perl/make (from vendor/nginx-1.15.6/auto/lib/perl/make) vendor/nginx-1.15.7/auto/lib/zlib/conf (from vendor/nginx-1.15.6/auto/lib/zlib/conf) vendor/nginx-1.15.7/auto/lib/zlib/make (from vendor/nginx-1.15.6/auto/lib/zlib/make) vendor/nginx-1.15.7/auto/lib/zlib/makefile.bcc (from vendor/nginx-1.15.6/auto/lib/zlib/makefile.bcc) vendor/nginx-1.15.7/auto/lib/zlib/makefile.msvc (from vendor/nginx-1.15.6/auto/lib/zlib/makefile.msvc) vendor/nginx-1.15.7/auto/lib/zlib/makefile.owc (from vendor/nginx-1.15.6/auto/lib/zlib/makefile.owc) vendor/nginx-1.15.7/auto/make (from vendor/nginx-1.15.6/auto/make) vendor/nginx-1.15.7/auto/module (from vendor/nginx-1.15.6/auto/module) vendor/nginx-1.15.7/auto/modules (from vendor/nginx-1.15.6/auto/modules) vendor/nginx-1.15.7/auto/nohave (from vendor/nginx-1.15.6/auto/nohave) vendor/nginx-1.15.7/auto/options (from vendor/nginx-1.15.6/auto/options) vendor/nginx-1.15.7/auto/os/conf (from vendor/nginx-1.15.6/auto/os/conf) vendor/nginx-1.15.7/auto/os/darwin (from vendor/nginx-1.15.6/auto/os/darwin) vendor/nginx-1.15.7/auto/os/freebsd (from vendor/nginx-1.15.6/auto/os/freebsd) vendor/nginx-1.15.7/auto/os/linux (from vendor/nginx-1.15.6/auto/os/linux) vendor/nginx-1.15.7/auto/os/solaris (from vendor/nginx-1.15.6/auto/os/solaris) vendor/nginx-1.15.7/auto/os/win32 (from vendor/nginx-1.15.6/auto/os/win32) vendor/nginx-1.15.7/auto/sources (from vendor/nginx-1.15.6/auto/sources) vendor/nginx-1.15.7/auto/stubs (from vendor/nginx-1.15.6/auto/stubs) vendor/nginx-1.15.7/auto/summary (from vendor/nginx-1.15.6/auto/summary) vendor/nginx-1.15.7/auto/threads (from vendor/nginx-1.15.6/auto/threads) vendor/nginx-1.15.7/auto/types/sizeof (from vendor/nginx-1.15.6/auto/types/sizeof) vendor/nginx-1.15.7/auto/types/typedef (from vendor/nginx-1.15.6/auto/types/typedef) vendor/nginx-1.15.7/auto/types/uintptr_t (from vendor/nginx-1.15.6/auto/types/uintptr_t) vendor/nginx-1.15.7/auto/types/value (from vendor/nginx-1.15.6/auto/types/value) vendor/nginx-1.15.7/auto/unix (from vendor/nginx-1.15.6/auto/unix) vendor/nginx-1.15.7/conf/fastcgi.conf (from vendor/nginx-1.15.6/conf/fastcgi.conf) vendor/nginx-1.15.7/conf/fastcgi_params (from vendor/nginx-1.15.6/conf/fastcgi_params) vendor/nginx-1.15.7/conf/koi-utf (from vendor/nginx-1.15.6/conf/koi-utf) vendor/nginx-1.15.7/conf/koi-win (from vendor/nginx-1.15.6/conf/koi-win) vendor/nginx-1.15.7/conf/mime.types (from vendor/nginx-1.15.6/conf/mime.types) vendor/nginx-1.15.7/conf/nginx.conf (from vendor/nginx-1.15.6/conf/nginx.conf) vendor/nginx-1.15.7/conf/scgi_params (from vendor/nginx-1.15.6/conf/scgi_params) vendor/nginx-1.15.7/conf/uwsgi_params (from vendor/nginx-1.15.6/conf/uwsgi_params) vendor/nginx-1.15.7/conf/win-utf (from vendor/nginx-1.15.6/conf/win-utf) vendor/nginx-1.15.7/contrib/README (from vendor/nginx-1.15.6/contrib/README) vendor/nginx-1.15.7/contrib/geo2nginx.pl (from vendor/nginx-1.15.6/contrib/geo2nginx.pl) vendor/nginx-1.15.7/contrib/unicode2nginx/koi-utf (from vendor/nginx-1.15.6/contrib/unicode2nginx/koi-utf) vendor/nginx-1.15.7/contrib/unicode2nginx/unicode-to-nginx.pl (from vendor/nginx-1.15.6/contrib/unicode2nginx/unicode-to-nginx.pl) vendor/nginx-1.15.7/contrib/unicode2nginx/win-utf (from vendor/nginx-1.15.6/contrib/unicode2nginx/win-utf) vendor/nginx-1.15.7/contrib/vim/ftdetect/nginx.vim (from vendor/nginx-1.15.6/contrib/vim/ftdetect/nginx.vim) vendor/nginx-1.15.7/contrib/vim/ftplugin/nginx.vim (from vendor/nginx-1.15.6/contrib/vim/ftplugin/nginx.vim) vendor/nginx-1.15.7/contrib/vim/indent/nginx.vim (from vendor/nginx-1.15.6/contrib/vim/indent/nginx.vim) vendor/nginx-1.15.7/contrib/vim/syntax/nginx.vim (from vendor/nginx-1.15.6/contrib/vim/syntax/nginx.vim) vendor/nginx-1.15.7/docs/GNUmakefile (from vendor/nginx-1.15.6/docs/GNUmakefile) vendor/nginx-1.15.7/docs/dtd/change_log_conf.dtd (from vendor/nginx-1.15.6/docs/dtd/change_log_conf.dtd) vendor/nginx-1.15.7/docs/dtd/changes.dtd (from vendor/nginx-1.15.6/docs/dtd/changes.dtd) vendor/nginx-1.15.7/docs/html/50x.html (from vendor/nginx-1.15.6/docs/html/50x.html) vendor/nginx-1.15.7/docs/html/index.html (from vendor/nginx-1.15.6/docs/html/index.html) vendor/nginx-1.15.7/docs/man/nginx.8 (from vendor/nginx-1.15.6/docs/man/nginx.8) vendor/nginx-1.15.7/docs/text/LICENSE (from vendor/nginx-1.15.6/docs/text/LICENSE) vendor/nginx-1.15.7/docs/text/README (from vendor/nginx-1.15.6/docs/text/README) vendor/nginx-1.15.7/docs/xml/change_log_conf.xml (from vendor/nginx-1.15.6/docs/xml/change_log_conf.xml) vendor/nginx-1.15.7/docs/xml/nginx/changes.xml (from vendor/nginx-1.15.6/docs/xml/nginx/changes.xml) vendor/nginx-1.15.7/docs/xsls/changes.xsls (from vendor/nginx-1.15.6/docs/xsls/changes.xsls) vendor/nginx-1.15.7/docs/xslt/changes.xslt (from vendor/nginx-1.15.6/docs/xslt/changes.xslt) vendor/nginx-1.15.7/misc/GNUmakefile (from vendor/nginx-1.15.6/misc/GNUmakefile) vendor/nginx-1.15.7/misc/README (from vendor/nginx-1.15.6/misc/README) vendor/nginx-1.15.7/src/core/nginx.c (from vendor/nginx-1.15.6/src/core/nginx.c) vendor/nginx-1.15.7/src/core/nginx.h (from vendor/nginx-1.15.6/src/core/nginx.h) vendor/nginx-1.15.7/src/core/ngx_array.c (from vendor/nginx-1.15.6/src/core/ngx_array.c) vendor/nginx-1.15.7/src/core/ngx_array.h (from vendor/nginx-1.15.6/src/core/ngx_array.h) vendor/nginx-1.15.7/src/core/ngx_buf.c (from vendor/nginx-1.15.6/src/core/ngx_buf.c) vendor/nginx-1.15.7/src/core/ngx_buf.h (from vendor/nginx-1.15.6/src/core/ngx_buf.h) vendor/nginx-1.15.7/src/core/ngx_conf_file.c (from vendor/nginx-1.15.6/src/core/ngx_conf_file.c) vendor/nginx-1.15.7/src/core/ngx_conf_file.h (from vendor/nginx-1.15.6/src/core/ngx_conf_file.h) vendor/nginx-1.15.7/src/core/ngx_config.h (from vendor/nginx-1.15.6/src/core/ngx_config.h) vendor/nginx-1.15.7/src/core/ngx_connection.c (from vendor/nginx-1.15.6/src/core/ngx_connection.c) vendor/nginx-1.15.7/src/core/ngx_connection.h (from vendor/nginx-1.15.6/src/core/ngx_connection.h) vendor/nginx-1.15.7/src/core/ngx_core.h (from vendor/nginx-1.15.6/src/core/ngx_core.h) vendor/nginx-1.15.7/src/core/ngx_cpuinfo.c (from vendor/nginx-1.15.6/src/core/ngx_cpuinfo.c) vendor/nginx-1.15.7/src/core/ngx_crc.h (from vendor/nginx-1.15.6/src/core/ngx_crc.h) vendor/nginx-1.15.7/src/core/ngx_crc32.c (from vendor/nginx-1.15.6/src/core/ngx_crc32.c) vendor/nginx-1.15.7/src/core/ngx_crc32.h (from vendor/nginx-1.15.6/src/core/ngx_crc32.h) vendor/nginx-1.15.7/src/core/ngx_crypt.c (from vendor/nginx-1.15.6/src/core/ngx_crypt.c) vendor/nginx-1.15.7/src/core/ngx_crypt.h (from vendor/nginx-1.15.6/src/core/ngx_crypt.h) vendor/nginx-1.15.7/src/core/ngx_cycle.c (from vendor/nginx-1.15.6/src/core/ngx_cycle.c) vendor/nginx-1.15.7/src/core/ngx_cycle.h (from vendor/nginx-1.15.6/src/core/ngx_cycle.h) vendor/nginx-1.15.7/src/core/ngx_file.c (from vendor/nginx-1.15.6/src/core/ngx_file.c) vendor/nginx-1.15.7/src/core/ngx_file.h (from vendor/nginx-1.15.6/src/core/ngx_file.h) vendor/nginx-1.15.7/src/core/ngx_hash.c (from vendor/nginx-1.15.6/src/core/ngx_hash.c) vendor/nginx-1.15.7/src/core/ngx_hash.h (from vendor/nginx-1.15.6/src/core/ngx_hash.h) vendor/nginx-1.15.7/src/core/ngx_inet.c (from vendor/nginx-1.15.6/src/core/ngx_inet.c) vendor/nginx-1.15.7/src/core/ngx_inet.h (from vendor/nginx-1.15.6/src/core/ngx_inet.h) vendor/nginx-1.15.7/src/core/ngx_list.c (from vendor/nginx-1.15.6/src/core/ngx_list.c) vendor/nginx-1.15.7/src/core/ngx_list.h (from vendor/nginx-1.15.6/src/core/ngx_list.h) vendor/nginx-1.15.7/src/core/ngx_log.c (from vendor/nginx-1.15.6/src/core/ngx_log.c) vendor/nginx-1.15.7/src/core/ngx_log.h (from vendor/nginx-1.15.6/src/core/ngx_log.h) vendor/nginx-1.15.7/src/core/ngx_md5.c (from vendor/nginx-1.15.6/src/core/ngx_md5.c) vendor/nginx-1.15.7/src/core/ngx_md5.h (from vendor/nginx-1.15.6/src/core/ngx_md5.h) vendor/nginx-1.15.7/src/core/ngx_module.c (from vendor/nginx-1.15.6/src/core/ngx_module.c) vendor/nginx-1.15.7/src/core/ngx_module.h (from vendor/nginx-1.15.6/src/core/ngx_module.h) vendor/nginx-1.15.7/src/core/ngx_murmurhash.c (from vendor/nginx-1.15.6/src/core/ngx_murmurhash.c) vendor/nginx-1.15.7/src/core/ngx_murmurhash.h (from vendor/nginx-1.15.6/src/core/ngx_murmurhash.h) vendor/nginx-1.15.7/src/core/ngx_open_file_cache.c (from vendor/nginx-1.15.6/src/core/ngx_open_file_cache.c) vendor/nginx-1.15.7/src/core/ngx_open_file_cache.h (from vendor/nginx-1.15.6/src/core/ngx_open_file_cache.h) vendor/nginx-1.15.7/src/core/ngx_output_chain.c (from vendor/nginx-1.15.6/src/core/ngx_output_chain.c) vendor/nginx-1.15.7/src/core/ngx_palloc.c (from vendor/nginx-1.15.6/src/core/ngx_palloc.c) vendor/nginx-1.15.7/src/core/ngx_palloc.h (from vendor/nginx-1.15.6/src/core/ngx_palloc.h) vendor/nginx-1.15.7/src/core/ngx_parse.c (from vendor/nginx-1.15.6/src/core/ngx_parse.c) vendor/nginx-1.15.7/src/core/ngx_parse.h (from vendor/nginx-1.15.6/src/core/ngx_parse.h) vendor/nginx-1.15.7/src/core/ngx_parse_time.c (from vendor/nginx-1.15.6/src/core/ngx_parse_time.c) vendor/nginx-1.15.7/src/core/ngx_parse_time.h (from vendor/nginx-1.15.6/src/core/ngx_parse_time.h) vendor/nginx-1.15.7/src/core/ngx_proxy_protocol.c (from vendor/nginx-1.15.6/src/core/ngx_proxy_protocol.c) vendor/nginx-1.15.7/src/core/ngx_proxy_protocol.h (from vendor/nginx-1.15.6/src/core/ngx_proxy_protocol.h) vendor/nginx-1.15.7/src/core/ngx_queue.c (from vendor/nginx-1.15.6/src/core/ngx_queue.c) vendor/nginx-1.15.7/src/core/ngx_queue.h (from vendor/nginx-1.15.6/src/core/ngx_queue.h) vendor/nginx-1.15.7/src/core/ngx_radix_tree.c (from vendor/nginx-1.15.6/src/core/ngx_radix_tree.c) vendor/nginx-1.15.7/src/core/ngx_radix_tree.h (from vendor/nginx-1.15.6/src/core/ngx_radix_tree.h) vendor/nginx-1.15.7/src/core/ngx_rbtree.c (from vendor/nginx-1.15.6/src/core/ngx_rbtree.c) vendor/nginx-1.15.7/src/core/ngx_rbtree.h (from vendor/nginx-1.15.6/src/core/ngx_rbtree.h) vendor/nginx-1.15.7/src/core/ngx_regex.c (from vendor/nginx-1.15.6/src/core/ngx_regex.c) vendor/nginx-1.15.7/src/core/ngx_regex.h (from vendor/nginx-1.15.6/src/core/ngx_regex.h) vendor/nginx-1.15.7/src/core/ngx_resolver.c (from vendor/nginx-1.15.6/src/core/ngx_resolver.c) vendor/nginx-1.15.7/src/core/ngx_resolver.h (from vendor/nginx-1.15.6/src/core/ngx_resolver.h) vendor/nginx-1.15.7/src/core/ngx_rwlock.c (from vendor/nginx-1.15.6/src/core/ngx_rwlock.c) vendor/nginx-1.15.7/src/core/ngx_rwlock.h (from vendor/nginx-1.15.6/src/core/ngx_rwlock.h) vendor/nginx-1.15.7/src/core/ngx_sha1.c (from vendor/nginx-1.15.6/src/core/ngx_sha1.c) vendor/nginx-1.15.7/src/core/ngx_sha1.h (from vendor/nginx-1.15.6/src/core/ngx_sha1.h) vendor/nginx-1.15.7/src/core/ngx_shmtx.c (from vendor/nginx-1.15.6/src/core/ngx_shmtx.c) vendor/nginx-1.15.7/src/core/ngx_shmtx.h (from vendor/nginx-1.15.6/src/core/ngx_shmtx.h) vendor/nginx-1.15.7/src/core/ngx_slab.c (from vendor/nginx-1.15.6/src/core/ngx_slab.c) vendor/nginx-1.15.7/src/core/ngx_slab.h (from vendor/nginx-1.15.6/src/core/ngx_slab.h) vendor/nginx-1.15.7/src/core/ngx_spinlock.c (from vendor/nginx-1.15.6/src/core/ngx_spinlock.c) vendor/nginx-1.15.7/src/core/ngx_string.c (from vendor/nginx-1.15.6/src/core/ngx_string.c) vendor/nginx-1.15.7/src/core/ngx_string.h (from vendor/nginx-1.15.6/src/core/ngx_string.h) vendor/nginx-1.15.7/src/core/ngx_syslog.c (from vendor/nginx-1.15.6/src/core/ngx_syslog.c) vendor/nginx-1.15.7/src/core/ngx_syslog.h (from vendor/nginx-1.15.6/src/core/ngx_syslog.h) vendor/nginx-1.15.7/src/core/ngx_thread_pool.c (from vendor/nginx-1.15.6/src/core/ngx_thread_pool.c) vendor/nginx-1.15.7/src/core/ngx_thread_pool.h (from vendor/nginx-1.15.6/src/core/ngx_thread_pool.h) vendor/nginx-1.15.7/src/core/ngx_times.c (from vendor/nginx-1.15.6/src/core/ngx_times.c) vendor/nginx-1.15.7/src/core/ngx_times.h (from vendor/nginx-1.15.6/src/core/ngx_times.h) vendor/nginx-1.15.7/src/event/modules/ngx_devpoll_module.c (from vendor/nginx-1.15.6/src/event/modules/ngx_devpoll_module.c) vendor/nginx-1.15.7/src/event/modules/ngx_epoll_module.c (from vendor/nginx-1.15.6/src/event/modules/ngx_epoll_module.c) vendor/nginx-1.15.7/src/event/modules/ngx_eventport_module.c (from vendor/nginx-1.15.6/src/event/modules/ngx_eventport_module.c) vendor/nginx-1.15.7/src/event/modules/ngx_iocp_module.c (from vendor/nginx-1.15.6/src/event/modules/ngx_iocp_module.c) vendor/nginx-1.15.7/src/event/modules/ngx_iocp_module.h (from vendor/nginx-1.15.6/src/event/modules/ngx_iocp_module.h) vendor/nginx-1.15.7/src/event/modules/ngx_kqueue_module.c (from vendor/nginx-1.15.6/src/event/modules/ngx_kqueue_module.c) vendor/nginx-1.15.7/src/event/modules/ngx_poll_module.c (from vendor/nginx-1.15.6/src/event/modules/ngx_poll_module.c) vendor/nginx-1.15.7/src/event/modules/ngx_select_module.c (from vendor/nginx-1.15.6/src/event/modules/ngx_select_module.c) vendor/nginx-1.15.7/src/event/modules/ngx_win32_select_module.c (from vendor/nginx-1.15.6/src/event/modules/ngx_win32_select_module.c) vendor/nginx-1.15.7/src/event/ngx_event.c (from vendor/nginx-1.15.6/src/event/ngx_event.c) vendor/nginx-1.15.7/src/event/ngx_event.h (from vendor/nginx-1.15.6/src/event/ngx_event.h) vendor/nginx-1.15.7/src/event/ngx_event_accept.c (from vendor/nginx-1.15.6/src/event/ngx_event_accept.c) vendor/nginx-1.15.7/src/event/ngx_event_acceptex.c (from vendor/nginx-1.15.6/src/event/ngx_event_acceptex.c) vendor/nginx-1.15.7/src/event/ngx_event_connect.c (from vendor/nginx-1.15.6/src/event/ngx_event_connect.c) vendor/nginx-1.15.7/src/event/ngx_event_connect.h (from vendor/nginx-1.15.6/src/event/ngx_event_connect.h) vendor/nginx-1.15.7/src/event/ngx_event_connectex.c (from vendor/nginx-1.15.6/src/event/ngx_event_connectex.c) vendor/nginx-1.15.7/src/event/ngx_event_openssl.c (from vendor/nginx-1.15.6/src/event/ngx_event_openssl.c) vendor/nginx-1.15.7/src/event/ngx_event_openssl.h (from vendor/nginx-1.15.6/src/event/ngx_event_openssl.h) vendor/nginx-1.15.7/src/event/ngx_event_openssl_stapling.c (from vendor/nginx-1.15.6/src/event/ngx_event_openssl_stapling.c) vendor/nginx-1.15.7/src/event/ngx_event_pipe.c (from vendor/nginx-1.15.6/src/event/ngx_event_pipe.c) vendor/nginx-1.15.7/src/event/ngx_event_pipe.h (from vendor/nginx-1.15.6/src/event/ngx_event_pipe.h) vendor/nginx-1.15.7/src/event/ngx_event_posted.c (from vendor/nginx-1.15.6/src/event/ngx_event_posted.c) vendor/nginx-1.15.7/src/event/ngx_event_posted.h (from vendor/nginx-1.15.6/src/event/ngx_event_posted.h) vendor/nginx-1.15.7/src/event/ngx_event_timer.c (from vendor/nginx-1.15.6/src/event/ngx_event_timer.c) vendor/nginx-1.15.7/src/event/ngx_event_timer.h (from vendor/nginx-1.15.6/src/event/ngx_event_timer.h) vendor/nginx-1.15.7/src/event/ngx_event_udp.c (from vendor/nginx-1.15.6/src/event/ngx_event_udp.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_access_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_access_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_addition_filter_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_addition_filter_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_auth_basic_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_auth_basic_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_auth_request_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_auth_request_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_autoindex_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_autoindex_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_browser_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_browser_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_charset_filter_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_charset_filter_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_chunked_filter_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_chunked_filter_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_dav_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_dav_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_degradation_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_degradation_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_empty_gif_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_empty_gif_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_fastcgi_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_fastcgi_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_flv_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_flv_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_geo_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_geo_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_geoip_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_geoip_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_grpc_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_grpc_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_gunzip_filter_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_gunzip_filter_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_gzip_filter_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_gzip_filter_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_gzip_static_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_gzip_static_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_headers_filter_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_headers_filter_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_image_filter_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_image_filter_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_index_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_index_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_limit_conn_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_limit_conn_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_limit_req_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_limit_req_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_log_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_log_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_map_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_map_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_memcached_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_memcached_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_mirror_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_mirror_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_mp4_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_mp4_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_not_modified_filter_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_not_modified_filter_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_proxy_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_proxy_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_random_index_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_random_index_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_range_filter_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_range_filter_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_realip_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_realip_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_referer_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_referer_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_rewrite_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_rewrite_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_scgi_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_scgi_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_secure_link_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_secure_link_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_slice_filter_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_slice_filter_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_split_clients_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_split_clients_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_ssi_filter_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_ssi_filter_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_ssi_filter_module.h (from vendor/nginx-1.15.6/src/http/modules/ngx_http_ssi_filter_module.h) vendor/nginx-1.15.7/src/http/modules/ngx_http_ssl_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_ssl_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_ssl_module.h (from vendor/nginx-1.15.6/src/http/modules/ngx_http_ssl_module.h) vendor/nginx-1.15.7/src/http/modules/ngx_http_static_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_static_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_stub_status_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_stub_status_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_sub_filter_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_sub_filter_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_try_files_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_try_files_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_upstream_hash_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_upstream_hash_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_upstream_ip_hash_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_upstream_ip_hash_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_upstream_keepalive_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_upstream_keepalive_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_upstream_least_conn_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_upstream_least_conn_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_upstream_random_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_upstream_random_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_upstream_zone_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_upstream_zone_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_userid_filter_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_userid_filter_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_uwsgi_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_uwsgi_module.c) vendor/nginx-1.15.7/src/http/modules/ngx_http_xslt_filter_module.c (from vendor/nginx-1.15.6/src/http/modules/ngx_http_xslt_filter_module.c) vendor/nginx-1.15.7/src/http/modules/perl/Makefile.PL (from vendor/nginx-1.15.6/src/http/modules/perl/Makefile.PL) vendor/nginx-1.15.7/src/http/modules/perl/nginx.pm (from vendor/nginx-1.15.6/src/http/modules/perl/nginx.pm) vendor/nginx-1.15.7/src/http/modules/perl/nginx.xs (from vendor/nginx-1.15.6/src/http/modules/perl/nginx.xs) vendor/nginx-1.15.7/src/http/modules/perl/ngx_http_perl_module.c (from vendor/nginx-1.15.6/src/http/modules/perl/ngx_http_perl_module.c) vendor/nginx-1.15.7/src/http/modules/perl/ngx_http_perl_module.h (from vendor/nginx-1.15.6/src/http/modules/perl/ngx_http_perl_module.h) vendor/nginx-1.15.7/src/http/modules/perl/typemap (from vendor/nginx-1.15.6/src/http/modules/perl/typemap) vendor/nginx-1.15.7/src/http/ngx_http.c (from vendor/nginx-1.15.6/src/http/ngx_http.c) vendor/nginx-1.15.7/src/http/ngx_http.h (from vendor/nginx-1.15.6/src/http/ngx_http.h) vendor/nginx-1.15.7/src/http/ngx_http_cache.h (from vendor/nginx-1.15.6/src/http/ngx_http_cache.h) vendor/nginx-1.15.7/src/http/ngx_http_config.h (from vendor/nginx-1.15.6/src/http/ngx_http_config.h) vendor/nginx-1.15.7/src/http/ngx_http_copy_filter_module.c (from vendor/nginx-1.15.6/src/http/ngx_http_copy_filter_module.c) vendor/nginx-1.15.7/src/http/ngx_http_core_module.c (from vendor/nginx-1.15.6/src/http/ngx_http_core_module.c) vendor/nginx-1.15.7/src/http/ngx_http_core_module.h (from vendor/nginx-1.15.6/src/http/ngx_http_core_module.h) vendor/nginx-1.15.7/src/http/ngx_http_file_cache.c (from vendor/nginx-1.15.6/src/http/ngx_http_file_cache.c) vendor/nginx-1.15.7/src/http/ngx_http_header_filter_module.c (from vendor/nginx-1.15.6/src/http/ngx_http_header_filter_module.c) vendor/nginx-1.15.7/src/http/ngx_http_parse.c (from vendor/nginx-1.15.6/src/http/ngx_http_parse.c) vendor/nginx-1.15.7/src/http/ngx_http_postpone_filter_module.c (from vendor/nginx-1.15.6/src/http/ngx_http_postpone_filter_module.c) vendor/nginx-1.15.7/src/http/ngx_http_request.c (from vendor/nginx-1.15.6/src/http/ngx_http_request.c) vendor/nginx-1.15.7/src/http/ngx_http_request.h (from vendor/nginx-1.15.6/src/http/ngx_http_request.h) vendor/nginx-1.15.7/src/http/ngx_http_request_body.c (from vendor/nginx-1.15.6/src/http/ngx_http_request_body.c) vendor/nginx-1.15.7/src/http/ngx_http_script.c (from vendor/nginx-1.15.6/src/http/ngx_http_script.c) vendor/nginx-1.15.7/src/http/ngx_http_script.h (from vendor/nginx-1.15.6/src/http/ngx_http_script.h) vendor/nginx-1.15.7/src/http/ngx_http_special_response.c (from vendor/nginx-1.15.6/src/http/ngx_http_special_response.c) vendor/nginx-1.15.7/src/http/ngx_http_upstream.c (from vendor/nginx-1.15.6/src/http/ngx_http_upstream.c) vendor/nginx-1.15.7/src/http/ngx_http_upstream.h (from vendor/nginx-1.15.6/src/http/ngx_http_upstream.h) vendor/nginx-1.15.7/src/http/ngx_http_upstream_round_robin.c (from vendor/nginx-1.15.6/src/http/ngx_http_upstream_round_robin.c) vendor/nginx-1.15.7/src/http/ngx_http_upstream_round_robin.h (from vendor/nginx-1.15.6/src/http/ngx_http_upstream_round_robin.h) vendor/nginx-1.15.7/src/http/ngx_http_variables.c (from vendor/nginx-1.15.6/src/http/ngx_http_variables.c) vendor/nginx-1.15.7/src/http/ngx_http_variables.h (from vendor/nginx-1.15.6/src/http/ngx_http_variables.h) vendor/nginx-1.15.7/src/http/ngx_http_write_filter_module.c (from vendor/nginx-1.15.6/src/http/ngx_http_write_filter_module.c) vendor/nginx-1.15.7/src/http/v2/ngx_http_v2.c (from vendor/nginx-1.15.6/src/http/v2/ngx_http_v2.c) vendor/nginx-1.15.7/src/http/v2/ngx_http_v2.h (from vendor/nginx-1.15.6/src/http/v2/ngx_http_v2.h) vendor/nginx-1.15.7/src/http/v2/ngx_http_v2_encode.c (from vendor/nginx-1.15.6/src/http/v2/ngx_http_v2_encode.c) vendor/nginx-1.15.7/src/http/v2/ngx_http_v2_filter_module.c (from vendor/nginx-1.15.6/src/http/v2/ngx_http_v2_filter_module.c) vendor/nginx-1.15.7/src/http/v2/ngx_http_v2_huff_decode.c (from vendor/nginx-1.15.6/src/http/v2/ngx_http_v2_huff_decode.c) vendor/nginx-1.15.7/src/http/v2/ngx_http_v2_huff_encode.c (from vendor/nginx-1.15.6/src/http/v2/ngx_http_v2_huff_encode.c) vendor/nginx-1.15.7/src/http/v2/ngx_http_v2_module.c (from vendor/nginx-1.15.6/src/http/v2/ngx_http_v2_module.c) vendor/nginx-1.15.7/src/http/v2/ngx_http_v2_module.h (from vendor/nginx-1.15.6/src/http/v2/ngx_http_v2_module.h) vendor/nginx-1.15.7/src/http/v2/ngx_http_v2_table.c (from vendor/nginx-1.15.6/src/http/v2/ngx_http_v2_table.c) vendor/nginx-1.15.7/src/mail/ngx_mail.c (from vendor/nginx-1.15.6/src/mail/ngx_mail.c) vendor/nginx-1.15.7/src/mail/ngx_mail.h (from vendor/nginx-1.15.6/src/mail/ngx_mail.h) vendor/nginx-1.15.7/src/mail/ngx_mail_auth_http_module.c (from vendor/nginx-1.15.6/src/mail/ngx_mail_auth_http_module.c) vendor/nginx-1.15.7/src/mail/ngx_mail_core_module.c (from vendor/nginx-1.15.6/src/mail/ngx_mail_core_module.c) vendor/nginx-1.15.7/src/mail/ngx_mail_handler.c (from vendor/nginx-1.15.6/src/mail/ngx_mail_handler.c) vendor/nginx-1.15.7/src/mail/ngx_mail_imap_handler.c (from vendor/nginx-1.15.6/src/mail/ngx_mail_imap_handler.c) vendor/nginx-1.15.7/src/mail/ngx_mail_imap_module.c (from vendor/nginx-1.15.6/src/mail/ngx_mail_imap_module.c) vendor/nginx-1.15.7/src/mail/ngx_mail_imap_module.h (from vendor/nginx-1.15.6/src/mail/ngx_mail_imap_module.h) vendor/nginx-1.15.7/src/mail/ngx_mail_parse.c (from vendor/nginx-1.15.6/src/mail/ngx_mail_parse.c) vendor/nginx-1.15.7/src/mail/ngx_mail_pop3_handler.c (from vendor/nginx-1.15.6/src/mail/ngx_mail_pop3_handler.c) vendor/nginx-1.15.7/src/mail/ngx_mail_pop3_module.c (from vendor/nginx-1.15.6/src/mail/ngx_mail_pop3_module.c) vendor/nginx-1.15.7/src/mail/ngx_mail_pop3_module.h (from vendor/nginx-1.15.6/src/mail/ngx_mail_pop3_module.h) vendor/nginx-1.15.7/src/mail/ngx_mail_proxy_module.c (from vendor/nginx-1.15.6/src/mail/ngx_mail_proxy_module.c) vendor/nginx-1.15.7/src/mail/ngx_mail_smtp_handler.c (from vendor/nginx-1.15.6/src/mail/ngx_mail_smtp_handler.c) vendor/nginx-1.15.7/src/mail/ngx_mail_smtp_module.c (from vendor/nginx-1.15.6/src/mail/ngx_mail_smtp_module.c) vendor/nginx-1.15.7/src/mail/ngx_mail_smtp_module.h (from vendor/nginx-1.15.6/src/mail/ngx_mail_smtp_module.h) vendor/nginx-1.15.7/src/mail/ngx_mail_ssl_module.c (from vendor/nginx-1.15.6/src/mail/ngx_mail_ssl_module.c) vendor/nginx-1.15.7/src/mail/ngx_mail_ssl_module.h (from vendor/nginx-1.15.6/src/mail/ngx_mail_ssl_module.h) vendor/nginx-1.15.7/src/misc/ngx_cpp_test_module.cpp (from vendor/nginx-1.15.6/src/misc/ngx_cpp_test_module.cpp) vendor/nginx-1.15.7/src/misc/ngx_google_perftools_module.c (from vendor/nginx-1.15.6/src/misc/ngx_google_perftools_module.c) vendor/nginx-1.15.7/src/os/unix/ngx_alloc.c (from vendor/nginx-1.15.6/src/os/unix/ngx_alloc.c) vendor/nginx-1.15.7/src/os/unix/ngx_alloc.h (from vendor/nginx-1.15.6/src/os/unix/ngx_alloc.h) vendor/nginx-1.15.7/src/os/unix/ngx_atomic.h (from vendor/nginx-1.15.6/src/os/unix/ngx_atomic.h) vendor/nginx-1.15.7/src/os/unix/ngx_channel.c (from vendor/nginx-1.15.6/src/os/unix/ngx_channel.c) vendor/nginx-1.15.7/src/os/unix/ngx_channel.h (from vendor/nginx-1.15.6/src/os/unix/ngx_channel.h) vendor/nginx-1.15.7/src/os/unix/ngx_daemon.c (from vendor/nginx-1.15.6/src/os/unix/ngx_daemon.c) vendor/nginx-1.15.7/src/os/unix/ngx_darwin.h (from vendor/nginx-1.15.6/src/os/unix/ngx_darwin.h) vendor/nginx-1.15.7/src/os/unix/ngx_darwin_config.h (from vendor/nginx-1.15.6/src/os/unix/ngx_darwin_config.h) vendor/nginx-1.15.7/src/os/unix/ngx_darwin_init.c (from vendor/nginx-1.15.6/src/os/unix/ngx_darwin_init.c) vendor/nginx-1.15.7/src/os/unix/ngx_darwin_sendfile_chain.c (from vendor/nginx-1.15.6/src/os/unix/ngx_darwin_sendfile_chain.c) vendor/nginx-1.15.7/src/os/unix/ngx_dlopen.c (from vendor/nginx-1.15.6/src/os/unix/ngx_dlopen.c) vendor/nginx-1.15.7/src/os/unix/ngx_dlopen.h (from vendor/nginx-1.15.6/src/os/unix/ngx_dlopen.h) vendor/nginx-1.15.7/src/os/unix/ngx_errno.c (from vendor/nginx-1.15.6/src/os/unix/ngx_errno.c) vendor/nginx-1.15.7/src/os/unix/ngx_errno.h (from vendor/nginx-1.15.6/src/os/unix/ngx_errno.h) vendor/nginx-1.15.7/src/os/unix/ngx_file_aio_read.c (from vendor/nginx-1.15.6/src/os/unix/ngx_file_aio_read.c) vendor/nginx-1.15.7/src/os/unix/ngx_files.c (from vendor/nginx-1.15.6/src/os/unix/ngx_files.c) vendor/nginx-1.15.7/src/os/unix/ngx_files.h (from vendor/nginx-1.15.6/src/os/unix/ngx_files.h) vendor/nginx-1.15.7/src/os/unix/ngx_freebsd.h (from vendor/nginx-1.15.6/src/os/unix/ngx_freebsd.h) vendor/nginx-1.15.7/src/os/unix/ngx_freebsd_config.h (from vendor/nginx-1.15.6/src/os/unix/ngx_freebsd_config.h) vendor/nginx-1.15.7/src/os/unix/ngx_freebsd_init.c (from vendor/nginx-1.15.6/src/os/unix/ngx_freebsd_init.c) vendor/nginx-1.15.7/src/os/unix/ngx_freebsd_sendfile_chain.c (from vendor/nginx-1.15.6/src/os/unix/ngx_freebsd_sendfile_chain.c) vendor/nginx-1.15.7/src/os/unix/ngx_gcc_atomic_amd64.h (from vendor/nginx-1.15.6/src/os/unix/ngx_gcc_atomic_amd64.h) vendor/nginx-1.15.7/src/os/unix/ngx_gcc_atomic_ppc.h (from vendor/nginx-1.15.6/src/os/unix/ngx_gcc_atomic_ppc.h) vendor/nginx-1.15.7/src/os/unix/ngx_gcc_atomic_sparc64.h (from vendor/nginx-1.15.6/src/os/unix/ngx_gcc_atomic_sparc64.h) vendor/nginx-1.15.7/src/os/unix/ngx_gcc_atomic_x86.h (from vendor/nginx-1.15.6/src/os/unix/ngx_gcc_atomic_x86.h) vendor/nginx-1.15.7/src/os/unix/ngx_linux.h (from vendor/nginx-1.15.6/src/os/unix/ngx_linux.h) vendor/nginx-1.15.7/src/os/unix/ngx_linux_aio_read.c (from vendor/nginx-1.15.6/src/os/unix/ngx_linux_aio_read.c) vendor/nginx-1.15.7/src/os/unix/ngx_linux_config.h (from vendor/nginx-1.15.6/src/os/unix/ngx_linux_config.h) vendor/nginx-1.15.7/src/os/unix/ngx_linux_init.c (from vendor/nginx-1.15.6/src/os/unix/ngx_linux_init.c) vendor/nginx-1.15.7/src/os/unix/ngx_linux_sendfile_chain.c (from vendor/nginx-1.15.6/src/os/unix/ngx_linux_sendfile_chain.c) vendor/nginx-1.15.7/src/os/unix/ngx_os.h (from vendor/nginx-1.15.6/src/os/unix/ngx_os.h) vendor/nginx-1.15.7/src/os/unix/ngx_posix_config.h (from vendor/nginx-1.15.6/src/os/unix/ngx_posix_config.h) vendor/nginx-1.15.7/src/os/unix/ngx_posix_init.c (from vendor/nginx-1.15.6/src/os/unix/ngx_posix_init.c) vendor/nginx-1.15.7/src/os/unix/ngx_process.c (from vendor/nginx-1.15.6/src/os/unix/ngx_process.c) vendor/nginx-1.15.7/src/os/unix/ngx_process.h (from vendor/nginx-1.15.6/src/os/unix/ngx_process.h) vendor/nginx-1.15.7/src/os/unix/ngx_process_cycle.c (from vendor/nginx-1.15.6/src/os/unix/ngx_process_cycle.c) vendor/nginx-1.15.7/src/os/unix/ngx_process_cycle.h (from vendor/nginx-1.15.6/src/os/unix/ngx_process_cycle.h) vendor/nginx-1.15.7/src/os/unix/ngx_readv_chain.c (from vendor/nginx-1.15.6/src/os/unix/ngx_readv_chain.c) vendor/nginx-1.15.7/src/os/unix/ngx_recv.c (from vendor/nginx-1.15.6/src/os/unix/ngx_recv.c) vendor/nginx-1.15.7/src/os/unix/ngx_send.c (from vendor/nginx-1.15.6/src/os/unix/ngx_send.c) vendor/nginx-1.15.7/src/os/unix/ngx_setaffinity.c (from vendor/nginx-1.15.6/src/os/unix/ngx_setaffinity.c) vendor/nginx-1.15.7/src/os/unix/ngx_setaffinity.h (from vendor/nginx-1.15.6/src/os/unix/ngx_setaffinity.h) vendor/nginx-1.15.7/src/os/unix/ngx_setproctitle.c (from vendor/nginx-1.15.6/src/os/unix/ngx_setproctitle.c) vendor/nginx-1.15.7/src/os/unix/ngx_setproctitle.h (from vendor/nginx-1.15.6/src/os/unix/ngx_setproctitle.h) vendor/nginx-1.15.7/src/os/unix/ngx_shmem.c (from vendor/nginx-1.15.6/src/os/unix/ngx_shmem.c) vendor/nginx-1.15.7/src/os/unix/ngx_shmem.h (from vendor/nginx-1.15.6/src/os/unix/ngx_shmem.h) vendor/nginx-1.15.7/src/os/unix/ngx_socket.c (from vendor/nginx-1.15.6/src/os/unix/ngx_socket.c) vendor/nginx-1.15.7/src/os/unix/ngx_socket.h (from vendor/nginx-1.15.6/src/os/unix/ngx_socket.h) vendor/nginx-1.15.7/src/os/unix/ngx_solaris.h (from vendor/nginx-1.15.6/src/os/unix/ngx_solaris.h) vendor/nginx-1.15.7/src/os/unix/ngx_solaris_config.h (from vendor/nginx-1.15.6/src/os/unix/ngx_solaris_config.h) vendor/nginx-1.15.7/src/os/unix/ngx_solaris_init.c (from vendor/nginx-1.15.6/src/os/unix/ngx_solaris_init.c) vendor/nginx-1.15.7/src/os/unix/ngx_solaris_sendfilev_chain.c (from vendor/nginx-1.15.6/src/os/unix/ngx_solaris_sendfilev_chain.c) vendor/nginx-1.15.7/src/os/unix/ngx_sunpro_amd64.il (from vendor/nginx-1.15.6/src/os/unix/ngx_sunpro_amd64.il) vendor/nginx-1.15.7/src/os/unix/ngx_sunpro_atomic_sparc64.h (from vendor/nginx-1.15.6/src/os/unix/ngx_sunpro_atomic_sparc64.h) vendor/nginx-1.15.7/src/os/unix/ngx_sunpro_sparc64.il (from vendor/nginx-1.15.6/src/os/unix/ngx_sunpro_sparc64.il) vendor/nginx-1.15.7/src/os/unix/ngx_sunpro_x86.il (from vendor/nginx-1.15.6/src/os/unix/ngx_sunpro_x86.il) vendor/nginx-1.15.7/src/os/unix/ngx_thread.h (from vendor/nginx-1.15.6/src/os/unix/ngx_thread.h) vendor/nginx-1.15.7/src/os/unix/ngx_thread_cond.c (from vendor/nginx-1.15.6/src/os/unix/ngx_thread_cond.c) vendor/nginx-1.15.7/src/os/unix/ngx_thread_id.c (from vendor/nginx-1.15.6/src/os/unix/ngx_thread_id.c) vendor/nginx-1.15.7/src/os/unix/ngx_thread_mutex.c (from vendor/nginx-1.15.6/src/os/unix/ngx_thread_mutex.c) vendor/nginx-1.15.7/src/os/unix/ngx_time.c (from vendor/nginx-1.15.6/src/os/unix/ngx_time.c) vendor/nginx-1.15.7/src/os/unix/ngx_time.h (from vendor/nginx-1.15.6/src/os/unix/ngx_time.h) vendor/nginx-1.15.7/src/os/unix/ngx_udp_recv.c (from vendor/nginx-1.15.6/src/os/unix/ngx_udp_recv.c) vendor/nginx-1.15.7/src/os/unix/ngx_udp_send.c (from vendor/nginx-1.15.6/src/os/unix/ngx_udp_send.c) vendor/nginx-1.15.7/src/os/unix/ngx_udp_sendmsg_chain.c (from vendor/nginx-1.15.6/src/os/unix/ngx_udp_sendmsg_chain.c) vendor/nginx-1.15.7/src/os/unix/ngx_user.c (from vendor/nginx-1.15.6/src/os/unix/ngx_user.c) vendor/nginx-1.15.7/src/os/unix/ngx_user.h (from vendor/nginx-1.15.6/src/os/unix/ngx_user.h) vendor/nginx-1.15.7/src/os/unix/ngx_writev_chain.c (from vendor/nginx-1.15.6/src/os/unix/ngx_writev_chain.c) vendor/nginx-1.15.7/src/os/win32/nginx.ico (from vendor/nginx-1.15.6/src/os/win32/nginx.ico) vendor/nginx-1.15.7/src/os/win32/nginx.rc (from vendor/nginx-1.15.6/src/os/win32/nginx.rc) vendor/nginx-1.15.7/src/os/win32/nginx_icon16.xpm (from vendor/nginx-1.15.6/src/os/win32/nginx_icon16.xpm) vendor/nginx-1.15.7/src/os/win32/nginx_icon32.xpm (from vendor/nginx-1.15.6/src/os/win32/nginx_icon32.xpm) vendor/nginx-1.15.7/src/os/win32/nginx_icon48.xpm (from vendor/nginx-1.15.6/src/os/win32/nginx_icon48.xpm) vendor/nginx-1.15.7/src/os/win32/ngx_alloc.c (from vendor/nginx-1.15.6/src/os/win32/ngx_alloc.c) vendor/nginx-1.15.7/src/os/win32/ngx_alloc.h (from vendor/nginx-1.15.6/src/os/win32/ngx_alloc.h) vendor/nginx-1.15.7/src/os/win32/ngx_atomic.h (from vendor/nginx-1.15.6/src/os/win32/ngx_atomic.h) vendor/nginx-1.15.7/src/os/win32/ngx_dlopen.c (from vendor/nginx-1.15.6/src/os/win32/ngx_dlopen.c) vendor/nginx-1.15.7/src/os/win32/ngx_dlopen.h (from vendor/nginx-1.15.6/src/os/win32/ngx_dlopen.h) vendor/nginx-1.15.7/src/os/win32/ngx_errno.c (from vendor/nginx-1.15.6/src/os/win32/ngx_errno.c) vendor/nginx-1.15.7/src/os/win32/ngx_errno.h (from vendor/nginx-1.15.6/src/os/win32/ngx_errno.h) vendor/nginx-1.15.7/src/os/win32/ngx_event_log.c (from vendor/nginx-1.15.6/src/os/win32/ngx_event_log.c) vendor/nginx-1.15.7/src/os/win32/ngx_files.c (from vendor/nginx-1.15.6/src/os/win32/ngx_files.c) vendor/nginx-1.15.7/src/os/win32/ngx_files.h (from vendor/nginx-1.15.6/src/os/win32/ngx_files.h) vendor/nginx-1.15.7/src/os/win32/ngx_os.h (from vendor/nginx-1.15.6/src/os/win32/ngx_os.h) vendor/nginx-1.15.7/src/os/win32/ngx_process.c (from vendor/nginx-1.15.6/src/os/win32/ngx_process.c) vendor/nginx-1.15.7/src/os/win32/ngx_process.h (from vendor/nginx-1.15.6/src/os/win32/ngx_process.h) vendor/nginx-1.15.7/src/os/win32/ngx_process_cycle.c (from vendor/nginx-1.15.6/src/os/win32/ngx_process_cycle.c) vendor/nginx-1.15.7/src/os/win32/ngx_process_cycle.h (from vendor/nginx-1.15.6/src/os/win32/ngx_process_cycle.h) vendor/nginx-1.15.7/src/os/win32/ngx_service.c (from vendor/nginx-1.15.6/src/os/win32/ngx_service.c) vendor/nginx-1.15.7/src/os/win32/ngx_shmem.c (from vendor/nginx-1.15.6/src/os/win32/ngx_shmem.c) vendor/nginx-1.15.7/src/os/win32/ngx_shmem.h (from vendor/nginx-1.15.6/src/os/win32/ngx_shmem.h) vendor/nginx-1.15.7/src/os/win32/ngx_socket.c (from vendor/nginx-1.15.6/src/os/win32/ngx_socket.c) vendor/nginx-1.15.7/src/os/win32/ngx_socket.h (from vendor/nginx-1.15.6/src/os/win32/ngx_socket.h) vendor/nginx-1.15.7/src/os/win32/ngx_stat.c (from vendor/nginx-1.15.6/src/os/win32/ngx_stat.c) vendor/nginx-1.15.7/src/os/win32/ngx_thread.c (from vendor/nginx-1.15.6/src/os/win32/ngx_thread.c) vendor/nginx-1.15.7/src/os/win32/ngx_thread.h (from vendor/nginx-1.15.6/src/os/win32/ngx_thread.h) vendor/nginx-1.15.7/src/os/win32/ngx_time.c (from vendor/nginx-1.15.6/src/os/win32/ngx_time.c) vendor/nginx-1.15.7/src/os/win32/ngx_time.h (from vendor/nginx-1.15.6/src/os/win32/ngx_time.h) vendor/nginx-1.15.7/src/os/win32/ngx_udp_wsarecv.c (from vendor/nginx-1.15.6/src/os/win32/ngx_udp_wsarecv.c) vendor/nginx-1.15.7/src/os/win32/ngx_user.c (from vendor/nginx-1.15.6/src/os/win32/ngx_user.c) vendor/nginx-1.15.7/src/os/win32/ngx_user.h (from vendor/nginx-1.15.6/src/os/win32/ngx_user.h) vendor/nginx-1.15.7/src/os/win32/ngx_win32_config.h (from vendor/nginx-1.15.6/src/os/win32/ngx_win32_config.h) vendor/nginx-1.15.7/src/os/win32/ngx_win32_init.c (from vendor/nginx-1.15.6/src/os/win32/ngx_win32_init.c) vendor/nginx-1.15.7/src/os/win32/ngx_wsarecv.c (from vendor/nginx-1.15.6/src/os/win32/ngx_wsarecv.c) vendor/nginx-1.15.7/src/os/win32/ngx_wsarecv_chain.c (from vendor/nginx-1.15.6/src/os/win32/ngx_wsarecv_chain.c) vendor/nginx-1.15.7/src/os/win32/ngx_wsasend.c (from vendor/nginx-1.15.6/src/os/win32/ngx_wsasend.c) vendor/nginx-1.15.7/src/os/win32/ngx_wsasend_chain.c (from vendor/nginx-1.15.6/src/os/win32/ngx_wsasend_chain.c) vendor/nginx-1.15.7/src/stream/ngx_stream.c (from vendor/nginx-1.15.6/src/stream/ngx_stream.c) vendor/nginx-1.15.7/src/stream/ngx_stream.h (from vendor/nginx-1.15.6/src/stream/ngx_stream.h) vendor/nginx-1.15.7/src/stream/ngx_stream_access_module.c (from vendor/nginx-1.15.6/src/stream/ngx_stream_access_module.c) vendor/nginx-1.15.7/src/stream/ngx_stream_core_module.c (from vendor/nginx-1.15.6/src/stream/ngx_stream_core_module.c) vendor/nginx-1.15.7/src/stream/ngx_stream_geo_module.c (from vendor/nginx-1.15.6/src/stream/ngx_stream_geo_module.c) vendor/nginx-1.15.7/src/stream/ngx_stream_geoip_module.c (from vendor/nginx-1.15.6/src/stream/ngx_stream_geoip_module.c) vendor/nginx-1.15.7/src/stream/ngx_stream_handler.c (from vendor/nginx-1.15.6/src/stream/ngx_stream_handler.c) vendor/nginx-1.15.7/src/stream/ngx_stream_limit_conn_module.c (from vendor/nginx-1.15.6/src/stream/ngx_stream_limit_conn_module.c) vendor/nginx-1.15.7/src/stream/ngx_stream_log_module.c (from vendor/nginx-1.15.6/src/stream/ngx_stream_log_module.c) vendor/nginx-1.15.7/src/stream/ngx_stream_map_module.c (from vendor/nginx-1.15.6/src/stream/ngx_stream_map_module.c) vendor/nginx-1.15.7/src/stream/ngx_stream_proxy_module.c (from vendor/nginx-1.15.6/src/stream/ngx_stream_proxy_module.c) vendor/nginx-1.15.7/src/stream/ngx_stream_realip_module.c (from vendor/nginx-1.15.6/src/stream/ngx_stream_realip_module.c) vendor/nginx-1.15.7/src/stream/ngx_stream_return_module.c (from vendor/nginx-1.15.6/src/stream/ngx_stream_return_module.c) vendor/nginx-1.15.7/src/stream/ngx_stream_script.c (from vendor/nginx-1.15.6/src/stream/ngx_stream_script.c) vendor/nginx-1.15.7/src/stream/ngx_stream_script.h (from vendor/nginx-1.15.6/src/stream/ngx_stream_script.h) vendor/nginx-1.15.7/src/stream/ngx_stream_split_clients_module.c (from vendor/nginx-1.15.6/src/stream/ngx_stream_split_clients_module.c) vendor/nginx-1.15.7/src/stream/ngx_stream_ssl_module.c (from vendor/nginx-1.15.6/src/stream/ngx_stream_ssl_module.c) vendor/nginx-1.15.7/src/stream/ngx_stream_ssl_module.h (from vendor/nginx-1.15.6/src/stream/ngx_stream_ssl_module.h) vendor/nginx-1.15.7/src/stream/ngx_stream_ssl_preread_module.c (from vendor/nginx-1.15.6/src/stream/ngx_stream_ssl_preread_module.c) vendor/nginx-1.15.7/src/stream/ngx_stream_upstream.c (from vendor/nginx-1.15.6/src/stream/ngx_stream_upstream.c) vendor/nginx-1.15.7/src/stream/ngx_stream_upstream.h (from vendor/nginx-1.15.6/src/stream/ngx_stream_upstream.h) vendor/nginx-1.15.7/src/stream/ngx_stream_upstream_hash_module.c (from vendor/nginx-1.15.6/src/stream/ngx_stream_upstream_hash_module.c) vendor/nginx-1.15.7/src/stream/ngx_stream_upstream_least_conn_module.c (from vendor/nginx-1.15.6/src/stream/ngx_stream_upstream_least_conn_module.c) vendor/nginx-1.15.7/src/stream/ngx_stream_upstream_random_module.c (from vendor/nginx-1.15.6/src/stream/ngx_stream_upstream_random_module.c) vendor/nginx-1.15.7/src/stream/ngx_stream_upstream_round_robin.c (from vendor/nginx-1.15.6/src/stream/ngx_stream_upstream_round_robin.c) vendor/nginx-1.15.7/src/stream/ngx_stream_upstream_round_robin.h (from vendor/nginx-1.15.6/src/stream/ngx_stream_upstream_round_robin.h) vendor/nginx-1.15.7/src/stream/ngx_stream_upstream_zone_module.c (from vendor/nginx-1.15.6/src/stream/ngx_stream_upstream_zone_module.c) vendor/nginx-1.15.7/src/stream/ngx_stream_variables.c (from vendor/nginx-1.15.6/src/stream/ngx_stream_variables.c) vendor/nginx-1.15.7/src/stream/ngx_stream_variables.h (from vendor/nginx-1.15.6/src/stream/ngx_stream_variables.h) vendor/nginx-1.15.7/src/stream/ngx_stream_write_filter_module.c (from vendor/nginx-1.15.6/src/stream/ngx_stream_write_filter_module.c) Modified: nginx_version (+1 -1) =================================================================== --- nginx_version 2018-11-27 16:11:17 +0900 (04cc99945) +++ nginx_version 2018-11-28 08:32:06 +0900 (545fd574d) @@ -1 +1 @@ -1.15.6 +1.15.7 Renamed: vendor/nginx-1.15.7/auto/cc/acc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/cc/bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/cc/ccc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/cc/clang (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/cc/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/cc/gcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/cc/icc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/cc/msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/cc/name (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/cc/owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/cc/sunc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/configure (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/define (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/endianness (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/feature (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/have (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/have_headers (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/headers (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/include (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/init (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/install (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/lib/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/lib/geoip/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/lib/google-perftools/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/lib/libatomic/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/lib/libatomic/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/lib/libgd/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/lib/libxslt/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/lib/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/lib/openssl/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/lib/openssl/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/lib/openssl/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/lib/openssl/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/lib/pcre/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/lib/pcre/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/lib/pcre/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/lib/pcre/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/lib/pcre/makefile.owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/lib/perl/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/lib/perl/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/lib/zlib/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/lib/zlib/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/lib/zlib/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/lib/zlib/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/lib/zlib/makefile.owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/module (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/modules (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/nohave (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/options (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/os/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/os/darwin (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/os/freebsd (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/os/linux (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/os/solaris (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/os/win32 (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/sources (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/stubs (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/summary (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/threads (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/types/sizeof (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/types/typedef (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/types/uintptr_t (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/types/value (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/auto/unix (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/conf/fastcgi.conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/conf/fastcgi_params (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/conf/koi-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/conf/koi-win (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/conf/mime.types (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/conf/nginx.conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/conf/scgi_params (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/conf/uwsgi_params (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/conf/win-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/contrib/README (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/contrib/geo2nginx.pl (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/contrib/unicode2nginx/koi-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/contrib/unicode2nginx/unicode-to-nginx.pl (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/contrib/unicode2nginx/win-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/contrib/vim/ftdetect/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/contrib/vim/ftplugin/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/contrib/vim/indent/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/contrib/vim/syntax/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/docs/GNUmakefile (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/docs/dtd/change_log_conf.dtd (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/docs/dtd/changes.dtd (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/docs/html/50x.html (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/docs/html/index.html (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/docs/man/nginx.8 (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/docs/text/LICENSE (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/docs/text/README (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/docs/xml/change_log_conf.xml (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/docs/xml/nginx/changes.xml (+56 -0) 99% =================================================================== --- vendor/nginx-1.15.6/docs/xml/nginx/changes.xml 2018-11-27 16:11:17 +0900 (43a21e5f1) +++ vendor/nginx-1.15.7/docs/xml/nginx/changes.xml 2018-11-28 08:32:06 +0900 (0738e6fcc) @@ -5,6 +5,62 @@ <change_log title="nginx"> +<changes ver="1.15.7" date="2018-11-27"> + +<change type="feature"> +<para lang="ru"> +директива proxy_requests в модуле stream. +</para> +<para lang="en"> +the "proxy_requests" directive in the stream module. +</para> +</change> + +<change type="feature"> +<para lang="ru"> +параметр "delay" директивы "limit_req".<br/> +Спасибо Владиславу Шабанову и Петру Щучкину. +</para> +<para lang="en"> +the "delay" parameter of the "limit_req" directive.<br/> +Thanks to Vladislav Shabanov and Peter Shchuchkin. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +утечки памяти в случае ошибок при переконфигурации. +</para> +<para lang="en"> +memory leak on errors during reconfiguration. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +в переменных $upstream_response_time, $upstream_connect_time и +$upstream_header_time. +</para> +<para lang="en"> +in the $upstream_response_time, $upstream_connect_time, and +$upstream_header_time variables. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +в рабочем процессе мог произойти segmentation fault, +если использовался модуль ngx_http_mp4_module на 32-битных платформах. +</para> +<para lang="en"> +a segmentation fault might occur in a worker process +if the ngx_http_mp4_module was used on 32-bit platforms. +</para> +</change> + +</changes> + + <changes ver="1.15.6" date="2018-11-06"> <change type="security"> Renamed: vendor/nginx-1.15.7/docs/xsls/changes.xsls (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/docs/xslt/changes.xslt (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/misc/GNUmakefile (+1 -1) 99% =================================================================== --- vendor/nginx-1.15.6/misc/GNUmakefile 2018-11-27 16:11:17 +0900 (73d8bd922) +++ vendor/nginx-1.15.7/misc/GNUmakefile 2018-11-28 08:32:06 +0900 (d68ceca00) @@ -6,7 +6,7 @@ TEMP = tmp CC = cl OBJS = objs.msvc8 -OPENSSL = openssl-1.0.2p +OPENSSL = openssl-1.0.2q ZLIB = zlib-1.2.11 PCRE = pcre-8.42 Renamed: vendor/nginx-1.15.7/misc/README (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/nginx.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/nginx.h (+2 -2) 85% =================================================================== --- vendor/nginx-1.15.6/src/core/nginx.h 2018-11-27 16:11:17 +0900 (7916ffd12) +++ vendor/nginx-1.15.7/src/core/nginx.h 2018-11-28 08:32:06 +0900 (5e854d686) @@ -9,8 +9,8 @@ #define _NGINX_H_INCLUDED_ -#define nginx_version 1015006 -#define NGINX_VERSION "1.15.6" +#define nginx_version 1015007 +#define NGINX_VERSION "1.15.7" #define NGINX_VER "nginx/" NGINX_VERSION #ifdef NGX_BUILD Renamed: vendor/nginx-1.15.7/src/core/ngx_array.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_array.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_buf.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_buf.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_conf_file.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_conf_file.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_connection.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_connection.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_core.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_cpuinfo.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_crc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_crc32.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_crc32.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_crypt.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_crypt.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_cycle.c (+64 -0) 95% =================================================================== --- vendor/nginx-1.15.6/src/core/ngx_cycle.c 2018-11-27 16:11:17 +0900 (083c76488) +++ vendor/nginx-1.15.7/src/core/ngx_cycle.c 2018-11-28 08:32:06 +0900 (95f4bdfab) @@ -843,6 +843,69 @@ failed: } } + /* free the newly created shared memory */ + + part = &cycle->shared_memory.part; + shm_zone = part->elts; + + for (i = 0; /* void */ ; i++) { + + if (i >= part->nelts) { + if (part->next == NULL) { + break; + } + part = part->next; + shm_zone = part->elts; + i = 0; + } + + if (shm_zone[i].shm.addr == NULL) { + continue; + } + + opart = &old_cycle->shared_memory.part; + oshm_zone = opart->elts; + + for (n = 0; /* void */ ; n++) { + + if (n >= opart->nelts) { + if (opart->next == NULL) { + break; + } + opart = opart->next; + oshm_zone = opart->elts; + n = 0; + } + + if (shm_zone[i].shm.name.len != oshm_zone[n].shm.name.len) { + continue; + } + + if (ngx_strncmp(shm_zone[i].shm.name.data, + oshm_zone[n].shm.name.data, + shm_zone[i].shm.name.len) + != 0) + { + continue; + } + + if (shm_zone[i].tag == oshm_zone[n].tag + && shm_zone[i].shm.size == oshm_zone[n].shm.size + && !shm_zone[i].noreuse) + { + goto old_shm_zone_found; + } + + break; + } + + ngx_shm_free(&shm_zone[i].shm); + + old_shm_zone_found: + + continue; + } + if (ngx_test_config) { ngx_destroy_cycle_pools(&conf); return NULL; @@ -1274,6 +1337,7 @@ ngx_shared_memory_add(ngx_conf_t *cf, ngx_str_t *name, size_t size, void *tag) shm_zone->data = NULL; shm_zone->shm.log = cf->cycle->log; + shm_zone->shm.addr = NULL; shm_zone->shm.size = size; shm_zone->shm.name = *name; shm_zone->shm.exists = 0; Renamed: vendor/nginx-1.15.7/src/core/ngx_cycle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_file.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_file.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_hash.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_hash.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_inet.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_inet.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_list.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_list.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_log.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_log.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_md5.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_md5.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_murmurhash.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_murmurhash.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_open_file_cache.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_open_file_cache.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_output_chain.c (+60 -4) 89% =================================================================== --- vendor/nginx-1.15.6/src/core/ngx_output_chain.c 2018-11-27 16:11:17 +0900 (7f5dc787e) +++ vendor/nginx-1.15.7/src/core/ngx_output_chain.c 2018-11-28 08:32:06 +0900 (5c3dbe872) @@ -126,6 +126,26 @@ ngx_output_chain(ngx_output_chain_ctx_t *ctx, ngx_chain_t *in) continue; } + if (bsize < 0) { + + ngx_log_error(NGX_LOG_ALERT, ctx->pool->log, 0, + "negative size buf in output " + "t:%d r:%d f:%d %p %p-%p %p %O-%O", + ctx->in->buf->temporary, + ctx->in->buf->recycled, + ctx->in->buf->in_file, + ctx->in->buf->start, + ctx->in->buf->pos, + ctx->in->buf->last, + ctx->in->buf->file, + ctx->in->buf->file_pos, + ctx->in->buf->file_last); + + ngx_debug_point(); + + return NGX_ERROR; + } + if (ngx_output_chain_as_is(ctx, ctx->in->buf)) { /* move the chain link to the output chain */ @@ -665,7 +685,6 @@ ngx_chain_writer(void *data, ngx_chain_t *in) for (size = 0; in; in = in->next) { -#if 1 if (ngx_buf_size(in->buf) == 0 && !ngx_buf_special(in->buf)) { ngx_log_error(NGX_LOG_ALERT, ctx->pool->log, 0, @@ -685,7 +704,26 @@ ngx_chain_writer(void *data, ngx_chain_t *in) continue; } -#endif + + if (ngx_buf_size(in->buf) < 0) { + + ngx_log_error(NGX_LOG_ALERT, ctx->pool->log, 0, + "negative size buf in chain writer " + "t:%d r:%d f:%d %p %p-%p %p %O-%O", + in->buf->temporary, + in->buf->recycled, + in->buf->in_file, + in->buf->start, + in->buf->pos, + in->buf->last, + in->buf->file, + in->buf->file_pos, + in->buf->file_last); + + ngx_debug_point(); + + return NGX_ERROR; + } size += ngx_buf_size(in->buf); @@ -709,7 +747,6 @@ ngx_chain_writer(void *data, ngx_chain_t *in) for (cl = ctx->out; cl; cl = cl->next) { -#if 1 if (ngx_buf_size(cl->buf) == 0 && !ngx_buf_special(cl->buf)) { ngx_log_error(NGX_LOG_ALERT, ctx->pool->log, 0, @@ -729,7 +766,26 @@ ngx_chain_writer(void *data, ngx_chain_t *in) continue; } -#endif + + if (ngx_buf_size(cl->buf) < 0) { + + ngx_log_error(NGX_LOG_ALERT, ctx->pool->log, 0, + "negative size buf in chain writer " + "t:%d r:%d f:%d %p %p-%p %p %O-%O", + cl->buf->temporary, + cl->buf->recycled, + cl->buf->in_file, + cl->buf->start, + cl->buf->pos, + cl->buf->last, + cl->buf->file, + cl->buf->file_pos, + cl->buf->file_last); + + ngx_debug_point(); + + return NGX_ERROR; + } size += ngx_buf_size(cl->buf); } Renamed: vendor/nginx-1.15.7/src/core/ngx_palloc.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_palloc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_parse.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_parse.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_parse_time.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_parse_time.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_proxy_protocol.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_proxy_protocol.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_queue.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_queue.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_radix_tree.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_radix_tree.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_rbtree.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_rbtree.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_regex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_regex.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_resolver.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_resolver.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_rwlock.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_rwlock.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_sha1.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_sha1.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_shmtx.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_shmtx.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_slab.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_slab.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_spinlock.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_string.c (+8 -0) 99% =================================================================== --- vendor/nginx-1.15.6/src/core/ngx_string.c 2018-11-27 16:11:17 +0900 (2ee07bfc8) +++ vendor/nginx-1.15.7/src/core/ngx_string.c 2018-11-28 08:32:06 +0900 (04980f8c3) @@ -2013,6 +2013,14 @@ ngx_sort(void *base, size_t n, size_t size, } +void +ngx_explicit_memzero(void *buf, size_t n) +{ + ngx_memzero(buf, n); + ngx_memory_barrier(); +} + + #if (NGX_MEMCPY_LIMIT) void * Renamed: vendor/nginx-1.15.7/src/core/ngx_string.h (+2 -0) 99% =================================================================== --- vendor/nginx-1.15.6/src/core/ngx_string.h 2018-11-27 16:11:17 +0900 (882ae7cea) +++ vendor/nginx-1.15.7/src/core/ngx_string.h 2018-11-28 08:32:06 +0900 (0fb9be72e) @@ -88,6 +88,8 @@ ngx_strlchr(u_char *p, u_char *last, u_char c) #define ngx_memzero(buf, n) (void) memset(buf, 0, n) #define ngx_memset(buf, c, n) (void) memset(buf, c, n) +void ngx_explicit_memzero(void *buf, size_t n); + #if (NGX_MEMCPY_LIMIT) Renamed: vendor/nginx-1.15.7/src/core/ngx_syslog.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_syslog.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_thread_pool.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_thread_pool.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_times.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/core/ngx_times.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/event/modules/ngx_devpoll_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/event/modules/ngx_epoll_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/event/modules/ngx_eventport_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/event/modules/ngx_iocp_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/event/modules/ngx_iocp_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/event/modules/ngx_kqueue_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/event/modules/ngx_poll_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/event/modules/ngx_select_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/event/modules/ngx_win32_select_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/event/ngx_event.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/event/ngx_event.h (+1 -0) 99% =================================================================== --- vendor/nginx-1.15.6/src/event/ngx_event.h 2018-11-27 16:11:17 +0900 (c3979fb46) +++ vendor/nginx-1.15.7/src/event/ngx_event.h 2018-11-28 08:32:06 +0900 (bb77c4ae6) @@ -509,6 +509,7 @@ void ngx_event_recvmsg(ngx_event_t *ev); void ngx_udp_rbtree_insert_value(ngx_rbtree_node_t *temp, ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel); #endif +void ngx_delete_udp_connection(void *data); ngx_int_t ngx_trylock_accept_mutex(ngx_cycle_t *cycle); ngx_int_t ngx_enable_accept_events(ngx_cycle_t *cycle); u_char *ngx_accept_log_error(ngx_log_t *log, u_char *buf, size_t len); Renamed: vendor/nginx-1.15.7/src/event/ngx_event_accept.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/event/ngx_event_acceptex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/event/ngx_event_connect.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/event/ngx_event_connect.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/event/ngx_event_connectex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/event/ngx_event_openssl.c (+2 -2) 99% =================================================================== --- vendor/nginx-1.15.6/src/event/ngx_event_openssl.c 2018-11-27 16:11:17 +0900 (2c384a4dd) +++ vendor/nginx-1.15.7/src/event/ngx_event_openssl.c 2018-11-28 08:32:06 +0900 (a281fba9e) @@ -1051,7 +1051,7 @@ cleanup: ngx_close_file_n " \"%s\" failed", file->data); } - ngx_memzero(buf, NGX_SSL_PASSWORD_BUFFER_SIZE); + ngx_explicit_memzero(buf, NGX_SSL_PASSWORD_BUFFER_SIZE); return passwords; } @@ -1068,7 +1068,7 @@ ngx_ssl_passwords_cleanup(void *data) pwd = passwords->elts; for (i = 0; i < passwords->nelts; i++) { - ngx_memzero(pwd[i].data, pwd[i].len); + ngx_explicit_memzero(pwd[i].data, pwd[i].len); } } Renamed: vendor/nginx-1.15.7/src/event/ngx_event_openssl.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/event/ngx_event_openssl_stapling.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/event/ngx_event_pipe.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/event/ngx_event_pipe.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/event/ngx_event_posted.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/event/ngx_event_posted.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/event/ngx_event_timer.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/event/ngx_event_timer.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/event/ngx_event_udp.c (+19 -3) 98% =================================================================== --- vendor/nginx-1.15.6/src/event/ngx_event_udp.c 2018-11-27 16:11:17 +0900 (8b0ae5539) +++ vendor/nginx-1.15.7/src/event/ngx_event_udp.c 2018-11-28 08:32:06 +0900 (65eb22fd2) @@ -23,7 +23,6 @@ static void ngx_close_accepted_udp_connection(ngx_connection_t *c); static ssize_t ngx_udp_shared_recv(ngx_connection_t *c, u_char *buf, size_t size); static ngx_int_t ngx_insert_udp_connection(ngx_connection_t *c); -static void ngx_delete_udp_connection(void *data); static ngx_connection_t *ngx_lookup_udp_connection(ngx_listening_t *ls, struct sockaddr *sockaddr, socklen_t socklen, struct sockaddr *local_sockaddr, socklen_t local_socklen); @@ -261,7 +260,10 @@ ngx_event_recvmsg(ngx_event_t *ev) rev->handler(rev); - c->udp->buffer = NULL; + if (c->udp) { + c->udp->buffer = NULL; + } + rev->ready = 0; goto next; @@ -555,12 +557,18 @@ ngx_insert_udp_connection(ngx_connection_t *c) } -static void +void ngx_delete_udp_connection(void *data) { ngx_connection_t *c = data; + if (c->udp == NULL) { + return; + } + ngx_rbtree_delete(&c->listening->rbtree, &c->udp->node); + + c->udp = NULL; } @@ -638,4 +646,12 @@ ngx_lookup_udp_connection(ngx_listening_t *ls, struct sockaddr *sockaddr, return NULL; } +#else + +void +ngx_delete_udp_connection(void *data) +{ + return; +} + #endif Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_access_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_addition_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_auth_basic_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_auth_request_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_autoindex_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_browser_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_charset_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_chunked_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_dav_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_degradation_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_empty_gif_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_fastcgi_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_flv_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_geo_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_geoip_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_grpc_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_gunzip_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_gzip_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_gzip_static_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_headers_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_image_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_index_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_limit_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_limit_req_module.c (+23 -11) 96% =================================================================== --- vendor/nginx-1.15.6/src/http/modules/ngx_http_limit_req_module.c 2018-11-27 16:11:17 +0900 (63ec2de3f) +++ vendor/nginx-1.15.7/src/http/modules/ngx_http_limit_req_module.c 2018-11-28 08:32:06 +0900 (e81d57ffb) @@ -44,7 +44,7 @@ typedef struct { ngx_shm_zone_t *shm_zone; /* integer value, 1 corresponds to 0.001 r/s */ ngx_uint_t burst; - ngx_uint_t nodelay; /* unsigned nodelay:1 */ + ngx_uint_t delay; } ngx_http_limit_req_limit_t; @@ -499,12 +499,12 @@ ngx_http_limit_req_account(ngx_http_limit_req_limit_t *limits, ngx_uint_t n, excess = *ep; - if (excess == 0 || (*limit)->nodelay) { + if ((ngx_uint_t) excess <= (*limit)->delay) { max_delay = 0; } else { ctx = (*limit)->shm_zone->data; - max_delay = excess * 1000 / ctx->rate; + max_delay = (excess - (*limit)->delay) * 1000 / ctx->rate; } while (n--) { @@ -544,11 +544,11 @@ ngx_http_limit_req_account(ngx_http_limit_req_limit_t *limits, ngx_uint_t n, ctx->node = NULL; - if (limits[n].nodelay) { + if ((ngx_uint_t) excess <= limits[n].delay) { continue; } - delay = excess * 1000 / ctx->rate; + delay = (excess - limits[n].delay) * 1000 / ctx->rate; if (delay > max_delay) { max_delay = delay; @@ -875,9 +875,9 @@ ngx_http_limit_req(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) { ngx_http_limit_req_conf_t *lrcf = conf; - ngx_int_t burst; + ngx_int_t burst, delay; ngx_str_t *value, s; - ngx_uint_t i, nodelay; + ngx_uint_t i; ngx_shm_zone_t *shm_zone; ngx_http_limit_req_limit_t *limit, *limits; @@ -885,7 +885,7 @@ ngx_http_limit_req(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) shm_zone = NULL; burst = 0; - nodelay = 0; + delay = 0; for (i = 1; i < cf->args->nelts; i++) { @@ -908,7 +908,19 @@ ngx_http_limit_req(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) burst = ngx_atoi(value[i].data + 6, value[i].len - 6); if (burst <= 0) { ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, - "invalid burst rate \"%V\"", &value[i]); + "invalid burst value \"%V\"", &value[i]); + return NGX_CONF_ERROR; + } + + continue; + } + + if (ngx_strncmp(value[i].data, "delay=", 6) == 0) { + + delay = ngx_atoi(value[i].data + 6, value[i].len - 6); + if (delay <= 0) { + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, + "invalid delay value \"%V\"", &value[i]); return NGX_CONF_ERROR; } @@ -916,7 +928,7 @@ ngx_http_limit_req(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) } if (ngx_strcmp(value[i].data, "nodelay") == 0) { - nodelay = 1; + delay = NGX_MAX_INT_T_VALUE / 1000; continue; } @@ -956,7 +968,7 @@ ngx_http_limit_req(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) limit->shm_zone = shm_zone; limit->burst = burst * 1000; - limit->nodelay = nodelay; + limit->delay = delay * 1000; return NGX_CONF_OK; } Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_log_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_map_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_memcached_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_mirror_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_mp4_module.c (+8 -1) 99% =================================================================== --- vendor/nginx-1.15.6/src/http/modules/ngx_http_mp4_module.c 2018-11-27 16:11:17 +0900 (2a6fafa04) +++ vendor/nginx-1.15.7/src/http/modules/ngx_http_mp4_module.c 2018-11-28 08:32:06 +0900 (618bf787b) @@ -169,7 +169,14 @@ typedef struct { #define ngx_mp4_atom_next(mp4, n) \ - mp4->buffer_pos += (size_t) n; \ + \ + if (n > (size_t) (mp4->buffer_end - mp4->buffer_pos)) { \ + mp4->buffer_pos = mp4->buffer_end; \ + \ + } else { \ + mp4->buffer_pos += (size_t) n; \ + } \ + \ mp4->offset += n Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_not_modified_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_proxy_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_random_index_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_range_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_realip_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_referer_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_rewrite_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_scgi_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_secure_link_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_slice_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_split_clients_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_ssi_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_ssi_filter_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_ssl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_ssl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_static_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_stub_status_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_sub_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_try_files_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_upstream_hash_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_upstream_ip_hash_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_upstream_keepalive_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_upstream_least_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_upstream_random_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_upstream_zone_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_userid_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_uwsgi_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/ngx_http_xslt_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/perl/Makefile.PL (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/perl/nginx.pm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/perl/nginx.xs (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/perl/ngx_http_perl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/perl/ngx_http_perl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/modules/perl/typemap (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/ngx_http.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/ngx_http.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/ngx_http_cache.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/ngx_http_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/ngx_http_copy_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/ngx_http_core_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/ngx_http_core_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/ngx_http_file_cache.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/ngx_http_header_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/ngx_http_parse.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/ngx_http_postpone_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/ngx_http_request.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/ngx_http_request.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/ngx_http_request_body.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/ngx_http_script.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/ngx_http_script.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/ngx_http_special_response.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/ngx_http_upstream.c (+17 -15) 99% =================================================================== --- vendor/nginx-1.15.6/src/http/ngx_http_upstream.c 2018-11-27 16:11:17 +0900 (22c2afd67) +++ vendor/nginx-1.15.7/src/http/ngx_http_upstream.c 2018-11-28 08:32:06 +0900 (3fa86c8f9) @@ -1505,8 +1505,8 @@ ngx_http_upstream_connect(ngx_http_request_t *r, ngx_http_upstream_t *u) r->connection->log->action = "connecting to upstream"; - if (u->state && u->state->response_time) { - u->state->response_time = ngx_current_msec - u->state->response_time; + if (u->state && u->state->response_time == (ngx_msec_t) -1) { + u->state->response_time = ngx_current_msec - u->start_time; } u->state = ngx_array_push(r->upstream_states); @@ -1518,7 +1518,9 @@ ngx_http_upstream_connect(ngx_http_request_t *r, ngx_http_upstream_t *u) ngx_memzero(u->state, sizeof(ngx_http_upstream_state_t)); - u->state->response_time = ngx_current_msec; + u->start_time = ngx_current_msec; + + u->state->response_time = (ngx_msec_t) -1; u->state->connect_time = (ngx_msec_t) -1; u->state->header_time = (ngx_msec_t) -1; @@ -2002,7 +2004,7 @@ ngx_http_upstream_send_request(ngx_http_request_t *r, ngx_http_upstream_t *u, "http upstream send request"); if (u->state->connect_time == (ngx_msec_t) -1) { - u->state->connect_time = ngx_current_msec - u->state->response_time; + u->state->connect_time = ngx_current_msec - u->start_time; } if (!u->request_sent && ngx_http_upstream_test_connect(c) != NGX_OK) { @@ -2413,7 +2415,7 @@ ngx_http_upstream_process_header(ngx_http_request_t *r, ngx_http_upstream_t *u) /* rc == NGX_OK */ - u->state->header_time = ngx_current_msec - u->state->response_time; + u->state->header_time = ngx_current_msec - u->start_time; if (u->headers_in.status_n >= NGX_HTTP_SPECIAL_RESPONSE) { @@ -4309,8 +4311,8 @@ ngx_http_upstream_finalize_request(ngx_http_request_t *r, u->resolved->ctx = NULL; } - if (u->state && u->state->response_time) { - u->state->response_time = ngx_current_msec - u->state->response_time; + if (u->state && u->state->response_time == (ngx_msec_t) -1) { + u->state->response_time = ngx_current_msec - u->start_time; if (u->pipe && u->pipe->read_length) { u->state->bytes_received += u->pipe->read_length @@ -5419,18 +5421,18 @@ ngx_http_upstream_response_time_variable(ngx_http_request_t *r, state = r->upstream_states->elts; for ( ;; ) { - if (state[i].status) { - if (data == 1 && state[i].header_time != (ngx_msec_t) -1) { - ms = state[i].header_time; + if (data == 1) { + ms = state[i].header_time; - } else if (data == 2 && state[i].connect_time != (ngx_msec_t) -1) { - ms = state[i].connect_time; + } else if (data == 2) { + ms = state[i].connect_time; - } else { - ms = state[i].response_time; - } + } else { + ms = state[i].response_time; + } + if (ms != -1) { ms = ngx_max(ms, 0); p = ngx_sprintf(p, "%T.%03M", (time_t) ms / 1000, ms % 1000); Renamed: vendor/nginx-1.15.7/src/http/ngx_http_upstream.h (+1 -1) 99% =================================================================== --- vendor/nginx-1.15.6/src/http/ngx_http_upstream.h 2018-11-27 16:11:17 +0900 (cd21719fe) +++ vendor/nginx-1.15.7/src/http/ngx_http_upstream.h 2018-11-28 08:32:06 +0900 (af84e24be) @@ -365,7 +365,7 @@ struct ngx_http_upstream_s { ngx_int_t (*rewrite_cookie)(ngx_http_request_t *r, ngx_table_elt_t *h); - ngx_msec_t timeout; + ngx_msec_t start_time; ngx_http_upstream_state_t *state; Renamed: vendor/nginx-1.15.7/src/http/ngx_http_upstream_round_robin.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/ngx_http_upstream_round_robin.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/ngx_http_variables.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/ngx_http_variables.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/ngx_http_write_filter_module.c (+36 -4) 86% =================================================================== --- vendor/nginx-1.15.6/src/http/ngx_http_write_filter_module.c 2018-11-27 16:11:17 +0900 (003623151) +++ vendor/nginx-1.15.7/src/http/ngx_http_write_filter_module.c 2018-11-28 08:32:06 +0900 (3f18d76f2) @@ -80,7 +80,6 @@ ngx_http_write_filter(ngx_http_request_t *r, ngx_chain_t *in) cl->buf->file_pos, cl->buf->file_last - cl->buf->file_pos); -#if 1 if (ngx_buf_size(cl->buf) == 0 && !ngx_buf_special(cl->buf)) { ngx_log_error(NGX_LOG_ALERT, c->log, 0, "zero size buf in writer " @@ -98,7 +97,24 @@ ngx_http_write_filter(ngx_http_request_t *r, ngx_chain_t *in) ngx_debug_point(); return NGX_ERROR; } -#endif + + if (ngx_buf_size(cl->buf) < 0) { + ngx_log_error(NGX_LOG_ALERT, c->log, 0, + "negative size buf in writer " + "t:%d r:%d f:%d %p %p-%p %p %O-%O", + cl->buf->temporary, + cl->buf->recycled, + cl->buf->in_file, + cl->buf->start, + cl->buf->pos, + cl->buf->last, + cl->buf->file, + cl->buf->file_pos, + cl->buf->file_last); + + ngx_debug_point(); + return NGX_ERROR; + } size += ngx_buf_size(cl->buf); @@ -136,7 +152,6 @@ ngx_http_write_filter(ngx_http_request_t *r, ngx_chain_t *in) cl->buf->file_pos, cl->buf->file_last - cl->buf->file_pos); -#if 1 if (ngx_buf_size(cl->buf) == 0 && !ngx_buf_special(cl->buf)) { ngx_log_error(NGX_LOG_ALERT, c->log, 0, "zero size buf in writer " @@ -154,7 +169,24 @@ ngx_http_write_filter(ngx_http_request_t *r, ngx_chain_t *in) ngx_debug_point(); return NGX_ERROR; } -#endif + + if (ngx_buf_size(cl->buf) < 0) { + ngx_log_error(NGX_LOG_ALERT, c->log, 0, + "negative size buf in writer " + "t:%d r:%d f:%d %p %p-%p %p %O-%O", + cl->buf->temporary, + cl->buf->recycled, + cl->buf->in_file, + cl->buf->start, + cl->buf->pos, + cl->buf->last, + cl->buf->file, + cl->buf->file_pos, + cl->buf->file_last); + + ngx_debug_point(); + return NGX_ERROR; + } size += ngx_buf_size(cl->buf); Renamed: vendor/nginx-1.15.7/src/http/v2/ngx_http_v2.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/v2/ngx_http_v2.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/v2/ngx_http_v2_encode.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/v2/ngx_http_v2_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/v2/ngx_http_v2_huff_decode.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/v2/ngx_http_v2_huff_encode.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/v2/ngx_http_v2_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/v2/ngx_http_v2_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/http/v2/ngx_http_v2_table.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/mail/ngx_mail.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/mail/ngx_mail.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/mail/ngx_mail_auth_http_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/mail/ngx_mail_core_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/mail/ngx_mail_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/mail/ngx_mail_imap_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/mail/ngx_mail_imap_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/mail/ngx_mail_imap_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/mail/ngx_mail_parse.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/mail/ngx_mail_pop3_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/mail/ngx_mail_pop3_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/mail/ngx_mail_pop3_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/mail/ngx_mail_proxy_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/mail/ngx_mail_smtp_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/mail/ngx_mail_smtp_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/mail/ngx_mail_smtp_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/mail/ngx_mail_ssl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/mail/ngx_mail_ssl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/misc/ngx_cpp_test_module.cpp (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/misc/ngx_google_perftools_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_alloc.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_alloc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_atomic.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_channel.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_channel.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_daemon.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_darwin.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_darwin_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_darwin_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_darwin_sendfile_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_dlopen.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_dlopen.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_errno.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_errno.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_file_aio_read.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_files.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_files.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_freebsd.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_freebsd_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_freebsd_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_freebsd_sendfile_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_gcc_atomic_amd64.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_gcc_atomic_ppc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_gcc_atomic_sparc64.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_gcc_atomic_x86.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_linux.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_linux_aio_read.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_linux_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_linux_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_linux_sendfile_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_os.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_posix_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_posix_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_process.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_process.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_process_cycle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_process_cycle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_readv_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_recv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_send.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_setaffinity.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_setaffinity.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_setproctitle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_setproctitle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_shmem.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_shmem.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_socket.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_socket.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_solaris.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_solaris_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_solaris_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_solaris_sendfilev_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_sunpro_amd64.il (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_sunpro_atomic_sparc64.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_sunpro_sparc64.il (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_sunpro_x86.il (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_thread.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_thread_cond.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_thread_id.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_thread_mutex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_time.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_time.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_udp_recv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_udp_send.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_udp_sendmsg_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_user.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_user.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/unix/ngx_writev_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/nginx.ico (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/nginx.rc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/nginx_icon16.xpm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/nginx_icon32.xpm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/nginx_icon48.xpm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/ngx_alloc.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/ngx_alloc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/ngx_atomic.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/ngx_dlopen.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/ngx_dlopen.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/ngx_errno.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/ngx_errno.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/ngx_event_log.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/ngx_files.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/ngx_files.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/ngx_os.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/ngx_process.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/ngx_process.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/ngx_process_cycle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/ngx_process_cycle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/ngx_service.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/ngx_shmem.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/ngx_shmem.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/ngx_socket.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/ngx_socket.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/ngx_stat.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/ngx_thread.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/ngx_thread.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/ngx_time.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/ngx_time.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/ngx_udp_wsarecv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/ngx_user.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/ngx_user.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/ngx_win32_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/ngx_win32_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/ngx_wsarecv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/ngx_wsarecv_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/ngx_wsasend.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/os/win32/ngx_wsasend_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/stream/ngx_stream.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/stream/ngx_stream.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/stream/ngx_stream_access_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/stream/ngx_stream_core_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/stream/ngx_stream_geo_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/stream/ngx_stream_geoip_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/stream/ngx_stream_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/stream/ngx_stream_limit_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/stream/ngx_stream_log_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/stream/ngx_stream_map_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/stream/ngx_stream_proxy_module.c (+110 -45) 95% =================================================================== --- vendor/nginx-1.15.6/src/stream/ngx_stream_proxy_module.c 2018-11-27 16:11:17 +0900 (c8465a7d0) +++ vendor/nginx-1.15.7/src/stream/ngx_stream_proxy_module.c 2018-11-28 08:32:06 +0900 (094931355) @@ -26,6 +26,7 @@ typedef struct { size_t buffer_size; size_t upload_rate; size_t download_rate; + ngx_uint_t requests; ngx_uint_t responses; ngx_uint_t next_upstream_tries; ngx_flag_t next_upstream; @@ -73,6 +74,8 @@ static void ngx_stream_proxy_connect_handler(ngx_event_t *ev); static ngx_int_t ngx_stream_proxy_test_connect(ngx_connection_t *c); static void ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream, ngx_uint_t do_write); +static ngx_int_t ngx_stream_proxy_test_finalize(ngx_stream_session_t *s, + ngx_uint_t from_upstream); static void ngx_stream_proxy_next_upstream(ngx_stream_session_t *s); static void ngx_stream_proxy_finalize(ngx_stream_session_t *s, ngx_uint_t rc); static u_char *ngx_stream_proxy_log_error(ngx_log_t *log, u_char *buf, @@ -193,6 +196,13 @@ static ngx_command_t ngx_stream_proxy_commands[] = { offsetof(ngx_stream_proxy_srv_conf_t, download_rate), NULL }, + { ngx_string("proxy_requests"), + NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1, + ngx_conf_set_num_slot, + NGX_STREAM_SRV_CONF_OFFSET, + offsetof(ngx_stream_proxy_srv_conf_t, requests), + NULL }, + { ngx_string("proxy_responses"), NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1, ngx_conf_set_num_slot, @@ -680,7 +690,7 @@ ngx_stream_proxy_connect(ngx_stream_session_t *s) u->proxy_protocol = pscf->proxy_protocol; if (u->state) { - u->state->response_time = ngx_current_msec - u->state->response_time; + u->state->response_time = ngx_current_msec - u->start_time; } u->state = ngx_array_push(s->upstream_states); @@ -691,9 +701,11 @@ ngx_stream_proxy_connect(ngx_stream_session_t *s) ngx_memzero(u->state, sizeof(ngx_stream_upstream_state_t)); + u->start_time = ngx_current_msec; + u->state->connect_time = (ngx_msec_t) -1; u->state->first_byte_time = (ngx_msec_t) -1; - u->state->response_time = ngx_current_msec; + u->state->response_time = (ngx_msec_t) -1; rc = ngx_event_connect_peer(&u->peer); @@ -807,7 +819,7 @@ ngx_stream_proxy_init_upstream(ngx_stream_session_t *s) } } - u->state->connect_time = ngx_current_msec - u->state->response_time; + u->state->connect_time = ngx_current_msec - u->start_time; if (u->peer.notify) { u->peer.notify(&u->peer, u->peer.data, @@ -1339,11 +1351,14 @@ ngx_stream_proxy_process_connection(ngx_event_t *ev, ngx_uint_t from_upstream) } else { if (s->connection->type == SOCK_DGRAM) { - if (pscf->responses == NGX_MAX_INT32_VALUE) { + + if (pscf->responses == NGX_MAX_INT32_VALUE + || (u->responses >= pscf->responses * u->requests)) + { /* * successfully terminate timed out UDP session - * with unspecified number of responses + * if expected number of responses was received */ handler = c->log->handler; @@ -1609,7 +1624,7 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream, if (from_upstream) { if (u->state->first_byte_time == (ngx_msec_t) -1) { u->state->first_byte_time = ngx_current_msec - - u->state->response_time; + - u->start_time; } } @@ -1646,44 +1661,7 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream, c->log->action = "proxying connection"; - if (c->type == SOCK_DGRAM - && pscf->responses != NGX_MAX_INT32_VALUE - && u->responses >= pscf->responses * u->requests - && !src->buffered && dst && !dst->buffered) - { - handler = c->log->handler; - c->log->handler = NULL; - - ngx_log_error(NGX_LOG_INFO, c->log, 0, - "udp done" - ", packets from/to client:%ui/%ui" - ", bytes from/to client:%O/%O" - ", bytes from/to upstream:%O/%O", - u->requests, u->responses, - s->received, c->sent, u->received, pc ? pc->sent : 0); - - c->log->handler = handler; - - ngx_stream_proxy_finalize(s, NGX_STREAM_OK); - return; - } - - if (c->type == SOCK_STREAM - && src->read->eof && dst && (dst->read->eof || !dst->buffered)) - { - handler = c->log->handler; - c->log->handler = NULL; - - ngx_log_error(NGX_LOG_INFO, c->log, 0, - "%s disconnected" - ", bytes from/to client:%O/%O" - ", bytes from/to upstream:%O/%O", - from_upstream ? "upstream" : "client", - s->received, c->sent, u->received, pc ? pc->sent : 0); - - c->log->handler = handler; - - ngx_stream_proxy_finalize(s, NGX_STREAM_OK); + if (ngx_stream_proxy_test_finalize(s, from_upstream) == NGX_OK) { return; } @@ -1710,6 +1688,87 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream, } +static ngx_int_t +ngx_stream_proxy_test_finalize(ngx_stream_session_t *s, + ngx_uint_t from_upstream) +{ + ngx_connection_t *c, *pc; + ngx_log_handler_pt handler; + ngx_stream_upstream_t *u; + ngx_stream_proxy_srv_conf_t *pscf; + + pscf = ngx_stream_get_module_srv_conf(s, ngx_stream_proxy_module); + + c = s->connection; + u = s->upstream; + pc = u->connected ? u->peer.connection : NULL; + + if (c->type == SOCK_DGRAM) { + + if (pscf->requests && u->requests < pscf->requests) { + return NGX_DECLINED; + } + + if (pscf->requests) { + ngx_delete_udp_connection(c); + } + + if (pscf->responses == NGX_MAX_INT32_VALUE + || u->responses < pscf->responses * u->requests) + { + return NGX_DECLINED; + } + + if (pc == NULL || c->buffered || pc->buffered) { + return NGX_DECLINED; + } + + handler = c->log->handler; + c->log->handler = NULL; + + ngx_log_error(NGX_LOG_INFO, c->log, 0, + "udp done" + ", packets from/to client:%ui/%ui" + ", bytes from/to client:%O/%O" + ", bytes from/to upstream:%O/%O", + u->requests, u->responses, + s->received, c->sent, u->received, pc ? pc->sent : 0); + + c->log->handler = handler; + + ngx_stream_proxy_finalize(s, NGX_STREAM_OK); + + return NGX_OK; + } + + /* c->type == SOCK_STREAM */ + + if (pc == NULL + || (!c->read->eof && !pc->read->eof) + || (!c->read->eof && c->buffered) + || (!pc->read->eof && pc->buffered)) + { + return NGX_DECLINED; + } + + handler = c->log->handler; + c->log->handler = NULL; + + ngx_log_error(NGX_LOG_INFO, c->log, 0, + "%s disconnected" + ", bytes from/to client:%O/%O" + ", bytes from/to upstream:%O/%O", + from_upstream ? "upstream" : "client", + s->received, c->sent, u->received, pc ? pc->sent : 0); + + c->log->handler = handler; + + ngx_stream_proxy_finalize(s, NGX_STREAM_OK); + + return NGX_OK; +} + + static void ngx_stream_proxy_next_upstream(ngx_stream_session_t *s) { @@ -1800,7 +1859,9 @@ ngx_stream_proxy_finalize(ngx_stream_session_t *s, ngx_uint_t rc) pc = u->peer.connection; if (u->state) { - u->state->response_time = ngx_current_msec - u->state->response_time; + if (u->state->response_time == (ngx_msec_t) -1) { + u->state->response_time = ngx_current_msec - u->start_time; + } if (pc) { u->state->bytes_received = u->received; @@ -1905,6 +1966,7 @@ ngx_stream_proxy_create_srv_conf(ngx_conf_t *cf) conf->buffer_size = NGX_CONF_UNSET_SIZE; conf->upload_rate = NGX_CONF_UNSET_SIZE; conf->download_rate = NGX_CONF_UNSET_SIZE; + conf->requests = NGX_CONF_UNSET_UINT; conf->responses = NGX_CONF_UNSET_UINT; conf->next_upstream_tries = NGX_CONF_UNSET_UINT; conf->next_upstream = NGX_CONF_UNSET; @@ -1949,6 +2011,9 @@ ngx_stream_proxy_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) ngx_conf_merge_size_value(conf->download_rate, prev->download_rate, 0); + ngx_conf_merge_uint_value(conf->requests, + prev->requests, 0); + ngx_conf_merge_uint_value(conf->responses, prev->responses, NGX_MAX_INT32_VALUE); Renamed: vendor/nginx-1.15.7/src/stream/ngx_stream_realip_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/stream/ngx_stream_return_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/stream/ngx_stream_script.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/stream/ngx_stream_script.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/stream/ngx_stream_split_clients_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/stream/ngx_stream_ssl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/stream/ngx_stream_ssl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/stream/ngx_stream_ssl_preread_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/stream/ngx_stream_upstream.c (+7 -9) 98% =================================================================== --- vendor/nginx-1.15.6/src/stream/ngx_stream_upstream.c 2018-11-27 16:11:17 +0900 (7feac4381) +++ vendor/nginx-1.15.7/src/stream/ngx_stream_upstream.c 2018-11-28 08:32:06 +0900 (eadcf9f9a) @@ -267,24 +267,22 @@ ngx_stream_upstream_response_time_variable(ngx_stream_session_t *s, for ( ;; ) { if (data == 1) { - if (state[i].first_byte_time == (ngx_msec_t) -1) { - *p++ = '-'; - goto next; - } - ms = state[i].first_byte_time; - } else if (data == 2 && state[i].connect_time != (ngx_msec_t) -1) { + } else if (data == 2) { ms = state[i].connect_time; } else { ms = state[i].response_time; } - ms = ngx_max(ms, 0); - p = ngx_sprintf(p, "%T.%03M", (time_t) ms / 1000, ms % 1000); + if (ms != -1) { + ms = ngx_max(ms, 0); + p = ngx_sprintf(p, "%T.%03M", (time_t) ms / 1000, ms % 1000); - next: + } else { + *p++ = '-'; + } if (++i == s->upstream_states->nelts) { break; Renamed: vendor/nginx-1.15.7/src/stream/ngx_stream_upstream.h (+1 -0) 98% =================================================================== --- vendor/nginx-1.15.6/src/stream/ngx_stream_upstream.h 2018-11-27 16:11:17 +0900 (741ef4e0a) +++ vendor/nginx-1.15.7/src/stream/ngx_stream_upstream.h 2018-11-28 08:32:06 +0900 (0fe416b26) @@ -130,6 +130,7 @@ typedef struct { time_t start_sec; ngx_uint_t requests; ngx_uint_t responses; + ngx_msec_t start_time; ngx_str_t ssl_name; Renamed: vendor/nginx-1.15.7/src/stream/ngx_stream_upstream_hash_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/stream/ngx_stream_upstream_least_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/stream/ngx_stream_upstream_random_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/stream/ngx_stream_upstream_round_robin.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/stream/ngx_stream_upstream_round_robin.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/stream/ngx_stream_upstream_zone_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/stream/ngx_stream_variables.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/stream/ngx_stream_variables.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.7/src/stream/ngx_stream_write_filter_module.c (+36 -4) 84% =================================================================== --- vendor/nginx-1.15.6/src/stream/ngx_stream_write_filter_module.c 2018-11-27 16:11:17 +0900 (8fdcd372b) +++ vendor/nginx-1.15.7/src/stream/ngx_stream_write_filter_module.c 2018-11-28 08:32:06 +0900 (24326c60e) @@ -104,7 +104,6 @@ ngx_stream_write_filter(ngx_stream_session_t *s, ngx_chain_t *in, cl->buf->file_pos, cl->buf->file_last - cl->buf->file_pos); -#if 1 if (ngx_buf_size(cl->buf) == 0 && !ngx_buf_special(cl->buf)) { ngx_log_error(NGX_LOG_ALERT, c->log, 0, "zero size buf in writer " @@ -122,7 +121,24 @@ ngx_stream_write_filter(ngx_stream_session_t *s, ngx_chain_t *in, ngx_debug_point(); return NGX_ERROR; } -#endif + + if (ngx_buf_size(cl->buf) < 0) { + ngx_log_error(NGX_LOG_ALERT, c->log, 0, + "negative size buf in writer " + "t:%d r:%d f:%d %p %p-%p %p %O-%O", + cl->buf->temporary, + cl->buf->recycled, + cl->buf->in_file, + cl->buf->start, + cl->buf->pos, + cl->buf->last, + cl->buf->file, + cl->buf->file_pos, + cl->buf->file_last); + + ngx_debug_point(); + return NGX_ERROR; + } size += ngx_buf_size(cl->buf); @@ -160,7 +176,6 @@ ngx_stream_write_filter(ngx_stream_session_t *s, ngx_chain_t *in, cl->buf->file_pos, cl->buf->file_last - cl->buf->file_pos); -#if 1 if (ngx_buf_size(cl->buf) == 0 && !ngx_buf_special(cl->buf)) { ngx_log_error(NGX_LOG_ALERT, c->log, 0, "zero size buf in writer " @@ -178,7 +193,24 @@ ngx_stream_write_filter(ngx_stream_session_t *s, ngx_chain_t *in, ngx_debug_point(); return NGX_ERROR; } -#endif + + if (ngx_buf_size(cl->buf) < 0) { + ngx_log_error(NGX_LOG_ALERT, c->log, 0, + "negative size buf in writer " + "t:%d r:%d f:%d %p %p-%p %p %O-%O", + cl->buf->temporary, + cl->buf->recycled, + cl->buf->in_file, + cl->buf->start, + cl->buf->pos, + cl->buf->last, + cl->buf->file, + cl->buf->file_pos, + cl->buf->file_last); + + ngx_debug_point(); + return NGX_ERROR; + } size += ngx_buf_size(cl->buf);
