Kentaro Hayashi 2018-11-27 14:48:41 +0900 (Tue, 27 Nov 2018) Revision: 1e1158c8433203f48a8899a2266af2de8294ccfa https://github.com/groonga/groonga/commit/1e1158c8433203f48a8899a2266af2de8294ccfa Message: nginx: update nginx % ./update_nginx.sh 1.15.6 This update contains security fixes and groonga-httpd is affected because explicitly HTTP/2 module is enabled. * CVE-2018-16843 http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-16843 * CVE-2018-16844 http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-16844 Modified files: nginx_version Renamed files: vendor/nginx-1.15.6/auto/cc/acc (from vendor/nginx-1.15.5/auto/cc/acc) vendor/nginx-1.15.6/auto/cc/bcc (from vendor/nginx-1.15.5/auto/cc/bcc) vendor/nginx-1.15.6/auto/cc/ccc (from vendor/nginx-1.15.5/auto/cc/ccc) vendor/nginx-1.15.6/auto/cc/clang (from vendor/nginx-1.15.5/auto/cc/clang) vendor/nginx-1.15.6/auto/cc/conf (from vendor/nginx-1.15.5/auto/cc/conf) vendor/nginx-1.15.6/auto/cc/gcc (from vendor/nginx-1.15.5/auto/cc/gcc) vendor/nginx-1.15.6/auto/cc/icc (from vendor/nginx-1.15.5/auto/cc/icc) vendor/nginx-1.15.6/auto/cc/msvc (from vendor/nginx-1.15.5/auto/cc/msvc) vendor/nginx-1.15.6/auto/cc/name (from vendor/nginx-1.15.5/auto/cc/name) vendor/nginx-1.15.6/auto/cc/owc (from vendor/nginx-1.15.5/auto/cc/owc) vendor/nginx-1.15.6/auto/cc/sunc (from vendor/nginx-1.15.5/auto/cc/sunc) vendor/nginx-1.15.6/auto/configure (from vendor/nginx-1.15.5/auto/configure) vendor/nginx-1.15.6/auto/define (from vendor/nginx-1.15.5/auto/define) vendor/nginx-1.15.6/auto/endianness (from vendor/nginx-1.15.5/auto/endianness) vendor/nginx-1.15.6/auto/feature (from vendor/nginx-1.15.5/auto/feature) vendor/nginx-1.15.6/auto/have (from vendor/nginx-1.15.5/auto/have) vendor/nginx-1.15.6/auto/have_headers (from vendor/nginx-1.15.5/auto/have_headers) vendor/nginx-1.15.6/auto/headers (from vendor/nginx-1.15.5/auto/headers) vendor/nginx-1.15.6/auto/include (from vendor/nginx-1.15.5/auto/include) vendor/nginx-1.15.6/auto/init (from vendor/nginx-1.15.5/auto/init) vendor/nginx-1.15.6/auto/install (from vendor/nginx-1.15.5/auto/install) vendor/nginx-1.15.6/auto/lib/conf (from vendor/nginx-1.15.5/auto/lib/conf) vendor/nginx-1.15.6/auto/lib/geoip/conf (from vendor/nginx-1.15.5/auto/lib/geoip/conf) vendor/nginx-1.15.6/auto/lib/google-perftools/conf (from vendor/nginx-1.15.5/auto/lib/google-perftools/conf) vendor/nginx-1.15.6/auto/lib/libatomic/conf (from vendor/nginx-1.15.5/auto/lib/libatomic/conf) vendor/nginx-1.15.6/auto/lib/libatomic/make (from vendor/nginx-1.15.5/auto/lib/libatomic/make) vendor/nginx-1.15.6/auto/lib/libgd/conf (from vendor/nginx-1.15.5/auto/lib/libgd/conf) vendor/nginx-1.15.6/auto/lib/libxslt/conf (from vendor/nginx-1.15.5/auto/lib/libxslt/conf) vendor/nginx-1.15.6/auto/lib/make (from vendor/nginx-1.15.5/auto/lib/make) vendor/nginx-1.15.6/auto/lib/openssl/conf (from vendor/nginx-1.15.5/auto/lib/openssl/conf) vendor/nginx-1.15.6/auto/lib/openssl/make (from vendor/nginx-1.15.5/auto/lib/openssl/make) vendor/nginx-1.15.6/auto/lib/openssl/makefile.bcc (from vendor/nginx-1.15.5/auto/lib/openssl/makefile.bcc) vendor/nginx-1.15.6/auto/lib/openssl/makefile.msvc (from vendor/nginx-1.15.5/auto/lib/openssl/makefile.msvc) vendor/nginx-1.15.6/auto/lib/pcre/conf (from vendor/nginx-1.15.5/auto/lib/pcre/conf) vendor/nginx-1.15.6/auto/lib/pcre/make (from vendor/nginx-1.15.5/auto/lib/pcre/make) vendor/nginx-1.15.6/auto/lib/pcre/makefile.bcc (from vendor/nginx-1.15.5/auto/lib/pcre/makefile.bcc) vendor/nginx-1.15.6/auto/lib/pcre/makefile.msvc (from vendor/nginx-1.15.5/auto/lib/pcre/makefile.msvc) vendor/nginx-1.15.6/auto/lib/pcre/makefile.owc (from vendor/nginx-1.15.5/auto/lib/pcre/makefile.owc) vendor/nginx-1.15.6/auto/lib/perl/conf (from vendor/nginx-1.15.5/auto/lib/perl/conf) vendor/nginx-1.15.6/auto/lib/perl/make (from vendor/nginx-1.15.5/auto/lib/perl/make) vendor/nginx-1.15.6/auto/lib/zlib/conf (from vendor/nginx-1.15.5/auto/lib/zlib/conf) vendor/nginx-1.15.6/auto/lib/zlib/make (from vendor/nginx-1.15.5/auto/lib/zlib/make) vendor/nginx-1.15.6/auto/lib/zlib/makefile.bcc (from vendor/nginx-1.15.5/auto/lib/zlib/makefile.bcc) vendor/nginx-1.15.6/auto/lib/zlib/makefile.msvc (from vendor/nginx-1.15.5/auto/lib/zlib/makefile.msvc) vendor/nginx-1.15.6/auto/lib/zlib/makefile.owc (from vendor/nginx-1.15.5/auto/lib/zlib/makefile.owc) vendor/nginx-1.15.6/auto/make (from vendor/nginx-1.15.5/auto/make) vendor/nginx-1.15.6/auto/module (from vendor/nginx-1.15.5/auto/module) vendor/nginx-1.15.6/auto/modules (from vendor/nginx-1.15.5/auto/modules) vendor/nginx-1.15.6/auto/nohave (from vendor/nginx-1.15.5/auto/nohave) vendor/nginx-1.15.6/auto/options (from vendor/nginx-1.15.5/auto/options) vendor/nginx-1.15.6/auto/os/conf (from vendor/nginx-1.15.5/auto/os/conf) vendor/nginx-1.15.6/auto/os/darwin (from vendor/nginx-1.15.5/auto/os/darwin) vendor/nginx-1.15.6/auto/os/freebsd (from vendor/nginx-1.15.5/auto/os/freebsd) vendor/nginx-1.15.6/auto/os/linux (from vendor/nginx-1.15.5/auto/os/linux) vendor/nginx-1.15.6/auto/os/solaris (from vendor/nginx-1.15.5/auto/os/solaris) vendor/nginx-1.15.6/auto/os/win32 (from vendor/nginx-1.15.5/auto/os/win32) vendor/nginx-1.15.6/auto/sources (from vendor/nginx-1.15.5/auto/sources) vendor/nginx-1.15.6/auto/stubs (from vendor/nginx-1.15.5/auto/stubs) vendor/nginx-1.15.6/auto/summary (from vendor/nginx-1.15.5/auto/summary) vendor/nginx-1.15.6/auto/threads (from vendor/nginx-1.15.5/auto/threads) vendor/nginx-1.15.6/auto/types/sizeof (from vendor/nginx-1.15.5/auto/types/sizeof) vendor/nginx-1.15.6/auto/types/typedef (from vendor/nginx-1.15.5/auto/types/typedef) vendor/nginx-1.15.6/auto/types/uintptr_t (from vendor/nginx-1.15.5/auto/types/uintptr_t) vendor/nginx-1.15.6/auto/types/value (from vendor/nginx-1.15.5/auto/types/value) vendor/nginx-1.15.6/auto/unix (from vendor/nginx-1.15.5/auto/unix) vendor/nginx-1.15.6/conf/fastcgi.conf (from vendor/nginx-1.15.5/conf/fastcgi.conf) vendor/nginx-1.15.6/conf/fastcgi_params (from vendor/nginx-1.15.5/conf/fastcgi_params) vendor/nginx-1.15.6/conf/koi-utf (from vendor/nginx-1.15.5/conf/koi-utf) vendor/nginx-1.15.6/conf/koi-win (from vendor/nginx-1.15.5/conf/koi-win) vendor/nginx-1.15.6/conf/mime.types (from vendor/nginx-1.15.5/conf/mime.types) vendor/nginx-1.15.6/conf/nginx.conf (from vendor/nginx-1.15.5/conf/nginx.conf) vendor/nginx-1.15.6/conf/scgi_params (from vendor/nginx-1.15.5/conf/scgi_params) vendor/nginx-1.15.6/conf/uwsgi_params (from vendor/nginx-1.15.5/conf/uwsgi_params) vendor/nginx-1.15.6/conf/win-utf (from vendor/nginx-1.15.5/conf/win-utf) vendor/nginx-1.15.6/contrib/README (from vendor/nginx-1.15.5/contrib/README) vendor/nginx-1.15.6/contrib/geo2nginx.pl (from vendor/nginx-1.15.5/contrib/geo2nginx.pl) vendor/nginx-1.15.6/contrib/unicode2nginx/koi-utf (from vendor/nginx-1.15.5/contrib/unicode2nginx/koi-utf) vendor/nginx-1.15.6/contrib/unicode2nginx/unicode-to-nginx.pl (from vendor/nginx-1.15.5/contrib/unicode2nginx/unicode-to-nginx.pl) vendor/nginx-1.15.6/contrib/unicode2nginx/win-utf (from vendor/nginx-1.15.5/contrib/unicode2nginx/win-utf) vendor/nginx-1.15.6/contrib/vim/ftdetect/nginx.vim (from vendor/nginx-1.15.5/contrib/vim/ftdetect/nginx.vim) vendor/nginx-1.15.6/contrib/vim/ftplugin/nginx.vim (from vendor/nginx-1.15.5/contrib/vim/ftplugin/nginx.vim) vendor/nginx-1.15.6/contrib/vim/indent/nginx.vim (from vendor/nginx-1.15.5/contrib/vim/indent/nginx.vim) vendor/nginx-1.15.6/contrib/vim/syntax/nginx.vim (from vendor/nginx-1.15.5/contrib/vim/syntax/nginx.vim) vendor/nginx-1.15.6/docs/GNUmakefile (from vendor/nginx-1.15.5/docs/GNUmakefile) vendor/nginx-1.15.6/docs/dtd/change_log_conf.dtd (from vendor/nginx-1.15.5/docs/dtd/change_log_conf.dtd) vendor/nginx-1.15.6/docs/dtd/changes.dtd (from vendor/nginx-1.15.5/docs/dtd/changes.dtd) vendor/nginx-1.15.6/docs/html/50x.html (from vendor/nginx-1.15.5/docs/html/50x.html) vendor/nginx-1.15.6/docs/html/index.html (from vendor/nginx-1.15.5/docs/html/index.html) vendor/nginx-1.15.6/docs/man/nginx.8 (from vendor/nginx-1.15.5/docs/man/nginx.8) vendor/nginx-1.15.6/docs/text/LICENSE (from vendor/nginx-1.15.5/docs/text/LICENSE) vendor/nginx-1.15.6/docs/text/README (from vendor/nginx-1.15.5/docs/text/README) vendor/nginx-1.15.6/docs/xml/change_log_conf.xml (from vendor/nginx-1.15.5/docs/xml/change_log_conf.xml) vendor/nginx-1.15.6/docs/xml/nginx/changes.xml (from vendor/nginx-1.15.5/docs/xml/nginx/changes.xml) vendor/nginx-1.15.6/docs/xsls/changes.xsls (from vendor/nginx-1.15.5/docs/xsls/changes.xsls) vendor/nginx-1.15.6/docs/xslt/changes.xslt (from vendor/nginx-1.15.5/docs/xslt/changes.xslt) vendor/nginx-1.15.6/misc/GNUmakefile (from vendor/nginx-1.15.5/misc/GNUmakefile) vendor/nginx-1.15.6/misc/README (from vendor/nginx-1.15.5/misc/README) vendor/nginx-1.15.6/src/core/nginx.c (from vendor/nginx-1.15.5/src/core/nginx.c) vendor/nginx-1.15.6/src/core/nginx.h (from vendor/nginx-1.15.5/src/core/nginx.h) vendor/nginx-1.15.6/src/core/ngx_array.c (from vendor/nginx-1.15.5/src/core/ngx_array.c) vendor/nginx-1.15.6/src/core/ngx_array.h (from vendor/nginx-1.15.5/src/core/ngx_array.h) vendor/nginx-1.15.6/src/core/ngx_buf.c (from vendor/nginx-1.15.5/src/core/ngx_buf.c) vendor/nginx-1.15.6/src/core/ngx_buf.h (from vendor/nginx-1.15.5/src/core/ngx_buf.h) vendor/nginx-1.15.6/src/core/ngx_conf_file.c (from vendor/nginx-1.15.5/src/core/ngx_conf_file.c) vendor/nginx-1.15.6/src/core/ngx_conf_file.h (from vendor/nginx-1.15.5/src/core/ngx_conf_file.h) vendor/nginx-1.15.6/src/core/ngx_config.h (from vendor/nginx-1.15.5/src/core/ngx_config.h) vendor/nginx-1.15.6/src/core/ngx_connection.c (from vendor/nginx-1.15.5/src/core/ngx_connection.c) vendor/nginx-1.15.6/src/core/ngx_connection.h (from vendor/nginx-1.15.5/src/core/ngx_connection.h) vendor/nginx-1.15.6/src/core/ngx_core.h (from vendor/nginx-1.15.5/src/core/ngx_core.h) vendor/nginx-1.15.6/src/core/ngx_cpuinfo.c (from vendor/nginx-1.15.5/src/core/ngx_cpuinfo.c) vendor/nginx-1.15.6/src/core/ngx_crc.h (from vendor/nginx-1.15.5/src/core/ngx_crc.h) vendor/nginx-1.15.6/src/core/ngx_crc32.c (from vendor/nginx-1.15.5/src/core/ngx_crc32.c) vendor/nginx-1.15.6/src/core/ngx_crc32.h (from vendor/nginx-1.15.5/src/core/ngx_crc32.h) vendor/nginx-1.15.6/src/core/ngx_crypt.c (from vendor/nginx-1.15.5/src/core/ngx_crypt.c) vendor/nginx-1.15.6/src/core/ngx_crypt.h (from vendor/nginx-1.15.5/src/core/ngx_crypt.h) vendor/nginx-1.15.6/src/core/ngx_cycle.c (from vendor/nginx-1.15.5/src/core/ngx_cycle.c) vendor/nginx-1.15.6/src/core/ngx_cycle.h (from vendor/nginx-1.15.5/src/core/ngx_cycle.h) vendor/nginx-1.15.6/src/core/ngx_file.c (from vendor/nginx-1.15.5/src/core/ngx_file.c) vendor/nginx-1.15.6/src/core/ngx_file.h (from vendor/nginx-1.15.5/src/core/ngx_file.h) vendor/nginx-1.15.6/src/core/ngx_hash.c (from vendor/nginx-1.15.5/src/core/ngx_hash.c) vendor/nginx-1.15.6/src/core/ngx_hash.h (from vendor/nginx-1.15.5/src/core/ngx_hash.h) vendor/nginx-1.15.6/src/core/ngx_inet.c (from vendor/nginx-1.15.5/src/core/ngx_inet.c) vendor/nginx-1.15.6/src/core/ngx_inet.h (from vendor/nginx-1.15.5/src/core/ngx_inet.h) vendor/nginx-1.15.6/src/core/ngx_list.c (from vendor/nginx-1.15.5/src/core/ngx_list.c) vendor/nginx-1.15.6/src/core/ngx_list.h (from vendor/nginx-1.15.5/src/core/ngx_list.h) vendor/nginx-1.15.6/src/core/ngx_log.c (from vendor/nginx-1.15.5/src/core/ngx_log.c) vendor/nginx-1.15.6/src/core/ngx_log.h (from vendor/nginx-1.15.5/src/core/ngx_log.h) vendor/nginx-1.15.6/src/core/ngx_md5.c (from vendor/nginx-1.15.5/src/core/ngx_md5.c) vendor/nginx-1.15.6/src/core/ngx_md5.h (from vendor/nginx-1.15.5/src/core/ngx_md5.h) vendor/nginx-1.15.6/src/core/ngx_module.c (from vendor/nginx-1.15.5/src/core/ngx_module.c) vendor/nginx-1.15.6/src/core/ngx_module.h (from vendor/nginx-1.15.5/src/core/ngx_module.h) vendor/nginx-1.15.6/src/core/ngx_murmurhash.c (from vendor/nginx-1.15.5/src/core/ngx_murmurhash.c) vendor/nginx-1.15.6/src/core/ngx_murmurhash.h (from vendor/nginx-1.15.5/src/core/ngx_murmurhash.h) vendor/nginx-1.15.6/src/core/ngx_open_file_cache.c (from vendor/nginx-1.15.5/src/core/ngx_open_file_cache.c) vendor/nginx-1.15.6/src/core/ngx_open_file_cache.h (from vendor/nginx-1.15.5/src/core/ngx_open_file_cache.h) vendor/nginx-1.15.6/src/core/ngx_output_chain.c (from vendor/nginx-1.15.5/src/core/ngx_output_chain.c) vendor/nginx-1.15.6/src/core/ngx_palloc.c (from vendor/nginx-1.15.5/src/core/ngx_palloc.c) vendor/nginx-1.15.6/src/core/ngx_palloc.h (from vendor/nginx-1.15.5/src/core/ngx_palloc.h) vendor/nginx-1.15.6/src/core/ngx_parse.c (from vendor/nginx-1.15.5/src/core/ngx_parse.c) vendor/nginx-1.15.6/src/core/ngx_parse.h (from vendor/nginx-1.15.5/src/core/ngx_parse.h) vendor/nginx-1.15.6/src/core/ngx_parse_time.c (from vendor/nginx-1.15.5/src/core/ngx_parse_time.c) vendor/nginx-1.15.6/src/core/ngx_parse_time.h (from vendor/nginx-1.15.5/src/core/ngx_parse_time.h) vendor/nginx-1.15.6/src/core/ngx_proxy_protocol.c (from vendor/nginx-1.15.5/src/core/ngx_proxy_protocol.c) vendor/nginx-1.15.6/src/core/ngx_proxy_protocol.h (from vendor/nginx-1.15.5/src/core/ngx_proxy_protocol.h) vendor/nginx-1.15.6/src/core/ngx_queue.c (from vendor/nginx-1.15.5/src/core/ngx_queue.c) vendor/nginx-1.15.6/src/core/ngx_queue.h (from vendor/nginx-1.15.5/src/core/ngx_queue.h) vendor/nginx-1.15.6/src/core/ngx_radix_tree.c (from vendor/nginx-1.15.5/src/core/ngx_radix_tree.c) vendor/nginx-1.15.6/src/core/ngx_radix_tree.h (from vendor/nginx-1.15.5/src/core/ngx_radix_tree.h) vendor/nginx-1.15.6/src/core/ngx_rbtree.c (from vendor/nginx-1.15.5/src/core/ngx_rbtree.c) vendor/nginx-1.15.6/src/core/ngx_rbtree.h (from vendor/nginx-1.15.5/src/core/ngx_rbtree.h) vendor/nginx-1.15.6/src/core/ngx_regex.c (from vendor/nginx-1.15.5/src/core/ngx_regex.c) vendor/nginx-1.15.6/src/core/ngx_regex.h (from vendor/nginx-1.15.5/src/core/ngx_regex.h) vendor/nginx-1.15.6/src/core/ngx_resolver.c (from vendor/nginx-1.15.5/src/core/ngx_resolver.c) vendor/nginx-1.15.6/src/core/ngx_resolver.h (from vendor/nginx-1.15.5/src/core/ngx_resolver.h) vendor/nginx-1.15.6/src/core/ngx_rwlock.c (from vendor/nginx-1.15.5/src/core/ngx_rwlock.c) vendor/nginx-1.15.6/src/core/ngx_rwlock.h (from vendor/nginx-1.15.5/src/core/ngx_rwlock.h) vendor/nginx-1.15.6/src/core/ngx_sha1.c (from vendor/nginx-1.15.5/src/core/ngx_sha1.c) vendor/nginx-1.15.6/src/core/ngx_sha1.h (from vendor/nginx-1.15.5/src/core/ngx_sha1.h) vendor/nginx-1.15.6/src/core/ngx_shmtx.c (from vendor/nginx-1.15.5/src/core/ngx_shmtx.c) vendor/nginx-1.15.6/src/core/ngx_shmtx.h (from vendor/nginx-1.15.5/src/core/ngx_shmtx.h) vendor/nginx-1.15.6/src/core/ngx_slab.c (from vendor/nginx-1.15.5/src/core/ngx_slab.c) vendor/nginx-1.15.6/src/core/ngx_slab.h (from vendor/nginx-1.15.5/src/core/ngx_slab.h) vendor/nginx-1.15.6/src/core/ngx_spinlock.c (from vendor/nginx-1.15.5/src/core/ngx_spinlock.c) vendor/nginx-1.15.6/src/core/ngx_string.c (from vendor/nginx-1.15.5/src/core/ngx_string.c) vendor/nginx-1.15.6/src/core/ngx_string.h (from vendor/nginx-1.15.5/src/core/ngx_string.h) vendor/nginx-1.15.6/src/core/ngx_syslog.c (from vendor/nginx-1.15.5/src/core/ngx_syslog.c) vendor/nginx-1.15.6/src/core/ngx_syslog.h (from vendor/nginx-1.15.5/src/core/ngx_syslog.h) vendor/nginx-1.15.6/src/core/ngx_thread_pool.c (from vendor/nginx-1.15.5/src/core/ngx_thread_pool.c) vendor/nginx-1.15.6/src/core/ngx_thread_pool.h (from vendor/nginx-1.15.5/src/core/ngx_thread_pool.h) vendor/nginx-1.15.6/src/core/ngx_times.c (from vendor/nginx-1.15.5/src/core/ngx_times.c) vendor/nginx-1.15.6/src/core/ngx_times.h (from vendor/nginx-1.15.5/src/core/ngx_times.h) vendor/nginx-1.15.6/src/event/modules/ngx_devpoll_module.c (from vendor/nginx-1.15.5/src/event/modules/ngx_devpoll_module.c) vendor/nginx-1.15.6/src/event/modules/ngx_epoll_module.c (from vendor/nginx-1.15.5/src/event/modules/ngx_epoll_module.c) vendor/nginx-1.15.6/src/event/modules/ngx_eventport_module.c (from vendor/nginx-1.15.5/src/event/modules/ngx_eventport_module.c) vendor/nginx-1.15.6/src/event/modules/ngx_iocp_module.c (from vendor/nginx-1.15.5/src/event/modules/ngx_iocp_module.c) vendor/nginx-1.15.6/src/event/modules/ngx_iocp_module.h (from vendor/nginx-1.15.5/src/event/modules/ngx_iocp_module.h) vendor/nginx-1.15.6/src/event/modules/ngx_kqueue_module.c (from vendor/nginx-1.15.5/src/event/modules/ngx_kqueue_module.c) vendor/nginx-1.15.6/src/event/modules/ngx_poll_module.c (from vendor/nginx-1.15.5/src/event/modules/ngx_poll_module.c) vendor/nginx-1.15.6/src/event/modules/ngx_select_module.c (from vendor/nginx-1.15.5/src/event/modules/ngx_select_module.c) vendor/nginx-1.15.6/src/event/modules/ngx_win32_select_module.c (from vendor/nginx-1.15.5/src/event/modules/ngx_win32_select_module.c) vendor/nginx-1.15.6/src/event/ngx_event.c (from vendor/nginx-1.15.5/src/event/ngx_event.c) vendor/nginx-1.15.6/src/event/ngx_event.h (from vendor/nginx-1.15.5/src/event/ngx_event.h) vendor/nginx-1.15.6/src/event/ngx_event_accept.c (from vendor/nginx-1.15.5/src/event/ngx_event_accept.c) vendor/nginx-1.15.6/src/event/ngx_event_acceptex.c (from vendor/nginx-1.15.5/src/event/ngx_event_acceptex.c) vendor/nginx-1.15.6/src/event/ngx_event_connect.c (from vendor/nginx-1.15.5/src/event/ngx_event_connect.c) vendor/nginx-1.15.6/src/event/ngx_event_connect.h (from vendor/nginx-1.15.5/src/event/ngx_event_connect.h) vendor/nginx-1.15.6/src/event/ngx_event_connectex.c (from vendor/nginx-1.15.5/src/event/ngx_event_connectex.c) vendor/nginx-1.15.6/src/event/ngx_event_openssl.c (from vendor/nginx-1.15.5/src/event/ngx_event_openssl.c) vendor/nginx-1.15.6/src/event/ngx_event_openssl.h (from vendor/nginx-1.15.5/src/event/ngx_event_openssl.h) vendor/nginx-1.15.6/src/event/ngx_event_openssl_stapling.c (from vendor/nginx-1.15.5/src/event/ngx_event_openssl_stapling.c) vendor/nginx-1.15.6/src/event/ngx_event_pipe.c (from vendor/nginx-1.15.5/src/event/ngx_event_pipe.c) vendor/nginx-1.15.6/src/event/ngx_event_pipe.h (from vendor/nginx-1.15.5/src/event/ngx_event_pipe.h) vendor/nginx-1.15.6/src/event/ngx_event_posted.c (from vendor/nginx-1.15.5/src/event/ngx_event_posted.c) vendor/nginx-1.15.6/src/event/ngx_event_posted.h (from vendor/nginx-1.15.5/src/event/ngx_event_posted.h) vendor/nginx-1.15.6/src/event/ngx_event_timer.c (from vendor/nginx-1.15.5/src/event/ngx_event_timer.c) vendor/nginx-1.15.6/src/event/ngx_event_timer.h (from vendor/nginx-1.15.5/src/event/ngx_event_timer.h) vendor/nginx-1.15.6/src/event/ngx_event_udp.c (from vendor/nginx-1.15.5/src/event/ngx_event_udp.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_access_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_access_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_addition_filter_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_addition_filter_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_auth_basic_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_auth_basic_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_auth_request_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_auth_request_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_autoindex_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_autoindex_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_browser_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_browser_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_charset_filter_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_charset_filter_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_chunked_filter_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_chunked_filter_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_dav_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_dav_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_degradation_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_degradation_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_empty_gif_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_empty_gif_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_fastcgi_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_fastcgi_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_flv_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_flv_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_geo_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_geo_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_geoip_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_geoip_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_grpc_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_grpc_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_gunzip_filter_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_gunzip_filter_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_gzip_filter_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_gzip_filter_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_gzip_static_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_gzip_static_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_headers_filter_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_headers_filter_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_image_filter_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_image_filter_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_index_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_index_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_limit_conn_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_limit_conn_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_limit_req_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_limit_req_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_log_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_log_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_map_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_map_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_memcached_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_memcached_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_mirror_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_mirror_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_mp4_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_mp4_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_not_modified_filter_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_not_modified_filter_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_proxy_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_proxy_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_random_index_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_random_index_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_range_filter_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_range_filter_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_realip_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_realip_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_referer_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_referer_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_rewrite_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_rewrite_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_scgi_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_scgi_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_secure_link_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_secure_link_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_slice_filter_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_slice_filter_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_split_clients_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_split_clients_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_ssi_filter_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_ssi_filter_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_ssi_filter_module.h (from vendor/nginx-1.15.5/src/http/modules/ngx_http_ssi_filter_module.h) vendor/nginx-1.15.6/src/http/modules/ngx_http_ssl_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_ssl_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_ssl_module.h (from vendor/nginx-1.15.5/src/http/modules/ngx_http_ssl_module.h) vendor/nginx-1.15.6/src/http/modules/ngx_http_static_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_static_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_stub_status_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_stub_status_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_sub_filter_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_sub_filter_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_try_files_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_try_files_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_upstream_hash_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_upstream_hash_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_upstream_ip_hash_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_upstream_ip_hash_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_upstream_keepalive_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_upstream_keepalive_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_upstream_least_conn_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_upstream_least_conn_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_upstream_random_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_upstream_random_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_upstream_zone_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_upstream_zone_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_userid_filter_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_userid_filter_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_uwsgi_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_uwsgi_module.c) vendor/nginx-1.15.6/src/http/modules/ngx_http_xslt_filter_module.c (from vendor/nginx-1.15.5/src/http/modules/ngx_http_xslt_filter_module.c) vendor/nginx-1.15.6/src/http/modules/perl/Makefile.PL (from vendor/nginx-1.15.5/src/http/modules/perl/Makefile.PL) vendor/nginx-1.15.6/src/http/modules/perl/nginx.pm (from vendor/nginx-1.15.5/src/http/modules/perl/nginx.pm) vendor/nginx-1.15.6/src/http/modules/perl/nginx.xs (from vendor/nginx-1.15.5/src/http/modules/perl/nginx.xs) vendor/nginx-1.15.6/src/http/modules/perl/ngx_http_perl_module.c (from vendor/nginx-1.15.5/src/http/modules/perl/ngx_http_perl_module.c) vendor/nginx-1.15.6/src/http/modules/perl/ngx_http_perl_module.h (from vendor/nginx-1.15.5/src/http/modules/perl/ngx_http_perl_module.h) vendor/nginx-1.15.6/src/http/modules/perl/typemap (from vendor/nginx-1.15.5/src/http/modules/perl/typemap) vendor/nginx-1.15.6/src/http/ngx_http.c (from vendor/nginx-1.15.5/src/http/ngx_http.c) vendor/nginx-1.15.6/src/http/ngx_http.h (from vendor/nginx-1.15.5/src/http/ngx_http.h) vendor/nginx-1.15.6/src/http/ngx_http_cache.h (from vendor/nginx-1.15.5/src/http/ngx_http_cache.h) vendor/nginx-1.15.6/src/http/ngx_http_config.h (from vendor/nginx-1.15.5/src/http/ngx_http_config.h) vendor/nginx-1.15.6/src/http/ngx_http_copy_filter_module.c (from vendor/nginx-1.15.5/src/http/ngx_http_copy_filter_module.c) vendor/nginx-1.15.6/src/http/ngx_http_core_module.c (from vendor/nginx-1.15.5/src/http/ngx_http_core_module.c) vendor/nginx-1.15.6/src/http/ngx_http_core_module.h (from vendor/nginx-1.15.5/src/http/ngx_http_core_module.h) vendor/nginx-1.15.6/src/http/ngx_http_file_cache.c (from vendor/nginx-1.15.5/src/http/ngx_http_file_cache.c) vendor/nginx-1.15.6/src/http/ngx_http_header_filter_module.c (from vendor/nginx-1.15.5/src/http/ngx_http_header_filter_module.c) vendor/nginx-1.15.6/src/http/ngx_http_parse.c (from vendor/nginx-1.15.5/src/http/ngx_http_parse.c) vendor/nginx-1.15.6/src/http/ngx_http_postpone_filter_module.c (from vendor/nginx-1.15.5/src/http/ngx_http_postpone_filter_module.c) vendor/nginx-1.15.6/src/http/ngx_http_request.c (from vendor/nginx-1.15.5/src/http/ngx_http_request.c) vendor/nginx-1.15.6/src/http/ngx_http_request.h (from vendor/nginx-1.15.5/src/http/ngx_http_request.h) vendor/nginx-1.15.6/src/http/ngx_http_request_body.c (from vendor/nginx-1.15.5/src/http/ngx_http_request_body.c) vendor/nginx-1.15.6/src/http/ngx_http_script.c (from vendor/nginx-1.15.5/src/http/ngx_http_script.c) vendor/nginx-1.15.6/src/http/ngx_http_script.h (from vendor/nginx-1.15.5/src/http/ngx_http_script.h) vendor/nginx-1.15.6/src/http/ngx_http_special_response.c (from vendor/nginx-1.15.5/src/http/ngx_http_special_response.c) vendor/nginx-1.15.6/src/http/ngx_http_upstream.c (from vendor/nginx-1.15.5/src/http/ngx_http_upstream.c) vendor/nginx-1.15.6/src/http/ngx_http_upstream.h (from vendor/nginx-1.15.5/src/http/ngx_http_upstream.h) vendor/nginx-1.15.6/src/http/ngx_http_upstream_round_robin.c (from vendor/nginx-1.15.5/src/http/ngx_http_upstream_round_robin.c) vendor/nginx-1.15.6/src/http/ngx_http_upstream_round_robin.h (from vendor/nginx-1.15.5/src/http/ngx_http_upstream_round_robin.h) vendor/nginx-1.15.6/src/http/ngx_http_variables.c (from vendor/nginx-1.15.5/src/http/ngx_http_variables.c) vendor/nginx-1.15.6/src/http/ngx_http_variables.h (from vendor/nginx-1.15.5/src/http/ngx_http_variables.h) vendor/nginx-1.15.6/src/http/ngx_http_write_filter_module.c (from vendor/nginx-1.15.5/src/http/ngx_http_write_filter_module.c) vendor/nginx-1.15.6/src/http/v2/ngx_http_v2.c (from vendor/nginx-1.15.5/src/http/v2/ngx_http_v2.c) vendor/nginx-1.15.6/src/http/v2/ngx_http_v2.h (from vendor/nginx-1.15.5/src/http/v2/ngx_http_v2.h) vendor/nginx-1.15.6/src/http/v2/ngx_http_v2_encode.c (from vendor/nginx-1.15.5/src/http/v2/ngx_http_v2_encode.c) vendor/nginx-1.15.6/src/http/v2/ngx_http_v2_filter_module.c (from vendor/nginx-1.15.5/src/http/v2/ngx_http_v2_filter_module.c) vendor/nginx-1.15.6/src/http/v2/ngx_http_v2_huff_decode.c (from vendor/nginx-1.15.5/src/http/v2/ngx_http_v2_huff_decode.c) vendor/nginx-1.15.6/src/http/v2/ngx_http_v2_huff_encode.c (from vendor/nginx-1.15.5/src/http/v2/ngx_http_v2_huff_encode.c) vendor/nginx-1.15.6/src/http/v2/ngx_http_v2_module.c (from vendor/nginx-1.15.5/src/http/v2/ngx_http_v2_module.c) vendor/nginx-1.15.6/src/http/v2/ngx_http_v2_module.h (from vendor/nginx-1.15.5/src/http/v2/ngx_http_v2_module.h) vendor/nginx-1.15.6/src/http/v2/ngx_http_v2_table.c (from vendor/nginx-1.15.5/src/http/v2/ngx_http_v2_table.c) vendor/nginx-1.15.6/src/mail/ngx_mail.c (from vendor/nginx-1.15.5/src/mail/ngx_mail.c) vendor/nginx-1.15.6/src/mail/ngx_mail.h (from vendor/nginx-1.15.5/src/mail/ngx_mail.h) vendor/nginx-1.15.6/src/mail/ngx_mail_auth_http_module.c (from vendor/nginx-1.15.5/src/mail/ngx_mail_auth_http_module.c) vendor/nginx-1.15.6/src/mail/ngx_mail_core_module.c (from vendor/nginx-1.15.5/src/mail/ngx_mail_core_module.c) vendor/nginx-1.15.6/src/mail/ngx_mail_handler.c (from vendor/nginx-1.15.5/src/mail/ngx_mail_handler.c) vendor/nginx-1.15.6/src/mail/ngx_mail_imap_handler.c (from vendor/nginx-1.15.5/src/mail/ngx_mail_imap_handler.c) vendor/nginx-1.15.6/src/mail/ngx_mail_imap_module.c (from vendor/nginx-1.15.5/src/mail/ngx_mail_imap_module.c) vendor/nginx-1.15.6/src/mail/ngx_mail_imap_module.h (from vendor/nginx-1.15.5/src/mail/ngx_mail_imap_module.h) vendor/nginx-1.15.6/src/mail/ngx_mail_parse.c (from vendor/nginx-1.15.5/src/mail/ngx_mail_parse.c) vendor/nginx-1.15.6/src/mail/ngx_mail_pop3_handler.c (from vendor/nginx-1.15.5/src/mail/ngx_mail_pop3_handler.c) vendor/nginx-1.15.6/src/mail/ngx_mail_pop3_module.c (from vendor/nginx-1.15.5/src/mail/ngx_mail_pop3_module.c) vendor/nginx-1.15.6/src/mail/ngx_mail_pop3_module.h (from vendor/nginx-1.15.5/src/mail/ngx_mail_pop3_module.h) vendor/nginx-1.15.6/src/mail/ngx_mail_proxy_module.c (from vendor/nginx-1.15.5/src/mail/ngx_mail_proxy_module.c) vendor/nginx-1.15.6/src/mail/ngx_mail_smtp_handler.c (from vendor/nginx-1.15.5/src/mail/ngx_mail_smtp_handler.c) vendor/nginx-1.15.6/src/mail/ngx_mail_smtp_module.c (from vendor/nginx-1.15.5/src/mail/ngx_mail_smtp_module.c) vendor/nginx-1.15.6/src/mail/ngx_mail_smtp_module.h (from vendor/nginx-1.15.5/src/mail/ngx_mail_smtp_module.h) vendor/nginx-1.15.6/src/mail/ngx_mail_ssl_module.c (from vendor/nginx-1.15.5/src/mail/ngx_mail_ssl_module.c) vendor/nginx-1.15.6/src/mail/ngx_mail_ssl_module.h (from vendor/nginx-1.15.5/src/mail/ngx_mail_ssl_module.h) vendor/nginx-1.15.6/src/misc/ngx_cpp_test_module.cpp (from vendor/nginx-1.15.5/src/misc/ngx_cpp_test_module.cpp) vendor/nginx-1.15.6/src/misc/ngx_google_perftools_module.c (from vendor/nginx-1.15.5/src/misc/ngx_google_perftools_module.c) vendor/nginx-1.15.6/src/os/unix/ngx_alloc.c (from vendor/nginx-1.15.5/src/os/unix/ngx_alloc.c) vendor/nginx-1.15.6/src/os/unix/ngx_alloc.h (from vendor/nginx-1.15.5/src/os/unix/ngx_alloc.h) vendor/nginx-1.15.6/src/os/unix/ngx_atomic.h (from vendor/nginx-1.15.5/src/os/unix/ngx_atomic.h) vendor/nginx-1.15.6/src/os/unix/ngx_channel.c (from vendor/nginx-1.15.5/src/os/unix/ngx_channel.c) vendor/nginx-1.15.6/src/os/unix/ngx_channel.h (from vendor/nginx-1.15.5/src/os/unix/ngx_channel.h) vendor/nginx-1.15.6/src/os/unix/ngx_daemon.c (from vendor/nginx-1.15.5/src/os/unix/ngx_daemon.c) vendor/nginx-1.15.6/src/os/unix/ngx_darwin.h (from vendor/nginx-1.15.5/src/os/unix/ngx_darwin.h) vendor/nginx-1.15.6/src/os/unix/ngx_darwin_config.h (from vendor/nginx-1.15.5/src/os/unix/ngx_darwin_config.h) vendor/nginx-1.15.6/src/os/unix/ngx_darwin_init.c (from vendor/nginx-1.15.5/src/os/unix/ngx_darwin_init.c) vendor/nginx-1.15.6/src/os/unix/ngx_darwin_sendfile_chain.c (from vendor/nginx-1.15.5/src/os/unix/ngx_darwin_sendfile_chain.c) vendor/nginx-1.15.6/src/os/unix/ngx_dlopen.c (from vendor/nginx-1.15.5/src/os/unix/ngx_dlopen.c) vendor/nginx-1.15.6/src/os/unix/ngx_dlopen.h (from vendor/nginx-1.15.5/src/os/unix/ngx_dlopen.h) vendor/nginx-1.15.6/src/os/unix/ngx_errno.c (from vendor/nginx-1.15.5/src/os/unix/ngx_errno.c) vendor/nginx-1.15.6/src/os/unix/ngx_errno.h (from vendor/nginx-1.15.5/src/os/unix/ngx_errno.h) vendor/nginx-1.15.6/src/os/unix/ngx_file_aio_read.c (from vendor/nginx-1.15.5/src/os/unix/ngx_file_aio_read.c) vendor/nginx-1.15.6/src/os/unix/ngx_files.c (from vendor/nginx-1.15.5/src/os/unix/ngx_files.c) vendor/nginx-1.15.6/src/os/unix/ngx_files.h (from vendor/nginx-1.15.5/src/os/unix/ngx_files.h) vendor/nginx-1.15.6/src/os/unix/ngx_freebsd.h (from vendor/nginx-1.15.5/src/os/unix/ngx_freebsd.h) vendor/nginx-1.15.6/src/os/unix/ngx_freebsd_config.h (from vendor/nginx-1.15.5/src/os/unix/ngx_freebsd_config.h) vendor/nginx-1.15.6/src/os/unix/ngx_freebsd_init.c (from vendor/nginx-1.15.5/src/os/unix/ngx_freebsd_init.c) vendor/nginx-1.15.6/src/os/unix/ngx_freebsd_sendfile_chain.c (from vendor/nginx-1.15.5/src/os/unix/ngx_freebsd_sendfile_chain.c) vendor/nginx-1.15.6/src/os/unix/ngx_gcc_atomic_amd64.h (from vendor/nginx-1.15.5/src/os/unix/ngx_gcc_atomic_amd64.h) vendor/nginx-1.15.6/src/os/unix/ngx_gcc_atomic_ppc.h (from vendor/nginx-1.15.5/src/os/unix/ngx_gcc_atomic_ppc.h) vendor/nginx-1.15.6/src/os/unix/ngx_gcc_atomic_sparc64.h (from vendor/nginx-1.15.5/src/os/unix/ngx_gcc_atomic_sparc64.h) vendor/nginx-1.15.6/src/os/unix/ngx_gcc_atomic_x86.h (from vendor/nginx-1.15.5/src/os/unix/ngx_gcc_atomic_x86.h) vendor/nginx-1.15.6/src/os/unix/ngx_linux.h (from vendor/nginx-1.15.5/src/os/unix/ngx_linux.h) vendor/nginx-1.15.6/src/os/unix/ngx_linux_aio_read.c (from vendor/nginx-1.15.5/src/os/unix/ngx_linux_aio_read.c) vendor/nginx-1.15.6/src/os/unix/ngx_linux_config.h (from vendor/nginx-1.15.5/src/os/unix/ngx_linux_config.h) vendor/nginx-1.15.6/src/os/unix/ngx_linux_init.c (from vendor/nginx-1.15.5/src/os/unix/ngx_linux_init.c) vendor/nginx-1.15.6/src/os/unix/ngx_linux_sendfile_chain.c (from vendor/nginx-1.15.5/src/os/unix/ngx_linux_sendfile_chain.c) vendor/nginx-1.15.6/src/os/unix/ngx_os.h (from vendor/nginx-1.15.5/src/os/unix/ngx_os.h) vendor/nginx-1.15.6/src/os/unix/ngx_posix_config.h (from vendor/nginx-1.15.5/src/os/unix/ngx_posix_config.h) vendor/nginx-1.15.6/src/os/unix/ngx_posix_init.c (from vendor/nginx-1.15.5/src/os/unix/ngx_posix_init.c) vendor/nginx-1.15.6/src/os/unix/ngx_process.c (from vendor/nginx-1.15.5/src/os/unix/ngx_process.c) vendor/nginx-1.15.6/src/os/unix/ngx_process.h (from vendor/nginx-1.15.5/src/os/unix/ngx_process.h) vendor/nginx-1.15.6/src/os/unix/ngx_process_cycle.c (from vendor/nginx-1.15.5/src/os/unix/ngx_process_cycle.c) vendor/nginx-1.15.6/src/os/unix/ngx_process_cycle.h (from vendor/nginx-1.15.5/src/os/unix/ngx_process_cycle.h) vendor/nginx-1.15.6/src/os/unix/ngx_readv_chain.c (from vendor/nginx-1.15.5/src/os/unix/ngx_readv_chain.c) vendor/nginx-1.15.6/src/os/unix/ngx_recv.c (from vendor/nginx-1.15.5/src/os/unix/ngx_recv.c) vendor/nginx-1.15.6/src/os/unix/ngx_send.c (from vendor/nginx-1.15.5/src/os/unix/ngx_send.c) vendor/nginx-1.15.6/src/os/unix/ngx_setaffinity.c (from vendor/nginx-1.15.5/src/os/unix/ngx_setaffinity.c) vendor/nginx-1.15.6/src/os/unix/ngx_setaffinity.h (from vendor/nginx-1.15.5/src/os/unix/ngx_setaffinity.h) vendor/nginx-1.15.6/src/os/unix/ngx_setproctitle.c (from vendor/nginx-1.15.5/src/os/unix/ngx_setproctitle.c) vendor/nginx-1.15.6/src/os/unix/ngx_setproctitle.h (from vendor/nginx-1.15.5/src/os/unix/ngx_setproctitle.h) vendor/nginx-1.15.6/src/os/unix/ngx_shmem.c (from vendor/nginx-1.15.5/src/os/unix/ngx_shmem.c) vendor/nginx-1.15.6/src/os/unix/ngx_shmem.h (from vendor/nginx-1.15.5/src/os/unix/ngx_shmem.h) vendor/nginx-1.15.6/src/os/unix/ngx_socket.c (from vendor/nginx-1.15.5/src/os/unix/ngx_socket.c) vendor/nginx-1.15.6/src/os/unix/ngx_socket.h (from vendor/nginx-1.15.5/src/os/unix/ngx_socket.h) vendor/nginx-1.15.6/src/os/unix/ngx_solaris.h (from vendor/nginx-1.15.5/src/os/unix/ngx_solaris.h) vendor/nginx-1.15.6/src/os/unix/ngx_solaris_config.h (from vendor/nginx-1.15.5/src/os/unix/ngx_solaris_config.h) vendor/nginx-1.15.6/src/os/unix/ngx_solaris_init.c (from vendor/nginx-1.15.5/src/os/unix/ngx_solaris_init.c) vendor/nginx-1.15.6/src/os/unix/ngx_solaris_sendfilev_chain.c (from vendor/nginx-1.15.5/src/os/unix/ngx_solaris_sendfilev_chain.c) vendor/nginx-1.15.6/src/os/unix/ngx_sunpro_amd64.il (from vendor/nginx-1.15.5/src/os/unix/ngx_sunpro_amd64.il) vendor/nginx-1.15.6/src/os/unix/ngx_sunpro_atomic_sparc64.h (from vendor/nginx-1.15.5/src/os/unix/ngx_sunpro_atomic_sparc64.h) vendor/nginx-1.15.6/src/os/unix/ngx_sunpro_sparc64.il (from vendor/nginx-1.15.5/src/os/unix/ngx_sunpro_sparc64.il) vendor/nginx-1.15.6/src/os/unix/ngx_sunpro_x86.il (from vendor/nginx-1.15.5/src/os/unix/ngx_sunpro_x86.il) vendor/nginx-1.15.6/src/os/unix/ngx_thread.h (from vendor/nginx-1.15.5/src/os/unix/ngx_thread.h) vendor/nginx-1.15.6/src/os/unix/ngx_thread_cond.c (from vendor/nginx-1.15.5/src/os/unix/ngx_thread_cond.c) vendor/nginx-1.15.6/src/os/unix/ngx_thread_id.c (from vendor/nginx-1.15.5/src/os/unix/ngx_thread_id.c) vendor/nginx-1.15.6/src/os/unix/ngx_thread_mutex.c (from vendor/nginx-1.15.5/src/os/unix/ngx_thread_mutex.c) vendor/nginx-1.15.6/src/os/unix/ngx_time.c (from vendor/nginx-1.15.5/src/os/unix/ngx_time.c) vendor/nginx-1.15.6/src/os/unix/ngx_time.h (from vendor/nginx-1.15.5/src/os/unix/ngx_time.h) vendor/nginx-1.15.6/src/os/unix/ngx_udp_recv.c (from vendor/nginx-1.15.5/src/os/unix/ngx_udp_recv.c) vendor/nginx-1.15.6/src/os/unix/ngx_udp_send.c (from vendor/nginx-1.15.5/src/os/unix/ngx_udp_send.c) vendor/nginx-1.15.6/src/os/unix/ngx_udp_sendmsg_chain.c (from vendor/nginx-1.15.5/src/os/unix/ngx_udp_sendmsg_chain.c) vendor/nginx-1.15.6/src/os/unix/ngx_user.c (from vendor/nginx-1.15.5/src/os/unix/ngx_user.c) vendor/nginx-1.15.6/src/os/unix/ngx_user.h (from vendor/nginx-1.15.5/src/os/unix/ngx_user.h) vendor/nginx-1.15.6/src/os/unix/ngx_writev_chain.c (from vendor/nginx-1.15.5/src/os/unix/ngx_writev_chain.c) vendor/nginx-1.15.6/src/os/win32/nginx.ico (from vendor/nginx-1.15.5/src/os/win32/nginx.ico) vendor/nginx-1.15.6/src/os/win32/nginx.rc (from vendor/nginx-1.15.5/src/os/win32/nginx.rc) vendor/nginx-1.15.6/src/os/win32/nginx_icon16.xpm (from vendor/nginx-1.15.5/src/os/win32/nginx_icon16.xpm) vendor/nginx-1.15.6/src/os/win32/nginx_icon32.xpm (from vendor/nginx-1.15.5/src/os/win32/nginx_icon32.xpm) vendor/nginx-1.15.6/src/os/win32/nginx_icon48.xpm (from vendor/nginx-1.15.5/src/os/win32/nginx_icon48.xpm) vendor/nginx-1.15.6/src/os/win32/ngx_alloc.c (from vendor/nginx-1.15.5/src/os/win32/ngx_alloc.c) vendor/nginx-1.15.6/src/os/win32/ngx_alloc.h (from vendor/nginx-1.15.5/src/os/win32/ngx_alloc.h) vendor/nginx-1.15.6/src/os/win32/ngx_atomic.h (from vendor/nginx-1.15.5/src/os/win32/ngx_atomic.h) vendor/nginx-1.15.6/src/os/win32/ngx_dlopen.c (from vendor/nginx-1.15.5/src/os/win32/ngx_dlopen.c) vendor/nginx-1.15.6/src/os/win32/ngx_dlopen.h (from vendor/nginx-1.15.5/src/os/win32/ngx_dlopen.h) vendor/nginx-1.15.6/src/os/win32/ngx_errno.c (from vendor/nginx-1.15.5/src/os/win32/ngx_errno.c) vendor/nginx-1.15.6/src/os/win32/ngx_errno.h (from vendor/nginx-1.15.5/src/os/win32/ngx_errno.h) vendor/nginx-1.15.6/src/os/win32/ngx_event_log.c (from vendor/nginx-1.15.5/src/os/win32/ngx_event_log.c) vendor/nginx-1.15.6/src/os/win32/ngx_files.c (from vendor/nginx-1.15.5/src/os/win32/ngx_files.c) vendor/nginx-1.15.6/src/os/win32/ngx_files.h (from vendor/nginx-1.15.5/src/os/win32/ngx_files.h) vendor/nginx-1.15.6/src/os/win32/ngx_os.h (from vendor/nginx-1.15.5/src/os/win32/ngx_os.h) vendor/nginx-1.15.6/src/os/win32/ngx_process.c (from vendor/nginx-1.15.5/src/os/win32/ngx_process.c) vendor/nginx-1.15.6/src/os/win32/ngx_process.h (from vendor/nginx-1.15.5/src/os/win32/ngx_process.h) vendor/nginx-1.15.6/src/os/win32/ngx_process_cycle.c (from vendor/nginx-1.15.5/src/os/win32/ngx_process_cycle.c) vendor/nginx-1.15.6/src/os/win32/ngx_process_cycle.h (from vendor/nginx-1.15.5/src/os/win32/ngx_process_cycle.h) vendor/nginx-1.15.6/src/os/win32/ngx_service.c (from vendor/nginx-1.15.5/src/os/win32/ngx_service.c) vendor/nginx-1.15.6/src/os/win32/ngx_shmem.c (from vendor/nginx-1.15.5/src/os/win32/ngx_shmem.c) vendor/nginx-1.15.6/src/os/win32/ngx_shmem.h (from vendor/nginx-1.15.5/src/os/win32/ngx_shmem.h) vendor/nginx-1.15.6/src/os/win32/ngx_socket.c (from vendor/nginx-1.15.5/src/os/win32/ngx_socket.c) vendor/nginx-1.15.6/src/os/win32/ngx_socket.h (from vendor/nginx-1.15.5/src/os/win32/ngx_socket.h) vendor/nginx-1.15.6/src/os/win32/ngx_stat.c (from vendor/nginx-1.15.5/src/os/win32/ngx_stat.c) vendor/nginx-1.15.6/src/os/win32/ngx_thread.c (from vendor/nginx-1.15.5/src/os/win32/ngx_thread.c) vendor/nginx-1.15.6/src/os/win32/ngx_thread.h (from vendor/nginx-1.15.5/src/os/win32/ngx_thread.h) vendor/nginx-1.15.6/src/os/win32/ngx_time.c (from vendor/nginx-1.15.5/src/os/win32/ngx_time.c) vendor/nginx-1.15.6/src/os/win32/ngx_time.h (from vendor/nginx-1.15.5/src/os/win32/ngx_time.h) vendor/nginx-1.15.6/src/os/win32/ngx_udp_wsarecv.c (from vendor/nginx-1.15.5/src/os/win32/ngx_udp_wsarecv.c) vendor/nginx-1.15.6/src/os/win32/ngx_user.c (from vendor/nginx-1.15.5/src/os/win32/ngx_user.c) vendor/nginx-1.15.6/src/os/win32/ngx_user.h (from vendor/nginx-1.15.5/src/os/win32/ngx_user.h) vendor/nginx-1.15.6/src/os/win32/ngx_win32_config.h (from vendor/nginx-1.15.5/src/os/win32/ngx_win32_config.h) vendor/nginx-1.15.6/src/os/win32/ngx_win32_init.c (from vendor/nginx-1.15.5/src/os/win32/ngx_win32_init.c) vendor/nginx-1.15.6/src/os/win32/ngx_wsarecv.c (from vendor/nginx-1.15.5/src/os/win32/ngx_wsarecv.c) vendor/nginx-1.15.6/src/os/win32/ngx_wsarecv_chain.c (from vendor/nginx-1.15.5/src/os/win32/ngx_wsarecv_chain.c) vendor/nginx-1.15.6/src/os/win32/ngx_wsasend.c (from vendor/nginx-1.15.5/src/os/win32/ngx_wsasend.c) vendor/nginx-1.15.6/src/os/win32/ngx_wsasend_chain.c (from vendor/nginx-1.15.5/src/os/win32/ngx_wsasend_chain.c) vendor/nginx-1.15.6/src/stream/ngx_stream.c (from vendor/nginx-1.15.5/src/stream/ngx_stream.c) vendor/nginx-1.15.6/src/stream/ngx_stream.h (from vendor/nginx-1.15.5/src/stream/ngx_stream.h) vendor/nginx-1.15.6/src/stream/ngx_stream_access_module.c (from vendor/nginx-1.15.5/src/stream/ngx_stream_access_module.c) vendor/nginx-1.15.6/src/stream/ngx_stream_core_module.c (from vendor/nginx-1.15.5/src/stream/ngx_stream_core_module.c) vendor/nginx-1.15.6/src/stream/ngx_stream_geo_module.c (from vendor/nginx-1.15.5/src/stream/ngx_stream_geo_module.c) vendor/nginx-1.15.6/src/stream/ngx_stream_geoip_module.c (from vendor/nginx-1.15.5/src/stream/ngx_stream_geoip_module.c) vendor/nginx-1.15.6/src/stream/ngx_stream_handler.c (from vendor/nginx-1.15.5/src/stream/ngx_stream_handler.c) vendor/nginx-1.15.6/src/stream/ngx_stream_limit_conn_module.c (from vendor/nginx-1.15.5/src/stream/ngx_stream_limit_conn_module.c) vendor/nginx-1.15.6/src/stream/ngx_stream_log_module.c (from vendor/nginx-1.15.5/src/stream/ngx_stream_log_module.c) vendor/nginx-1.15.6/src/stream/ngx_stream_map_module.c (from vendor/nginx-1.15.5/src/stream/ngx_stream_map_module.c) vendor/nginx-1.15.6/src/stream/ngx_stream_proxy_module.c (from vendor/nginx-1.15.5/src/stream/ngx_stream_proxy_module.c) vendor/nginx-1.15.6/src/stream/ngx_stream_realip_module.c (from vendor/nginx-1.15.5/src/stream/ngx_stream_realip_module.c) vendor/nginx-1.15.6/src/stream/ngx_stream_return_module.c (from vendor/nginx-1.15.5/src/stream/ngx_stream_return_module.c) vendor/nginx-1.15.6/src/stream/ngx_stream_script.c (from vendor/nginx-1.15.5/src/stream/ngx_stream_script.c) vendor/nginx-1.15.6/src/stream/ngx_stream_script.h (from vendor/nginx-1.15.5/src/stream/ngx_stream_script.h) vendor/nginx-1.15.6/src/stream/ngx_stream_split_clients_module.c (from vendor/nginx-1.15.5/src/stream/ngx_stream_split_clients_module.c) vendor/nginx-1.15.6/src/stream/ngx_stream_ssl_module.c (from vendor/nginx-1.15.5/src/stream/ngx_stream_ssl_module.c) vendor/nginx-1.15.6/src/stream/ngx_stream_ssl_module.h (from vendor/nginx-1.15.5/src/stream/ngx_stream_ssl_module.h) vendor/nginx-1.15.6/src/stream/ngx_stream_ssl_preread_module.c (from vendor/nginx-1.15.5/src/stream/ngx_stream_ssl_preread_module.c) vendor/nginx-1.15.6/src/stream/ngx_stream_upstream.c (from vendor/nginx-1.15.5/src/stream/ngx_stream_upstream.c) vendor/nginx-1.15.6/src/stream/ngx_stream_upstream.h (from vendor/nginx-1.15.5/src/stream/ngx_stream_upstream.h) vendor/nginx-1.15.6/src/stream/ngx_stream_upstream_hash_module.c (from vendor/nginx-1.15.5/src/stream/ngx_stream_upstream_hash_module.c) vendor/nginx-1.15.6/src/stream/ngx_stream_upstream_least_conn_module.c (from vendor/nginx-1.15.5/src/stream/ngx_stream_upstream_least_conn_module.c) vendor/nginx-1.15.6/src/stream/ngx_stream_upstream_random_module.c (from vendor/nginx-1.15.5/src/stream/ngx_stream_upstream_random_module.c) vendor/nginx-1.15.6/src/stream/ngx_stream_upstream_round_robin.c (from vendor/nginx-1.15.5/src/stream/ngx_stream_upstream_round_robin.c) vendor/nginx-1.15.6/src/stream/ngx_stream_upstream_round_robin.h (from vendor/nginx-1.15.5/src/stream/ngx_stream_upstream_round_robin.h) vendor/nginx-1.15.6/src/stream/ngx_stream_upstream_zone_module.c (from vendor/nginx-1.15.5/src/stream/ngx_stream_upstream_zone_module.c) vendor/nginx-1.15.6/src/stream/ngx_stream_variables.c (from vendor/nginx-1.15.5/src/stream/ngx_stream_variables.c) vendor/nginx-1.15.6/src/stream/ngx_stream_variables.h (from vendor/nginx-1.15.5/src/stream/ngx_stream_variables.h) vendor/nginx-1.15.6/src/stream/ngx_stream_write_filter_module.c (from vendor/nginx-1.15.5/src/stream/ngx_stream_write_filter_module.c) Modified: nginx_version (+1 -1) =================================================================== --- nginx_version 2018-11-27 14:43:38 +0900 (d32434904) +++ nginx_version 2018-11-27 14:48:41 +0900 (04cc99945) @@ -1 +1 @@ -1.15.5 +1.15.6 Renamed: vendor/nginx-1.15.6/auto/cc/acc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/cc/bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/cc/ccc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/cc/clang (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/cc/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/cc/gcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/cc/icc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/cc/msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/cc/name (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/cc/owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/cc/sunc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/configure (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/define (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/endianness (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/feature (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/have (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/have_headers (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/headers (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/include (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/init (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/install (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/lib/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/lib/geoip/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/lib/google-perftools/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/lib/libatomic/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/lib/libatomic/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/lib/libgd/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/lib/libxslt/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/lib/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/lib/openssl/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/lib/openssl/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/lib/openssl/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/lib/openssl/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/lib/pcre/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/lib/pcre/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/lib/pcre/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/lib/pcre/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/lib/pcre/makefile.owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/lib/perl/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/lib/perl/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/lib/zlib/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/lib/zlib/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/lib/zlib/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/lib/zlib/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/lib/zlib/makefile.owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/module (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/modules (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/nohave (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/options (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/os/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/os/darwin (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/os/freebsd (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/os/linux (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/os/solaris (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/os/win32 (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/sources (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/stubs (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/summary (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/threads (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/types/sizeof (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/types/typedef (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/types/uintptr_t (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/types/value (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/auto/unix (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/conf/fastcgi.conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/conf/fastcgi_params (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/conf/koi-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/conf/koi-win (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/conf/mime.types (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/conf/nginx.conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/conf/scgi_params (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/conf/uwsgi_params (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/conf/win-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/contrib/README (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/contrib/geo2nginx.pl (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/contrib/unicode2nginx/koi-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/contrib/unicode2nginx/unicode-to-nginx.pl (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/contrib/unicode2nginx/win-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/contrib/vim/ftdetect/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/contrib/vim/ftplugin/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/contrib/vim/indent/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/contrib/vim/syntax/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/docs/GNUmakefile (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/docs/dtd/change_log_conf.dtd (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/docs/dtd/changes.dtd (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/docs/html/50x.html (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/docs/html/index.html (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/docs/man/nginx.8 (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/docs/text/LICENSE (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/docs/text/README (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/docs/xml/change_log_conf.xml (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/docs/xml/nginx/changes.xml (+64 -0) 99% =================================================================== --- vendor/nginx-1.15.5/docs/xml/nginx/changes.xml 2018-11-27 14:43:38 +0900 (dfff0a705) +++ vendor/nginx-1.15.6/docs/xml/nginx/changes.xml 2018-11-27 14:48:41 +0900 (43a21e5f1) @@ -5,6 +5,70 @@ <change_log title="nginx"> +<changes ver="1.15.6" date="2018-11-06"> + +<change type="security"> +<para lang="ru"> +при использовании HTTP/2 клиент мог вызвать +чрезмерное потреблению памяти (CVE-2018-16843) +и ресурсов процессора (CVE-2018-16844). +</para> +<para lang="en"> +when using HTTP/2 a client might cause +excessive memory consumption (CVE-2018-16843) +and CPU usage (CVE-2018-16844). +</para> +</change> + +<change type="security"> +<para lang="ru"> +при обработке специально созданного mp4-файла модулем ngx_http_mp4_module +содержимое памяти рабочего процесса могло быть отправлено клиенту +(CVE-2018-16845). +</para> +<para lang="en"> +processing of a specially crafted mp4 file with the ngx_http_mp4_module +might result in worker process memory disclosure +(CVE-2018-16845). +</para> +</change> + +<change type="feature"> +<para lang="ru"> +директивы proxy_socket_keepalive, fastcgi_socket_keepalive, +grpc_socket_keepalive, memcached_socket_keepalive, +scgi_socket_keepalive и uwsgi_socket_keepalive. +</para> +<para lang="en"> +the "proxy_socket_keepalive", "fastcgi_socket_keepalive", +"grpc_socket_keepalive", "memcached_socket_keepalive", +"scgi_socket_keepalive", and "uwsgi_socket_keepalive" directives. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +если nginx был собран с OpenSSL 1.1.0, а использовался с OpenSSL 1.1.1, +протокол TLS 1.3 всегда был разрешён. +</para> +<para lang="en"> +if nginx was built with OpenSSL 1.1.0 and used with OpenSSL 1.1.1, +the TLS 1.3 protocol was always enabled. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +при работе с gRPC-бэкендами могло расходоваться большое количество памяти. +</para> +<para lang="en"> +working with gRPC backends might result in excessive memory consumption. +</para> +</change> + +</changes> + + <changes ver="1.15.5" date="2018-10-02"> <change type="bugfix"> Renamed: vendor/nginx-1.15.6/docs/xsls/changes.xsls (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/docs/xslt/changes.xslt (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/misc/GNUmakefile (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/misc/README (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/nginx.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/nginx.h (+2 -2) 85% =================================================================== --- vendor/nginx-1.15.5/src/core/nginx.h 2018-11-27 14:43:38 +0900 (472036c13) +++ vendor/nginx-1.15.6/src/core/nginx.h 2018-11-27 14:48:41 +0900 (7916ffd12) @@ -9,8 +9,8 @@ #define _NGINX_H_INCLUDED_ -#define nginx_version 1015005 -#define NGINX_VERSION "1.15.5" +#define nginx_version 1015006 +#define NGINX_VERSION "1.15.6" #define NGINX_VER "nginx/" NGINX_VERSION #ifdef NGX_BUILD Renamed: vendor/nginx-1.15.6/src/core/ngx_array.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_array.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_buf.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_buf.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_conf_file.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_conf_file.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_connection.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_connection.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_core.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_cpuinfo.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_crc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_crc32.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_crc32.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_crypt.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_crypt.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_cycle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_cycle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_file.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_file.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_hash.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_hash.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_inet.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_inet.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_list.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_list.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_log.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_log.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_md5.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_md5.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_murmurhash.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_murmurhash.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_open_file_cache.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_open_file_cache.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_output_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_palloc.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_palloc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_parse.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_parse.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_parse_time.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_parse_time.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_proxy_protocol.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_proxy_protocol.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_queue.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_queue.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_radix_tree.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_radix_tree.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_rbtree.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_rbtree.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_regex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_regex.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_resolver.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_resolver.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_rwlock.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_rwlock.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_sha1.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_sha1.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_shmtx.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_shmtx.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_slab.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_slab.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_spinlock.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_string.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_string.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_syslog.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_syslog.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_thread_pool.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_thread_pool.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_times.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/core/ngx_times.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/event/modules/ngx_devpoll_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/event/modules/ngx_epoll_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/event/modules/ngx_eventport_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/event/modules/ngx_iocp_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/event/modules/ngx_iocp_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/event/modules/ngx_kqueue_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/event/modules/ngx_poll_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/event/modules/ngx_select_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/event/modules/ngx_win32_select_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/event/ngx_event.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/event/ngx_event.h (+1 -1) 99% =================================================================== --- vendor/nginx-1.15.5/src/event/ngx_event.h 2018-11-27 14:43:38 +0900 (44f9e0544) +++ vendor/nginx-1.15.6/src/event/ngx_event.h 2018-11-27 14:48:41 +0900 (c3979fb46) @@ -499,7 +499,7 @@ extern ngx_module_t ngx_event_core_module; #define ngx_event_get_conf(conf_ctx, module) \ - (*(ngx_get_conf(conf_ctx, ngx_events_module))) [module.ctx_index]; + (*(ngx_get_conf(conf_ctx, ngx_events_module))) [module.ctx_index] Renamed: vendor/nginx-1.15.6/src/event/ngx_event_accept.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/event/ngx_event_acceptex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/event/ngx_event_connect.c (+13 -1) 96% =================================================================== --- vendor/nginx-1.15.5/src/event/ngx_event_connect.c 2018-11-27 14:43:38 +0900 (714fc47de) +++ vendor/nginx-1.15.6/src/event/ngx_event_connect.c 2018-11-27 14:48:41 +0900 (1ffa7984c) @@ -20,7 +20,7 @@ static ngx_int_t ngx_event_connect_set_transparent(ngx_peer_connection_t *pc, ngx_int_t ngx_event_connect_peer(ngx_peer_connection_t *pc) { - int rc, type; + int rc, type, value; #if (NGX_HAVE_IP_BIND_ADDRESS_NO_PORT || NGX_LINUX) in_port_t port; #endif @@ -73,6 +73,18 @@ ngx_event_connect_peer(ngx_peer_connection_t *pc) } } + if (pc->so_keepalive) { + value = 1; + + if (setsockopt(s, SOL_SOCKET, SO_KEEPALIVE, + (const void *) &value, sizeof(int)) + == -1) + { + ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno, + "setsockopt(SO_KEEPALIVE) failed, ignored"); + } + } + if (ngx_nonblocking(s) == -1) { ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno, ngx_nonblocking_n " failed"); Renamed: vendor/nginx-1.15.6/src/event/ngx_event_connect.h (+1 -0) 97% =================================================================== --- vendor/nginx-1.15.5/src/event/ngx_event_connect.h 2018-11-27 14:43:38 +0900 (72d21d7f3) +++ vendor/nginx-1.15.6/src/event/ngx_event_connect.h 2018-11-27 14:48:41 +0900 (7253ebb04) @@ -62,6 +62,7 @@ struct ngx_peer_connection_s { unsigned cached:1; unsigned transparent:1; + unsigned so_keepalive:1; /* ngx_connection_log_error_e */ unsigned log_error:2; Renamed: vendor/nginx-1.15.6/src/event/ngx_event_connectex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/event/ngx_event_openssl.c (+5 -0) 99% =================================================================== --- vendor/nginx-1.15.5/src/event/ngx_event_openssl.c 2018-11-27 14:43:38 +0900 (751291348) +++ vendor/nginx-1.15.6/src/event/ngx_event_openssl.c 2018-11-27 14:48:41 +0900 (2c384a4dd) @@ -345,6 +345,11 @@ ngx_ssl_create(ngx_ssl_t *ssl, ngx_uint_t protocols, void *data) } #endif +#ifdef SSL_CTX_set_min_proto_version + SSL_CTX_set_min_proto_version(ssl->ctx, 0); + SSL_CTX_set_max_proto_version(ssl->ctx, TLS1_2_VERSION); +#endif + #ifdef TLS1_3_VERSION SSL_CTX_set_min_proto_version(ssl->ctx, 0); SSL_CTX_set_max_proto_version(ssl->ctx, TLS1_3_VERSION); Renamed: vendor/nginx-1.15.6/src/event/ngx_event_openssl.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/event/ngx_event_openssl_stapling.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/event/ngx_event_pipe.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/event/ngx_event_pipe.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/event/ngx_event_posted.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/event/ngx_event_posted.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/event/ngx_event_timer.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/event/ngx_event_timer.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/event/ngx_event_udp.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_access_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_addition_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_auth_basic_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_auth_request_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_autoindex_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_browser_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_charset_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_chunked_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_dav_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_degradation_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_empty_gif_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_fastcgi_module.c (+11 -0) 99% =================================================================== --- vendor/nginx-1.15.5/src/http/modules/ngx_http_fastcgi_module.c 2018-11-27 14:43:38 +0900 (f73ff2137) +++ vendor/nginx-1.15.6/src/http/modules/ngx_http_fastcgi_module.c 2018-11-27 14:48:41 +0900 (2be067214) @@ -286,6 +286,13 @@ static ngx_command_t ngx_http_fastcgi_commands[] = { offsetof(ngx_http_fastcgi_loc_conf_t, upstream.local), NULL }, + { ngx_string("fastcgi_socket_keepalive"), + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, + ngx_conf_set_flag_slot, + NGX_HTTP_LOC_CONF_OFFSET, + offsetof(ngx_http_fastcgi_loc_conf_t, upstream.socket_keepalive), + NULL }, + { ngx_string("fastcgi_connect_timeout"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, ngx_conf_set_msec_slot, @@ -2721,6 +2728,7 @@ ngx_http_fastcgi_create_loc_conf(ngx_conf_t *cf) conf->upstream.force_ranges = NGX_CONF_UNSET; conf->upstream.local = NGX_CONF_UNSET_PTR; + conf->upstream.socket_keepalive = NGX_CONF_UNSET; conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; @@ -2824,6 +2832,9 @@ ngx_http_fastcgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) ngx_conf_merge_ptr_value(conf->upstream.local, prev->upstream.local, NULL); + ngx_conf_merge_value(conf->upstream.socket_keepalive, + prev->upstream.socket_keepalive, 0); + ngx_conf_merge_msec_value(conf->upstream.connect_timeout, prev->upstream.connect_timeout, 60000); Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_flv_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_geo_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_geoip_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_grpc_module.c (+26 -0) 99% =================================================================== --- vendor/nginx-1.15.5/src/http/modules/ngx_http_grpc_module.c 2018-11-27 14:43:38 +0900 (17b0a267c) +++ vendor/nginx-1.15.6/src/http/modules/ngx_http_grpc_module.c 2018-11-27 14:48:41 +0900 (18478b978) @@ -78,6 +78,9 @@ typedef struct { ngx_uint_t id; + ngx_uint_t pings; + ngx_uint_t settings; + ssize_t send_window; size_t recv_window; @@ -248,6 +251,13 @@ static ngx_command_t ngx_http_grpc_commands[] = { offsetof(ngx_http_grpc_loc_conf_t, upstream.local), NULL }, + { ngx_string("grpc_socket_keepalive"), + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, + ngx_conf_set_flag_slot, + NGX_HTTP_LOC_CONF_OFFSET, + offsetof(ngx_http_grpc_loc_conf_t, upstream.socket_keepalive), + NULL }, + { ngx_string("grpc_connect_timeout"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, ngx_conf_set_msec_slot, @@ -3577,6 +3587,12 @@ ngx_http_grpc_parse_settings(ngx_http_request_t *r, ngx_http_grpc_ctx_t *ctx, ctx->rest); return NGX_ERROR; } + + if (ctx->free == NULL && ctx->settings++ > 1000) { + ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, + "upstream sent too many settings frames"); + return NGX_ERROR; + } } for (p = b->pos; p < last; p++) { @@ -3729,6 +3745,12 @@ ngx_http_grpc_parse_ping(ngx_http_request_t *r, "upstream sent ping frame with ack flag"); return NGX_ERROR; } + + if (ctx->free == NULL && ctx->pings++ > 1000) { + ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, + "upstream sent too many ping frames"); + return NGX_ERROR; + } } for (p = b->pos; p < last; p++) { @@ -4150,6 +4172,7 @@ ngx_http_grpc_create_loc_conf(ngx_conf_t *cf) */ conf->upstream.local = NGX_CONF_UNSET_PTR; + conf->upstream.socket_keepalive = NGX_CONF_UNSET; conf->upstream.next_upstream_tries = NGX_CONF_UNSET_UINT; conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; @@ -4205,6 +4228,9 @@ ngx_http_grpc_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) ngx_conf_merge_ptr_value(conf->upstream.local, prev->upstream.local, NULL); + ngx_conf_merge_value(conf->upstream.socket_keepalive, + prev->upstream.socket_keepalive, 0); + ngx_conf_merge_uint_value(conf->upstream.next_upstream_tries, prev->upstream.next_upstream_tries, 0); Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_gunzip_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_gzip_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_gzip_static_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_headers_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_image_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_index_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_limit_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_limit_req_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_log_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_map_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_memcached_module.c (+11 -0) 97% =================================================================== --- vendor/nginx-1.15.5/src/http/modules/ngx_http_memcached_module.c 2018-11-27 14:43:38 +0900 (2624471bb) +++ vendor/nginx-1.15.6/src/http/modules/ngx_http_memcached_module.c 2018-11-27 14:48:41 +0900 (775bd7e81) @@ -67,6 +67,13 @@ static ngx_command_t ngx_http_memcached_commands[] = { offsetof(ngx_http_memcached_loc_conf_t, upstream.local), NULL }, + { ngx_string("memcached_socket_keepalive"), + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, + ngx_conf_set_flag_slot, + NGX_HTTP_LOC_CONF_OFFSET, + offsetof(ngx_http_memcached_loc_conf_t, upstream.socket_keepalive), + NULL }, + { ngx_string("memcached_connect_timeout"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, ngx_conf_set_msec_slot, @@ -595,6 +602,7 @@ ngx_http_memcached_create_loc_conf(ngx_conf_t *cf) */ conf->upstream.local = NGX_CONF_UNSET_PTR; + conf->upstream.socket_keepalive = NGX_CONF_UNSET; conf->upstream.next_upstream_tries = NGX_CONF_UNSET_UINT; conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; @@ -634,6 +642,9 @@ ngx_http_memcached_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) ngx_conf_merge_ptr_value(conf->upstream.local, prev->upstream.local, NULL); + ngx_conf_merge_value(conf->upstream.socket_keepalive, + prev->upstream.socket_keepalive, 0); + ngx_conf_merge_uint_value(conf->upstream.next_upstream_tries, prev->upstream.next_upstream_tries, 0); Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_mirror_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_mp4_module.c (+7 -0) 99% =================================================================== --- vendor/nginx-1.15.5/src/http/modules/ngx_http_mp4_module.c 2018-11-27 14:43:38 +0900 (08a68d07b) +++ vendor/nginx-1.15.6/src/http/modules/ngx_http_mp4_module.c 2018-11-27 14:48:41 +0900 (2a6fafa04) @@ -942,6 +942,13 @@ ngx_http_mp4_read_atom(ngx_http_mp4_file_t *mp4, atom_size = ngx_mp4_get_64value(atom_header + 8); atom_header_size = sizeof(ngx_mp4_atom_header64_t); + if (atom_size < sizeof(ngx_mp4_atom_header64_t)) { + ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, + "\"%s\" mp4 atom is too small:%uL", + mp4->file.name.data, atom_size); + return NGX_ERROR; + } + } else { ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, "\"%s\" mp4 atom is too small:%uL", Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_not_modified_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_proxy_module.c (+11 -0) 99% =================================================================== --- vendor/nginx-1.15.5/src/http/modules/ngx_http_proxy_module.c 2018-11-27 14:43:38 +0900 (bc9700771) +++ vendor/nginx-1.15.6/src/http/modules/ngx_http_proxy_module.c 2018-11-27 14:48:41 +0900 (d6a892217) @@ -324,6 +324,13 @@ static ngx_command_t ngx_http_proxy_commands[] = { offsetof(ngx_http_proxy_loc_conf_t, upstream.local), NULL }, + { ngx_string("proxy_socket_keepalive"), + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, + ngx_conf_set_flag_slot, + NGX_HTTP_LOC_CONF_OFFSET, + offsetof(ngx_http_proxy_loc_conf_t, upstream.socket_keepalive), + NULL }, + { ngx_string("proxy_connect_timeout"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, ngx_conf_set_msec_slot, @@ -2833,6 +2840,7 @@ ngx_http_proxy_create_loc_conf(ngx_conf_t *cf) conf->upstream.force_ranges = NGX_CONF_UNSET; conf->upstream.local = NGX_CONF_UNSET_PTR; + conf->upstream.socket_keepalive = NGX_CONF_UNSET; conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; @@ -2953,6 +2961,9 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) ngx_conf_merge_ptr_value(conf->upstream.local, prev->upstream.local, NULL); + ngx_conf_merge_value(conf->upstream.socket_keepalive, + prev->upstream.socket_keepalive, 0); + ngx_conf_merge_msec_value(conf->upstream.connect_timeout, prev->upstream.connect_timeout, 60000); Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_random_index_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_range_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_realip_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_referer_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_rewrite_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_scgi_module.c (+11 -0) 99% =================================================================== --- vendor/nginx-1.15.5/src/http/modules/ngx_http_scgi_module.c 2018-11-27 14:43:38 +0900 (ab7769a2a) +++ vendor/nginx-1.15.6/src/http/modules/ngx_http_scgi_module.c 2018-11-27 14:48:41 +0900 (7216f781d) @@ -143,6 +143,13 @@ static ngx_command_t ngx_http_scgi_commands[] = { offsetof(ngx_http_scgi_loc_conf_t, upstream.local), NULL }, + { ngx_string("scgi_socket_keepalive"), + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, + ngx_conf_set_flag_slot, + NGX_HTTP_LOC_CONF_OFFSET, + offsetof(ngx_http_scgi_loc_conf_t, upstream.socket_keepalive), + NULL }, + { ngx_string("scgi_connect_timeout"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, ngx_conf_set_msec_slot, @@ -1200,6 +1207,7 @@ ngx_http_scgi_create_loc_conf(ngx_conf_t *cf) conf->upstream.force_ranges = NGX_CONF_UNSET; conf->upstream.local = NGX_CONF_UNSET_PTR; + conf->upstream.socket_keepalive = NGX_CONF_UNSET; conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; @@ -1298,6 +1306,9 @@ ngx_http_scgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) ngx_conf_merge_ptr_value(conf->upstream.local, prev->upstream.local, NULL); + ngx_conf_merge_value(conf->upstream.socket_keepalive, + prev->upstream.socket_keepalive, 0); + ngx_conf_merge_msec_value(conf->upstream.connect_timeout, prev->upstream.connect_timeout, 60000); Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_secure_link_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_slice_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_split_clients_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_ssi_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_ssi_filter_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_ssl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_ssl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_static_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_stub_status_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_sub_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_try_files_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_upstream_hash_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_upstream_ip_hash_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_upstream_keepalive_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_upstream_least_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_upstream_random_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_upstream_zone_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_userid_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_uwsgi_module.c (+11 -0) 99% =================================================================== --- vendor/nginx-1.15.5/src/http/modules/ngx_http_uwsgi_module.c 2018-11-27 14:43:38 +0900 (d0adbdbf2) +++ vendor/nginx-1.15.6/src/http/modules/ngx_http_uwsgi_module.c 2018-11-27 14:48:41 +0900 (8b091101f) @@ -204,6 +204,13 @@ static ngx_command_t ngx_http_uwsgi_commands[] = { offsetof(ngx_http_uwsgi_loc_conf_t, upstream.local), NULL }, + { ngx_string("uwsgi_socket_keepalive"), + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, + ngx_conf_set_flag_slot, + NGX_HTTP_LOC_CONF_OFFSET, + offsetof(ngx_http_uwsgi_loc_conf_t, upstream.socket_keepalive), + NULL }, + { ngx_string("uwsgi_connect_timeout"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, ngx_conf_set_msec_slot, @@ -1413,6 +1420,7 @@ ngx_http_uwsgi_create_loc_conf(ngx_conf_t *cf) conf->upstream.force_ranges = NGX_CONF_UNSET; conf->upstream.local = NGX_CONF_UNSET_PTR; + conf->upstream.socket_keepalive = NGX_CONF_UNSET; conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; @@ -1519,6 +1527,9 @@ ngx_http_uwsgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) ngx_conf_merge_ptr_value(conf->upstream.local, prev->upstream.local, NULL); + ngx_conf_merge_value(conf->upstream.socket_keepalive, + prev->upstream.socket_keepalive, 0); + ngx_conf_merge_msec_value(conf->upstream.connect_timeout, prev->upstream.connect_timeout, 60000); Renamed: vendor/nginx-1.15.6/src/http/modules/ngx_http_xslt_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/perl/Makefile.PL (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/perl/nginx.pm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/perl/nginx.xs (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/perl/ngx_http_perl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/perl/ngx_http_perl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/modules/perl/typemap (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/ngx_http.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/ngx_http.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/ngx_http_cache.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/ngx_http_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/ngx_http_copy_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/ngx_http_core_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/ngx_http_core_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/ngx_http_file_cache.c (+21 -12) 98% =================================================================== --- vendor/nginx-1.15.5/src/http/ngx_http_file_cache.c 2018-11-27 14:43:38 +0900 (330833df6) +++ vendor/nginx-1.15.6/src/http/ngx_http_file_cache.c 2018-11-27 14:48:41 +0900 (ecdf11e28) @@ -2418,23 +2418,32 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) p = (u_char *) ngx_strchr(name.data, ':'); - if (p) { - name.len = p - name.data; + if (p == NULL) { + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, + "invalid keys zone size \"%V\"", &value[i]); + return NGX_CONF_ERROR; + } - p++; + name.len = p - name.data; - s.len = value[i].data + value[i].len - p; - s.data = p; + s.data = p + 1; + s.len = value[i].data + value[i].len - s.data; - size = ngx_parse_size(&s); - if (size > 8191) { - continue; - } + size = ngx_parse_size(&s); + + if (size == NGX_ERROR) { + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, + "invalid keys zone size \"%V\"", &value[i]); + return NGX_CONF_ERROR; } - ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, - "invalid keys zone size \"%V\"", &value[i]); - return NGX_CONF_ERROR; + if (size < (ssize_t) (2 * ngx_pagesize)) { + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, + "keys zone \"%V\" is too small", &value[i]); + return NGX_CONF_ERROR; + } + + continue; } if (ngx_strncmp(value[i].data, "inactive=", 9) == 0) { Renamed: vendor/nginx-1.15.6/src/http/ngx_http_header_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/ngx_http_parse.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/ngx_http_postpone_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/ngx_http_request.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/ngx_http_request.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/ngx_http_request_body.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/ngx_http_script.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/ngx_http_script.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/ngx_http_special_response.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/ngx_http_upstream.c (+4 -0) 99% =================================================================== --- vendor/nginx-1.15.5/src/http/ngx_http_upstream.c 2018-11-27 14:43:38 +0900 (690194175) +++ vendor/nginx-1.15.6/src/http/ngx_http_upstream.c 2018-11-27 14:48:41 +0900 (22c2afd67) @@ -628,6 +628,10 @@ ngx_http_upstream_init_request(ngx_http_request_t *r) return; } + if (u->conf->socket_keepalive) { + u->peer.so_keepalive = 1; + } + clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); u->output.alignment = clcf->directio_alignment; Renamed: vendor/nginx-1.15.6/src/http/ngx_http_upstream.h (+1 -0) 99% =================================================================== --- vendor/nginx-1.15.5/src/http/ngx_http_upstream.h 2018-11-27 14:43:38 +0900 (c2f4dc0ba) +++ vendor/nginx-1.15.6/src/http/ngx_http_upstream.h 2018-11-27 14:48:41 +0900 (cd21719fe) @@ -188,6 +188,7 @@ typedef struct { ngx_array_t *pass_headers; ngx_http_upstream_local_t *local; + ngx_flag_t socket_keepalive; #if (NGX_HTTP_CACHE) ngx_shm_zone_t *cache_zone; Renamed: vendor/nginx-1.15.6/src/http/ngx_http_upstream_round_robin.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/ngx_http_upstream_round_robin.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/ngx_http_variables.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/ngx_http_variables.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/ngx_http_write_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/v2/ngx_http_v2.c (+21 -4) 99% =================================================================== --- vendor/nginx-1.15.5/src/http/v2/ngx_http_v2.c 2018-11-27 14:43:38 +0900 (b916ebdf6) +++ vendor/nginx-1.15.6/src/http/v2/ngx_http_v2.c 2018-11-27 14:48:41 +0900 (9571e710b) @@ -662,6 +662,7 @@ ngx_http_v2_handle_connection(ngx_http_v2_connection_t *h2c) h2c->pool = NULL; h2c->free_frames = NULL; + h2c->frames = 0; h2c->free_fake_connections = NULL; #if (NGX_HTTP_SSL) @@ -2895,7 +2896,7 @@ ngx_http_v2_get_frame(ngx_http_v2_connection_t *h2c, size_t length, frame->blocked = 0; - } else { + } else if (h2c->frames < 10000) { pool = h2c->pool ? h2c->pool : h2c->connection->pool; frame = ngx_pcalloc(pool, sizeof(ngx_http_v2_out_frame_t)); @@ -2919,6 +2920,15 @@ ngx_http_v2_get_frame(ngx_http_v2_connection_t *h2c, size_t length, frame->last = frame->first; frame->handler = ngx_http_v2_frame_handler; + + h2c->frames++; + + } else { + ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0, + "http2 flood detected"); + + h2c->connection->error = 1; + return NULL; } #if (NGX_DEBUG) @@ -4501,12 +4511,19 @@ ngx_http_v2_idle_handler(ngx_event_t *rev) #endif - c->destroyed = 0; - ngx_reusable_connection(c, 0); - h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx, ngx_http_v2_module); + if (h2c->idle++ > 10 * h2scf->max_requests) { + ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0, + "http2 flood detected"); + ngx_http_v2_finalize_connection(h2c, NGX_HTTP_V2_NO_ERROR); + return; + } + + c->destroyed = 0; + ngx_reusable_connection(c, 0); + h2c->pool = ngx_create_pool(h2scf->pool_size, h2c->connection->log); if (h2c->pool == NULL) { ngx_http_v2_finalize_connection(h2c, NGX_HTTP_V2_INTERNAL_ERROR); Renamed: vendor/nginx-1.15.6/src/http/v2/ngx_http_v2.h (+2 -0) 99% =================================================================== --- vendor/nginx-1.15.5/src/http/v2/ngx_http_v2.h 2018-11-27 14:43:38 +0900 (ebd0e77c0) +++ vendor/nginx-1.15.6/src/http/v2/ngx_http_v2.h 2018-11-27 14:48:41 +0900 (bec22160e) @@ -120,6 +120,8 @@ struct ngx_http_v2_connection_s { ngx_http_connection_t *http_connection; ngx_uint_t processing; + ngx_uint_t frames; + ngx_uint_t idle; ngx_uint_t pushing; ngx_uint_t concurrent_pushes; Renamed: vendor/nginx-1.15.6/src/http/v2/ngx_http_v2_encode.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/v2/ngx_http_v2_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/v2/ngx_http_v2_huff_decode.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/v2/ngx_http_v2_huff_encode.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/v2/ngx_http_v2_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/v2/ngx_http_v2_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/http/v2/ngx_http_v2_table.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/mail/ngx_mail.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/mail/ngx_mail.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/mail/ngx_mail_auth_http_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/mail/ngx_mail_core_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/mail/ngx_mail_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/mail/ngx_mail_imap_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/mail/ngx_mail_imap_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/mail/ngx_mail_imap_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/mail/ngx_mail_parse.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/mail/ngx_mail_pop3_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/mail/ngx_mail_pop3_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/mail/ngx_mail_pop3_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/mail/ngx_mail_proxy_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/mail/ngx_mail_smtp_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/mail/ngx_mail_smtp_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/mail/ngx_mail_smtp_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/mail/ngx_mail_ssl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/mail/ngx_mail_ssl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/misc/ngx_cpp_test_module.cpp (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/misc/ngx_google_perftools_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_alloc.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_alloc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_atomic.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_channel.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_channel.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_daemon.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_darwin.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_darwin_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_darwin_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_darwin_sendfile_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_dlopen.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_dlopen.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_errno.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_errno.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_file_aio_read.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_files.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_files.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_freebsd.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_freebsd_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_freebsd_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_freebsd_sendfile_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_gcc_atomic_amd64.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_gcc_atomic_ppc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_gcc_atomic_sparc64.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_gcc_atomic_x86.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_linux.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_linux_aio_read.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_linux_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_linux_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_linux_sendfile_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_os.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_posix_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_posix_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_process.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_process.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_process_cycle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_process_cycle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_readv_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_recv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_send.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_setaffinity.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_setaffinity.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_setproctitle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_setproctitle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_shmem.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_shmem.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_socket.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_socket.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_solaris.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_solaris_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_solaris_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_solaris_sendfilev_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_sunpro_amd64.il (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_sunpro_atomic_sparc64.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_sunpro_sparc64.il (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_sunpro_x86.il (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_thread.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_thread_cond.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_thread_id.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_thread_mutex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_time.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_time.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_udp_recv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_udp_send.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_udp_sendmsg_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_user.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_user.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/unix/ngx_writev_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/nginx.ico (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/nginx.rc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/nginx_icon16.xpm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/nginx_icon32.xpm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/nginx_icon48.xpm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/ngx_alloc.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/ngx_alloc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/ngx_atomic.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/ngx_dlopen.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/ngx_dlopen.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/ngx_errno.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/ngx_errno.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/ngx_event_log.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/ngx_files.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/ngx_files.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/ngx_os.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/ngx_process.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/ngx_process.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/ngx_process_cycle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/ngx_process_cycle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/ngx_service.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/ngx_shmem.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/ngx_shmem.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/ngx_socket.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/ngx_socket.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/ngx_stat.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/ngx_thread.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/ngx_thread.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/ngx_time.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/ngx_time.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/ngx_udp_wsarecv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/ngx_user.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/ngx_user.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/ngx_win32_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/ngx_win32_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/ngx_wsarecv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/ngx_wsarecv_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/ngx_wsasend.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/os/win32/ngx_wsasend_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/stream/ngx_stream.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/stream/ngx_stream.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/stream/ngx_stream_access_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/stream/ngx_stream_core_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/stream/ngx_stream_geo_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/stream/ngx_stream_geoip_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/stream/ngx_stream_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/stream/ngx_stream_limit_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/stream/ngx_stream_log_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/stream/ngx_stream_map_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/stream/ngx_stream_proxy_module.c (+16 -0) 99% =================================================================== --- vendor/nginx-1.15.5/src/stream/ngx_stream_proxy_module.c 2018-11-27 14:43:38 +0900 (d0497f571) +++ vendor/nginx-1.15.6/src/stream/ngx_stream_proxy_module.c 2018-11-27 14:48:41 +0900 (c8465a7d0) @@ -31,6 +31,7 @@ typedef struct { ngx_flag_t next_upstream; ngx_flag_t proxy_protocol; ngx_stream_upstream_local_t *local; + ngx_flag_t socket_keepalive; #if (NGX_STREAM_SSL) ngx_flag_t ssl_enable; @@ -136,6 +137,13 @@ static ngx_command_t ngx_stream_proxy_commands[] = { 0, NULL }, + { ngx_string("proxy_socket_keepalive"), + NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_FLAG, + ngx_conf_set_flag_slot, + NGX_STREAM_SRV_CONF_OFFSET, + offsetof(ngx_stream_proxy_srv_conf_t, socket_keepalive), + NULL }, + { ngx_string("proxy_connect_timeout"), NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1, ngx_conf_set_msec_slot, @@ -388,6 +396,10 @@ ngx_stream_proxy_handler(ngx_stream_session_t *s) return; } + if (pscf->socket_keepalive) { + u->peer.so_keepalive = 1; + } + u->peer.type = c->type; u->start_sec = ngx_time(); @@ -1898,6 +1910,7 @@ ngx_stream_proxy_create_srv_conf(ngx_conf_t *cf) conf->next_upstream = NGX_CONF_UNSET; conf->proxy_protocol = NGX_CONF_UNSET; conf->local = NGX_CONF_UNSET_PTR; + conf->socket_keepalive = NGX_CONF_UNSET; #if (NGX_STREAM_SSL) conf->ssl_enable = NGX_CONF_UNSET; @@ -1948,6 +1961,9 @@ ngx_stream_proxy_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) ngx_conf_merge_ptr_value(conf->local, prev->local, NULL); + ngx_conf_merge_value(conf->socket_keepalive, + prev->socket_keepalive, 0); + #if (NGX_STREAM_SSL) ngx_conf_merge_value(conf->ssl_enable, prev->ssl_enable, 0); Renamed: vendor/nginx-1.15.6/src/stream/ngx_stream_realip_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/stream/ngx_stream_return_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/stream/ngx_stream_script.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/stream/ngx_stream_script.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/stream/ngx_stream_split_clients_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/stream/ngx_stream_ssl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/stream/ngx_stream_ssl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/stream/ngx_stream_ssl_preread_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/stream/ngx_stream_upstream.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/stream/ngx_stream_upstream.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/stream/ngx_stream_upstream_hash_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/stream/ngx_stream_upstream_least_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/stream/ngx_stream_upstream_random_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/stream/ngx_stream_upstream_round_robin.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/stream/ngx_stream_upstream_round_robin.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/stream/ngx_stream_upstream_zone_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/stream/ngx_stream_variables.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/stream/ngx_stream_variables.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.6/src/stream/ngx_stream_write_filter_module.c (+0 -0) 100% ===================================================================
