Kentaro Hayashi
null+****@clear*****
Wed Jul 25 00:24:20 JST 2018
Kentaro Hayashi 2018-07-25 00:24:20 +0900 (Wed, 25 Jul 2018) New Revision: c1a837dec53d38afcf6cb67cf7279ceb382901ee https://github.com/groonga/groonga/commit/c1a837dec53d38afcf6cb67cf7279ceb382901ee Message: nginx: update nginx $ ./update_nginx.sh 1.15.2 Modified files: nginx_version Renamed files: vendor/nginx-1.15.2/auto/cc/acc (from vendor/nginx-1.15.1/auto/cc/acc) vendor/nginx-1.15.2/auto/cc/bcc (from vendor/nginx-1.15.1/auto/cc/bcc) vendor/nginx-1.15.2/auto/cc/ccc (from vendor/nginx-1.15.1/auto/cc/ccc) vendor/nginx-1.15.2/auto/cc/clang (from vendor/nginx-1.15.1/auto/cc/clang) vendor/nginx-1.15.2/auto/cc/conf (from vendor/nginx-1.15.1/auto/cc/conf) vendor/nginx-1.15.2/auto/cc/gcc (from vendor/nginx-1.15.1/auto/cc/gcc) vendor/nginx-1.15.2/auto/cc/icc (from vendor/nginx-1.15.1/auto/cc/icc) vendor/nginx-1.15.2/auto/cc/msvc (from vendor/nginx-1.15.1/auto/cc/msvc) vendor/nginx-1.15.2/auto/cc/name (from vendor/nginx-1.15.1/auto/cc/name) vendor/nginx-1.15.2/auto/cc/owc (from vendor/nginx-1.15.1/auto/cc/owc) vendor/nginx-1.15.2/auto/cc/sunc (from vendor/nginx-1.15.1/auto/cc/sunc) vendor/nginx-1.15.2/auto/configure (from vendor/nginx-1.15.1/auto/configure) vendor/nginx-1.15.2/auto/define (from vendor/nginx-1.15.1/auto/define) vendor/nginx-1.15.2/auto/endianness (from vendor/nginx-1.15.1/auto/endianness) vendor/nginx-1.15.2/auto/feature (from vendor/nginx-1.15.1/auto/feature) vendor/nginx-1.15.2/auto/have (from vendor/nginx-1.15.1/auto/have) vendor/nginx-1.15.2/auto/have_headers (from vendor/nginx-1.15.1/auto/have_headers) vendor/nginx-1.15.2/auto/headers (from vendor/nginx-1.15.1/auto/headers) vendor/nginx-1.15.2/auto/include (from vendor/nginx-1.15.1/auto/include) vendor/nginx-1.15.2/auto/init (from vendor/nginx-1.15.1/auto/init) vendor/nginx-1.15.2/auto/install (from vendor/nginx-1.15.1/auto/install) vendor/nginx-1.15.2/auto/lib/conf (from vendor/nginx-1.15.1/auto/lib/conf) vendor/nginx-1.15.2/auto/lib/geoip/conf (from vendor/nginx-1.15.1/auto/lib/geoip/conf) vendor/nginx-1.15.2/auto/lib/google-perftools/conf (from vendor/nginx-1.15.1/auto/lib/google-perftools/conf) vendor/nginx-1.15.2/auto/lib/libatomic/conf (from vendor/nginx-1.15.1/auto/lib/libatomic/conf) vendor/nginx-1.15.2/auto/lib/libatomic/make (from vendor/nginx-1.15.1/auto/lib/libatomic/make) vendor/nginx-1.15.2/auto/lib/libgd/conf (from vendor/nginx-1.15.1/auto/lib/libgd/conf) vendor/nginx-1.15.2/auto/lib/libxslt/conf (from vendor/nginx-1.15.1/auto/lib/libxslt/conf) vendor/nginx-1.15.2/auto/lib/make (from vendor/nginx-1.15.1/auto/lib/make) vendor/nginx-1.15.2/auto/lib/openssl/conf (from vendor/nginx-1.15.1/auto/lib/openssl/conf) vendor/nginx-1.15.2/auto/lib/openssl/make (from vendor/nginx-1.15.1/auto/lib/openssl/make) vendor/nginx-1.15.2/auto/lib/openssl/makefile.bcc (from vendor/nginx-1.15.1/auto/lib/openssl/makefile.bcc) vendor/nginx-1.15.2/auto/lib/openssl/makefile.msvc (from vendor/nginx-1.15.1/auto/lib/openssl/makefile.msvc) vendor/nginx-1.15.2/auto/lib/pcre/conf (from vendor/nginx-1.15.1/auto/lib/pcre/conf) vendor/nginx-1.15.2/auto/lib/pcre/make (from vendor/nginx-1.15.1/auto/lib/pcre/make) vendor/nginx-1.15.2/auto/lib/pcre/makefile.bcc (from vendor/nginx-1.15.1/auto/lib/pcre/makefile.bcc) vendor/nginx-1.15.2/auto/lib/pcre/makefile.msvc (from vendor/nginx-1.15.1/auto/lib/pcre/makefile.msvc) vendor/nginx-1.15.2/auto/lib/pcre/makefile.owc (from vendor/nginx-1.15.1/auto/lib/pcre/makefile.owc) vendor/nginx-1.15.2/auto/lib/perl/conf (from vendor/nginx-1.15.1/auto/lib/perl/conf) vendor/nginx-1.15.2/auto/lib/perl/make (from vendor/nginx-1.15.1/auto/lib/perl/make) vendor/nginx-1.15.2/auto/lib/zlib/conf (from vendor/nginx-1.15.1/auto/lib/zlib/conf) vendor/nginx-1.15.2/auto/lib/zlib/make (from vendor/nginx-1.15.1/auto/lib/zlib/make) vendor/nginx-1.15.2/auto/lib/zlib/makefile.bcc (from vendor/nginx-1.15.1/auto/lib/zlib/makefile.bcc) vendor/nginx-1.15.2/auto/lib/zlib/makefile.msvc (from vendor/nginx-1.15.1/auto/lib/zlib/makefile.msvc) vendor/nginx-1.15.2/auto/lib/zlib/makefile.owc (from vendor/nginx-1.15.1/auto/lib/zlib/makefile.owc) vendor/nginx-1.15.2/auto/make (from vendor/nginx-1.15.1/auto/make) vendor/nginx-1.15.2/auto/module (from vendor/nginx-1.15.1/auto/module) vendor/nginx-1.15.2/auto/modules (from vendor/nginx-1.15.1/auto/modules) vendor/nginx-1.15.2/auto/nohave (from vendor/nginx-1.15.1/auto/nohave) vendor/nginx-1.15.2/auto/options (from vendor/nginx-1.15.1/auto/options) vendor/nginx-1.15.2/auto/os/conf (from vendor/nginx-1.15.1/auto/os/conf) vendor/nginx-1.15.2/auto/os/darwin (from vendor/nginx-1.15.1/auto/os/darwin) vendor/nginx-1.15.2/auto/os/freebsd (from vendor/nginx-1.15.1/auto/os/freebsd) vendor/nginx-1.15.2/auto/os/linux (from vendor/nginx-1.15.1/auto/os/linux) vendor/nginx-1.15.2/auto/os/solaris (from vendor/nginx-1.15.1/auto/os/solaris) vendor/nginx-1.15.2/auto/os/win32 (from vendor/nginx-1.15.1/auto/os/win32) vendor/nginx-1.15.2/auto/sources (from vendor/nginx-1.15.1/auto/sources) vendor/nginx-1.15.2/auto/stubs (from vendor/nginx-1.15.1/auto/stubs) vendor/nginx-1.15.2/auto/summary (from vendor/nginx-1.15.1/auto/summary) vendor/nginx-1.15.2/auto/threads (from vendor/nginx-1.15.1/auto/threads) vendor/nginx-1.15.2/auto/types/sizeof (from vendor/nginx-1.15.1/auto/types/sizeof) vendor/nginx-1.15.2/auto/types/typedef (from vendor/nginx-1.15.1/auto/types/typedef) vendor/nginx-1.15.2/auto/types/uintptr_t (from vendor/nginx-1.15.1/auto/types/uintptr_t) vendor/nginx-1.15.2/auto/types/value (from vendor/nginx-1.15.1/auto/types/value) vendor/nginx-1.15.2/auto/unix (from vendor/nginx-1.15.1/auto/unix) vendor/nginx-1.15.2/conf/fastcgi.conf (from vendor/nginx-1.15.1/conf/fastcgi.conf) vendor/nginx-1.15.2/conf/fastcgi_params (from vendor/nginx-1.15.1/conf/fastcgi_params) vendor/nginx-1.15.2/conf/koi-utf (from vendor/nginx-1.15.1/conf/koi-utf) vendor/nginx-1.15.2/conf/koi-win (from vendor/nginx-1.15.1/conf/koi-win) vendor/nginx-1.15.2/conf/mime.types (from vendor/nginx-1.15.1/conf/mime.types) vendor/nginx-1.15.2/conf/nginx.conf (from vendor/nginx-1.15.1/conf/nginx.conf) vendor/nginx-1.15.2/conf/scgi_params (from vendor/nginx-1.15.1/conf/scgi_params) vendor/nginx-1.15.2/conf/uwsgi_params (from vendor/nginx-1.15.1/conf/uwsgi_params) vendor/nginx-1.15.2/conf/win-utf (from vendor/nginx-1.15.1/conf/win-utf) vendor/nginx-1.15.2/contrib/README (from vendor/nginx-1.15.1/contrib/README) vendor/nginx-1.15.2/contrib/geo2nginx.pl (from vendor/nginx-1.15.1/contrib/geo2nginx.pl) vendor/nginx-1.15.2/contrib/unicode2nginx/koi-utf (from vendor/nginx-1.15.1/contrib/unicode2nginx/koi-utf) vendor/nginx-1.15.2/contrib/unicode2nginx/unicode-to-nginx.pl (from vendor/nginx-1.15.1/contrib/unicode2nginx/unicode-to-nginx.pl) vendor/nginx-1.15.2/contrib/unicode2nginx/win-utf (from vendor/nginx-1.15.1/contrib/unicode2nginx/win-utf) vendor/nginx-1.15.2/contrib/vim/ftdetect/nginx.vim (from vendor/nginx-1.15.1/contrib/vim/ftdetect/nginx.vim) vendor/nginx-1.15.2/contrib/vim/ftplugin/nginx.vim (from vendor/nginx-1.15.1/contrib/vim/ftplugin/nginx.vim) vendor/nginx-1.15.2/contrib/vim/indent/nginx.vim (from vendor/nginx-1.15.1/contrib/vim/indent/nginx.vim) vendor/nginx-1.15.2/contrib/vim/syntax/nginx.vim (from vendor/nginx-1.15.1/contrib/vim/syntax/nginx.vim) vendor/nginx-1.15.2/docs/GNUmakefile (from vendor/nginx-1.15.1/docs/GNUmakefile) vendor/nginx-1.15.2/docs/dtd/change_log_conf.dtd (from vendor/nginx-1.15.1/docs/dtd/change_log_conf.dtd) vendor/nginx-1.15.2/docs/dtd/changes.dtd (from vendor/nginx-1.15.1/docs/dtd/changes.dtd) vendor/nginx-1.15.2/docs/html/50x.html (from vendor/nginx-1.15.1/docs/html/50x.html) vendor/nginx-1.15.2/docs/html/index.html (from vendor/nginx-1.15.1/docs/html/index.html) vendor/nginx-1.15.2/docs/man/nginx.8 (from vendor/nginx-1.15.1/docs/man/nginx.8) vendor/nginx-1.15.2/docs/text/LICENSE (from vendor/nginx-1.15.1/docs/text/LICENSE) vendor/nginx-1.15.2/docs/text/README (from vendor/nginx-1.15.1/docs/text/README) vendor/nginx-1.15.2/docs/xml/change_log_conf.xml (from vendor/nginx-1.15.1/docs/xml/change_log_conf.xml) vendor/nginx-1.15.2/docs/xml/nginx/changes.xml (from vendor/nginx-1.15.1/docs/xml/nginx/changes.xml) vendor/nginx-1.15.2/docs/xsls/changes.xsls (from vendor/nginx-1.15.1/docs/xsls/changes.xsls) vendor/nginx-1.15.2/docs/xslt/changes.xslt (from vendor/nginx-1.15.1/docs/xslt/changes.xslt) vendor/nginx-1.15.2/misc/GNUmakefile (from vendor/nginx-1.15.1/misc/GNUmakefile) vendor/nginx-1.15.2/misc/README (from vendor/nginx-1.15.1/misc/README) vendor/nginx-1.15.2/src/core/nginx.c (from vendor/nginx-1.15.1/src/core/nginx.c) vendor/nginx-1.15.2/src/core/nginx.h (from vendor/nginx-1.15.1/src/core/nginx.h) vendor/nginx-1.15.2/src/core/ngx_array.c (from vendor/nginx-1.15.1/src/core/ngx_array.c) vendor/nginx-1.15.2/src/core/ngx_array.h (from vendor/nginx-1.15.1/src/core/ngx_array.h) vendor/nginx-1.15.2/src/core/ngx_buf.c (from vendor/nginx-1.15.1/src/core/ngx_buf.c) vendor/nginx-1.15.2/src/core/ngx_buf.h (from vendor/nginx-1.15.1/src/core/ngx_buf.h) vendor/nginx-1.15.2/src/core/ngx_conf_file.c (from vendor/nginx-1.15.1/src/core/ngx_conf_file.c) vendor/nginx-1.15.2/src/core/ngx_conf_file.h (from vendor/nginx-1.15.1/src/core/ngx_conf_file.h) vendor/nginx-1.15.2/src/core/ngx_config.h (from vendor/nginx-1.15.1/src/core/ngx_config.h) vendor/nginx-1.15.2/src/core/ngx_connection.c (from vendor/nginx-1.15.1/src/core/ngx_connection.c) vendor/nginx-1.15.2/src/core/ngx_connection.h (from vendor/nginx-1.15.1/src/core/ngx_connection.h) vendor/nginx-1.15.2/src/core/ngx_core.h (from vendor/nginx-1.15.1/src/core/ngx_core.h) vendor/nginx-1.15.2/src/core/ngx_cpuinfo.c (from vendor/nginx-1.15.1/src/core/ngx_cpuinfo.c) vendor/nginx-1.15.2/src/core/ngx_crc.h (from vendor/nginx-1.15.1/src/core/ngx_crc.h) vendor/nginx-1.15.2/src/core/ngx_crc32.c (from vendor/nginx-1.15.1/src/core/ngx_crc32.c) vendor/nginx-1.15.2/src/core/ngx_crc32.h (from vendor/nginx-1.15.1/src/core/ngx_crc32.h) vendor/nginx-1.15.2/src/core/ngx_crypt.c (from vendor/nginx-1.15.1/src/core/ngx_crypt.c) vendor/nginx-1.15.2/src/core/ngx_crypt.h (from vendor/nginx-1.15.1/src/core/ngx_crypt.h) vendor/nginx-1.15.2/src/core/ngx_cycle.c (from vendor/nginx-1.15.1/src/core/ngx_cycle.c) vendor/nginx-1.15.2/src/core/ngx_cycle.h (from vendor/nginx-1.15.1/src/core/ngx_cycle.h) vendor/nginx-1.15.2/src/core/ngx_file.c (from vendor/nginx-1.15.1/src/core/ngx_file.c) vendor/nginx-1.15.2/src/core/ngx_file.h (from vendor/nginx-1.15.1/src/core/ngx_file.h) vendor/nginx-1.15.2/src/core/ngx_hash.c (from vendor/nginx-1.15.1/src/core/ngx_hash.c) vendor/nginx-1.15.2/src/core/ngx_hash.h (from vendor/nginx-1.15.1/src/core/ngx_hash.h) vendor/nginx-1.15.2/src/core/ngx_inet.c (from vendor/nginx-1.15.1/src/core/ngx_inet.c) vendor/nginx-1.15.2/src/core/ngx_inet.h (from vendor/nginx-1.15.1/src/core/ngx_inet.h) vendor/nginx-1.15.2/src/core/ngx_list.c (from vendor/nginx-1.15.1/src/core/ngx_list.c) vendor/nginx-1.15.2/src/core/ngx_list.h (from vendor/nginx-1.15.1/src/core/ngx_list.h) vendor/nginx-1.15.2/src/core/ngx_log.c (from vendor/nginx-1.15.1/src/core/ngx_log.c) vendor/nginx-1.15.2/src/core/ngx_log.h (from vendor/nginx-1.15.1/src/core/ngx_log.h) vendor/nginx-1.15.2/src/core/ngx_md5.c (from vendor/nginx-1.15.1/src/core/ngx_md5.c) vendor/nginx-1.15.2/src/core/ngx_md5.h (from vendor/nginx-1.15.1/src/core/ngx_md5.h) vendor/nginx-1.15.2/src/core/ngx_module.c (from vendor/nginx-1.15.1/src/core/ngx_module.c) vendor/nginx-1.15.2/src/core/ngx_module.h (from vendor/nginx-1.15.1/src/core/ngx_module.h) vendor/nginx-1.15.2/src/core/ngx_murmurhash.c (from vendor/nginx-1.15.1/src/core/ngx_murmurhash.c) vendor/nginx-1.15.2/src/core/ngx_murmurhash.h (from vendor/nginx-1.15.1/src/core/ngx_murmurhash.h) vendor/nginx-1.15.2/src/core/ngx_open_file_cache.c (from vendor/nginx-1.15.1/src/core/ngx_open_file_cache.c) vendor/nginx-1.15.2/src/core/ngx_open_file_cache.h (from vendor/nginx-1.15.1/src/core/ngx_open_file_cache.h) vendor/nginx-1.15.2/src/core/ngx_output_chain.c (from vendor/nginx-1.15.1/src/core/ngx_output_chain.c) vendor/nginx-1.15.2/src/core/ngx_palloc.c (from vendor/nginx-1.15.1/src/core/ngx_palloc.c) vendor/nginx-1.15.2/src/core/ngx_palloc.h (from vendor/nginx-1.15.1/src/core/ngx_palloc.h) vendor/nginx-1.15.2/src/core/ngx_parse.c (from vendor/nginx-1.15.1/src/core/ngx_parse.c) vendor/nginx-1.15.2/src/core/ngx_parse.h (from vendor/nginx-1.15.1/src/core/ngx_parse.h) vendor/nginx-1.15.2/src/core/ngx_parse_time.c (from vendor/nginx-1.15.1/src/core/ngx_parse_time.c) vendor/nginx-1.15.2/src/core/ngx_parse_time.h (from vendor/nginx-1.15.1/src/core/ngx_parse_time.h) vendor/nginx-1.15.2/src/core/ngx_proxy_protocol.c (from vendor/nginx-1.15.1/src/core/ngx_proxy_protocol.c) vendor/nginx-1.15.2/src/core/ngx_proxy_protocol.h (from vendor/nginx-1.15.1/src/core/ngx_proxy_protocol.h) vendor/nginx-1.15.2/src/core/ngx_queue.c (from vendor/nginx-1.15.1/src/core/ngx_queue.c) vendor/nginx-1.15.2/src/core/ngx_queue.h (from vendor/nginx-1.15.1/src/core/ngx_queue.h) vendor/nginx-1.15.2/src/core/ngx_radix_tree.c (from vendor/nginx-1.15.1/src/core/ngx_radix_tree.c) vendor/nginx-1.15.2/src/core/ngx_radix_tree.h (from vendor/nginx-1.15.1/src/core/ngx_radix_tree.h) vendor/nginx-1.15.2/src/core/ngx_rbtree.c (from vendor/nginx-1.15.1/src/core/ngx_rbtree.c) vendor/nginx-1.15.2/src/core/ngx_rbtree.h (from vendor/nginx-1.15.1/src/core/ngx_rbtree.h) vendor/nginx-1.15.2/src/core/ngx_regex.c (from vendor/nginx-1.15.1/src/core/ngx_regex.c) vendor/nginx-1.15.2/src/core/ngx_regex.h (from vendor/nginx-1.15.1/src/core/ngx_regex.h) vendor/nginx-1.15.2/src/core/ngx_resolver.c (from vendor/nginx-1.15.1/src/core/ngx_resolver.c) vendor/nginx-1.15.2/src/core/ngx_resolver.h (from vendor/nginx-1.15.1/src/core/ngx_resolver.h) vendor/nginx-1.15.2/src/core/ngx_rwlock.c (from vendor/nginx-1.15.1/src/core/ngx_rwlock.c) vendor/nginx-1.15.2/src/core/ngx_rwlock.h (from vendor/nginx-1.15.1/src/core/ngx_rwlock.h) vendor/nginx-1.15.2/src/core/ngx_sha1.c (from vendor/nginx-1.15.1/src/core/ngx_sha1.c) vendor/nginx-1.15.2/src/core/ngx_sha1.h (from vendor/nginx-1.15.1/src/core/ngx_sha1.h) vendor/nginx-1.15.2/src/core/ngx_shmtx.c (from vendor/nginx-1.15.1/src/core/ngx_shmtx.c) vendor/nginx-1.15.2/src/core/ngx_shmtx.h (from vendor/nginx-1.15.1/src/core/ngx_shmtx.h) vendor/nginx-1.15.2/src/core/ngx_slab.c (from vendor/nginx-1.15.1/src/core/ngx_slab.c) vendor/nginx-1.15.2/src/core/ngx_slab.h (from vendor/nginx-1.15.1/src/core/ngx_slab.h) vendor/nginx-1.15.2/src/core/ngx_spinlock.c (from vendor/nginx-1.15.1/src/core/ngx_spinlock.c) vendor/nginx-1.15.2/src/core/ngx_string.c (from vendor/nginx-1.15.1/src/core/ngx_string.c) vendor/nginx-1.15.2/src/core/ngx_string.h (from vendor/nginx-1.15.1/src/core/ngx_string.h) vendor/nginx-1.15.2/src/core/ngx_syslog.c (from vendor/nginx-1.15.1/src/core/ngx_syslog.c) vendor/nginx-1.15.2/src/core/ngx_syslog.h (from vendor/nginx-1.15.1/src/core/ngx_syslog.h) vendor/nginx-1.15.2/src/core/ngx_thread_pool.c (from vendor/nginx-1.15.1/src/core/ngx_thread_pool.c) vendor/nginx-1.15.2/src/core/ngx_thread_pool.h (from vendor/nginx-1.15.1/src/core/ngx_thread_pool.h) vendor/nginx-1.15.2/src/core/ngx_times.c (from vendor/nginx-1.15.1/src/core/ngx_times.c) vendor/nginx-1.15.2/src/core/ngx_times.h (from vendor/nginx-1.15.1/src/core/ngx_times.h) vendor/nginx-1.15.2/src/event/modules/ngx_devpoll_module.c (from vendor/nginx-1.15.1/src/event/modules/ngx_devpoll_module.c) vendor/nginx-1.15.2/src/event/modules/ngx_epoll_module.c (from vendor/nginx-1.15.1/src/event/modules/ngx_epoll_module.c) vendor/nginx-1.15.2/src/event/modules/ngx_eventport_module.c (from vendor/nginx-1.15.1/src/event/modules/ngx_eventport_module.c) vendor/nginx-1.15.2/src/event/modules/ngx_iocp_module.c (from vendor/nginx-1.15.1/src/event/modules/ngx_iocp_module.c) vendor/nginx-1.15.2/src/event/modules/ngx_iocp_module.h (from vendor/nginx-1.15.1/src/event/modules/ngx_iocp_module.h) vendor/nginx-1.15.2/src/event/modules/ngx_kqueue_module.c (from vendor/nginx-1.15.1/src/event/modules/ngx_kqueue_module.c) vendor/nginx-1.15.2/src/event/modules/ngx_poll_module.c (from vendor/nginx-1.15.1/src/event/modules/ngx_poll_module.c) vendor/nginx-1.15.2/src/event/modules/ngx_select_module.c (from vendor/nginx-1.15.1/src/event/modules/ngx_select_module.c) vendor/nginx-1.15.2/src/event/modules/ngx_win32_select_module.c (from vendor/nginx-1.15.1/src/event/modules/ngx_win32_select_module.c) vendor/nginx-1.15.2/src/event/ngx_event.c (from vendor/nginx-1.15.1/src/event/ngx_event.c) vendor/nginx-1.15.2/src/event/ngx_event.h (from vendor/nginx-1.15.1/src/event/ngx_event.h) vendor/nginx-1.15.2/src/event/ngx_event_accept.c (from vendor/nginx-1.15.1/src/event/ngx_event_accept.c) vendor/nginx-1.15.2/src/event/ngx_event_acceptex.c (from vendor/nginx-1.15.1/src/event/ngx_event_acceptex.c) vendor/nginx-1.15.2/src/event/ngx_event_connect.c (from vendor/nginx-1.15.1/src/event/ngx_event_connect.c) vendor/nginx-1.15.2/src/event/ngx_event_connect.h (from vendor/nginx-1.15.1/src/event/ngx_event_connect.h) vendor/nginx-1.15.2/src/event/ngx_event_connectex.c (from vendor/nginx-1.15.1/src/event/ngx_event_connectex.c) vendor/nginx-1.15.2/src/event/ngx_event_openssl.c (from vendor/nginx-1.15.1/src/event/ngx_event_openssl.c) vendor/nginx-1.15.2/src/event/ngx_event_openssl.h (from vendor/nginx-1.15.1/src/event/ngx_event_openssl.h) vendor/nginx-1.15.2/src/event/ngx_event_openssl_stapling.c (from vendor/nginx-1.15.1/src/event/ngx_event_openssl_stapling.c) vendor/nginx-1.15.2/src/event/ngx_event_pipe.c (from vendor/nginx-1.15.1/src/event/ngx_event_pipe.c) vendor/nginx-1.15.2/src/event/ngx_event_pipe.h (from vendor/nginx-1.15.1/src/event/ngx_event_pipe.h) vendor/nginx-1.15.2/src/event/ngx_event_posted.c (from vendor/nginx-1.15.1/src/event/ngx_event_posted.c) vendor/nginx-1.15.2/src/event/ngx_event_posted.h (from vendor/nginx-1.15.1/src/event/ngx_event_posted.h) vendor/nginx-1.15.2/src/event/ngx_event_timer.c (from vendor/nginx-1.15.1/src/event/ngx_event_timer.c) vendor/nginx-1.15.2/src/event/ngx_event_timer.h (from vendor/nginx-1.15.1/src/event/ngx_event_timer.h) vendor/nginx-1.15.2/src/event/ngx_event_udp.c (from vendor/nginx-1.15.1/src/event/ngx_event_udp.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_access_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_access_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_addition_filter_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_addition_filter_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_auth_basic_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_auth_basic_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_auth_request_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_auth_request_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_autoindex_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_autoindex_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_browser_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_browser_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_charset_filter_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_charset_filter_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_chunked_filter_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_chunked_filter_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_dav_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_dav_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_degradation_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_degradation_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_empty_gif_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_empty_gif_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_fastcgi_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_fastcgi_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_flv_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_flv_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_geo_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_geo_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_geoip_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_geoip_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_grpc_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_grpc_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_gunzip_filter_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_gunzip_filter_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_gzip_filter_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_gzip_filter_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_gzip_static_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_gzip_static_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_headers_filter_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_headers_filter_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_image_filter_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_image_filter_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_index_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_index_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_limit_conn_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_limit_conn_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_limit_req_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_limit_req_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_log_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_log_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_map_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_map_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_memcached_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_memcached_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_mirror_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_mirror_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_mp4_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_mp4_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_not_modified_filter_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_not_modified_filter_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_proxy_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_proxy_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_random_index_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_random_index_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_range_filter_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_range_filter_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_realip_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_realip_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_referer_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_referer_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_rewrite_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_rewrite_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_scgi_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_scgi_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_secure_link_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_secure_link_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_slice_filter_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_slice_filter_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_split_clients_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_split_clients_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_ssi_filter_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_ssi_filter_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_ssi_filter_module.h (from vendor/nginx-1.15.1/src/http/modules/ngx_http_ssi_filter_module.h) vendor/nginx-1.15.2/src/http/modules/ngx_http_ssl_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_ssl_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_ssl_module.h (from vendor/nginx-1.15.1/src/http/modules/ngx_http_ssl_module.h) vendor/nginx-1.15.2/src/http/modules/ngx_http_static_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_static_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_stub_status_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_stub_status_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_sub_filter_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_sub_filter_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_try_files_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_try_files_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_upstream_hash_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_upstream_hash_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_upstream_ip_hash_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_upstream_ip_hash_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_upstream_keepalive_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_upstream_keepalive_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_upstream_least_conn_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_upstream_least_conn_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_upstream_random_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_upstream_random_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_upstream_zone_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_upstream_zone_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_userid_filter_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_userid_filter_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_uwsgi_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_uwsgi_module.c) vendor/nginx-1.15.2/src/http/modules/ngx_http_xslt_filter_module.c (from vendor/nginx-1.15.1/src/http/modules/ngx_http_xslt_filter_module.c) vendor/nginx-1.15.2/src/http/modules/perl/Makefile.PL (from vendor/nginx-1.15.1/src/http/modules/perl/Makefile.PL) vendor/nginx-1.15.2/src/http/modules/perl/nginx.pm (from vendor/nginx-1.15.1/src/http/modules/perl/nginx.pm) vendor/nginx-1.15.2/src/http/modules/perl/nginx.xs (from vendor/nginx-1.15.1/src/http/modules/perl/nginx.xs) vendor/nginx-1.15.2/src/http/modules/perl/ngx_http_perl_module.c (from vendor/nginx-1.15.1/src/http/modules/perl/ngx_http_perl_module.c) vendor/nginx-1.15.2/src/http/modules/perl/ngx_http_perl_module.h (from vendor/nginx-1.15.1/src/http/modules/perl/ngx_http_perl_module.h) vendor/nginx-1.15.2/src/http/modules/perl/typemap (from vendor/nginx-1.15.1/src/http/modules/perl/typemap) vendor/nginx-1.15.2/src/http/ngx_http.c (from vendor/nginx-1.15.1/src/http/ngx_http.c) vendor/nginx-1.15.2/src/http/ngx_http.h (from vendor/nginx-1.15.1/src/http/ngx_http.h) vendor/nginx-1.15.2/src/http/ngx_http_cache.h (from vendor/nginx-1.15.1/src/http/ngx_http_cache.h) vendor/nginx-1.15.2/src/http/ngx_http_config.h (from vendor/nginx-1.15.1/src/http/ngx_http_config.h) vendor/nginx-1.15.2/src/http/ngx_http_copy_filter_module.c (from vendor/nginx-1.15.1/src/http/ngx_http_copy_filter_module.c) vendor/nginx-1.15.2/src/http/ngx_http_core_module.c (from vendor/nginx-1.15.1/src/http/ngx_http_core_module.c) vendor/nginx-1.15.2/src/http/ngx_http_core_module.h (from vendor/nginx-1.15.1/src/http/ngx_http_core_module.h) vendor/nginx-1.15.2/src/http/ngx_http_file_cache.c (from vendor/nginx-1.15.1/src/http/ngx_http_file_cache.c) vendor/nginx-1.15.2/src/http/ngx_http_header_filter_module.c (from vendor/nginx-1.15.1/src/http/ngx_http_header_filter_module.c) vendor/nginx-1.15.2/src/http/ngx_http_parse.c (from vendor/nginx-1.15.1/src/http/ngx_http_parse.c) vendor/nginx-1.15.2/src/http/ngx_http_postpone_filter_module.c (from vendor/nginx-1.15.1/src/http/ngx_http_postpone_filter_module.c) vendor/nginx-1.15.2/src/http/ngx_http_request.c (from vendor/nginx-1.15.1/src/http/ngx_http_request.c) vendor/nginx-1.15.2/src/http/ngx_http_request.h (from vendor/nginx-1.15.1/src/http/ngx_http_request.h) vendor/nginx-1.15.2/src/http/ngx_http_request_body.c (from vendor/nginx-1.15.1/src/http/ngx_http_request_body.c) vendor/nginx-1.15.2/src/http/ngx_http_script.c (from vendor/nginx-1.15.1/src/http/ngx_http_script.c) vendor/nginx-1.15.2/src/http/ngx_http_script.h (from vendor/nginx-1.15.1/src/http/ngx_http_script.h) vendor/nginx-1.15.2/src/http/ngx_http_special_response.c (from vendor/nginx-1.15.1/src/http/ngx_http_special_response.c) vendor/nginx-1.15.2/src/http/ngx_http_upstream.c (from vendor/nginx-1.15.1/src/http/ngx_http_upstream.c) vendor/nginx-1.15.2/src/http/ngx_http_upstream.h (from vendor/nginx-1.15.1/src/http/ngx_http_upstream.h) vendor/nginx-1.15.2/src/http/ngx_http_upstream_round_robin.c (from vendor/nginx-1.15.1/src/http/ngx_http_upstream_round_robin.c) vendor/nginx-1.15.2/src/http/ngx_http_upstream_round_robin.h (from vendor/nginx-1.15.1/src/http/ngx_http_upstream_round_robin.h) vendor/nginx-1.15.2/src/http/ngx_http_variables.c (from vendor/nginx-1.15.1/src/http/ngx_http_variables.c) vendor/nginx-1.15.2/src/http/ngx_http_variables.h (from vendor/nginx-1.15.1/src/http/ngx_http_variables.h) vendor/nginx-1.15.2/src/http/ngx_http_write_filter_module.c (from vendor/nginx-1.15.1/src/http/ngx_http_write_filter_module.c) vendor/nginx-1.15.2/src/http/v2/ngx_http_v2.c (from vendor/nginx-1.15.1/src/http/v2/ngx_http_v2.c) vendor/nginx-1.15.2/src/http/v2/ngx_http_v2.h (from vendor/nginx-1.15.1/src/http/v2/ngx_http_v2.h) vendor/nginx-1.15.2/src/http/v2/ngx_http_v2_encode.c (from vendor/nginx-1.15.1/src/http/v2/ngx_http_v2_encode.c) vendor/nginx-1.15.2/src/http/v2/ngx_http_v2_filter_module.c (from vendor/nginx-1.15.1/src/http/v2/ngx_http_v2_filter_module.c) vendor/nginx-1.15.2/src/http/v2/ngx_http_v2_huff_decode.c (from vendor/nginx-1.15.1/src/http/v2/ngx_http_v2_huff_decode.c) vendor/nginx-1.15.2/src/http/v2/ngx_http_v2_huff_encode.c (from vendor/nginx-1.15.1/src/http/v2/ngx_http_v2_huff_encode.c) vendor/nginx-1.15.2/src/http/v2/ngx_http_v2_module.c (from vendor/nginx-1.15.1/src/http/v2/ngx_http_v2_module.c) vendor/nginx-1.15.2/src/http/v2/ngx_http_v2_module.h (from vendor/nginx-1.15.1/src/http/v2/ngx_http_v2_module.h) vendor/nginx-1.15.2/src/http/v2/ngx_http_v2_table.c (from vendor/nginx-1.15.1/src/http/v2/ngx_http_v2_table.c) vendor/nginx-1.15.2/src/mail/ngx_mail.c (from vendor/nginx-1.15.1/src/mail/ngx_mail.c) vendor/nginx-1.15.2/src/mail/ngx_mail.h (from vendor/nginx-1.15.1/src/mail/ngx_mail.h) vendor/nginx-1.15.2/src/mail/ngx_mail_auth_http_module.c (from vendor/nginx-1.15.1/src/mail/ngx_mail_auth_http_module.c) vendor/nginx-1.15.2/src/mail/ngx_mail_core_module.c (from vendor/nginx-1.15.1/src/mail/ngx_mail_core_module.c) vendor/nginx-1.15.2/src/mail/ngx_mail_handler.c (from vendor/nginx-1.15.1/src/mail/ngx_mail_handler.c) vendor/nginx-1.15.2/src/mail/ngx_mail_imap_handler.c (from vendor/nginx-1.15.1/src/mail/ngx_mail_imap_handler.c) vendor/nginx-1.15.2/src/mail/ngx_mail_imap_module.c (from vendor/nginx-1.15.1/src/mail/ngx_mail_imap_module.c) vendor/nginx-1.15.2/src/mail/ngx_mail_imap_module.h (from vendor/nginx-1.15.1/src/mail/ngx_mail_imap_module.h) vendor/nginx-1.15.2/src/mail/ngx_mail_parse.c (from vendor/nginx-1.15.1/src/mail/ngx_mail_parse.c) vendor/nginx-1.15.2/src/mail/ngx_mail_pop3_handler.c (from vendor/nginx-1.15.1/src/mail/ngx_mail_pop3_handler.c) vendor/nginx-1.15.2/src/mail/ngx_mail_pop3_module.c (from vendor/nginx-1.15.1/src/mail/ngx_mail_pop3_module.c) vendor/nginx-1.15.2/src/mail/ngx_mail_pop3_module.h (from vendor/nginx-1.15.1/src/mail/ngx_mail_pop3_module.h) vendor/nginx-1.15.2/src/mail/ngx_mail_proxy_module.c (from vendor/nginx-1.15.1/src/mail/ngx_mail_proxy_module.c) vendor/nginx-1.15.2/src/mail/ngx_mail_smtp_handler.c (from vendor/nginx-1.15.1/src/mail/ngx_mail_smtp_handler.c) vendor/nginx-1.15.2/src/mail/ngx_mail_smtp_module.c (from vendor/nginx-1.15.1/src/mail/ngx_mail_smtp_module.c) vendor/nginx-1.15.2/src/mail/ngx_mail_smtp_module.h (from vendor/nginx-1.15.1/src/mail/ngx_mail_smtp_module.h) vendor/nginx-1.15.2/src/mail/ngx_mail_ssl_module.c (from vendor/nginx-1.15.1/src/mail/ngx_mail_ssl_module.c) vendor/nginx-1.15.2/src/mail/ngx_mail_ssl_module.h (from vendor/nginx-1.15.1/src/mail/ngx_mail_ssl_module.h) vendor/nginx-1.15.2/src/misc/ngx_cpp_test_module.cpp (from vendor/nginx-1.15.1/src/misc/ngx_cpp_test_module.cpp) vendor/nginx-1.15.2/src/misc/ngx_google_perftools_module.c (from vendor/nginx-1.15.1/src/misc/ngx_google_perftools_module.c) vendor/nginx-1.15.2/src/os/unix/ngx_alloc.c (from vendor/nginx-1.15.1/src/os/unix/ngx_alloc.c) vendor/nginx-1.15.2/src/os/unix/ngx_alloc.h (from vendor/nginx-1.15.1/src/os/unix/ngx_alloc.h) vendor/nginx-1.15.2/src/os/unix/ngx_atomic.h (from vendor/nginx-1.15.1/src/os/unix/ngx_atomic.h) vendor/nginx-1.15.2/src/os/unix/ngx_channel.c (from vendor/nginx-1.15.1/src/os/unix/ngx_channel.c) vendor/nginx-1.15.2/src/os/unix/ngx_channel.h (from vendor/nginx-1.15.1/src/os/unix/ngx_channel.h) vendor/nginx-1.15.2/src/os/unix/ngx_daemon.c (from vendor/nginx-1.15.1/src/os/unix/ngx_daemon.c) vendor/nginx-1.15.2/src/os/unix/ngx_darwin.h (from vendor/nginx-1.15.1/src/os/unix/ngx_darwin.h) vendor/nginx-1.15.2/src/os/unix/ngx_darwin_config.h (from vendor/nginx-1.15.1/src/os/unix/ngx_darwin_config.h) vendor/nginx-1.15.2/src/os/unix/ngx_darwin_init.c (from vendor/nginx-1.15.1/src/os/unix/ngx_darwin_init.c) vendor/nginx-1.15.2/src/os/unix/ngx_darwin_sendfile_chain.c (from vendor/nginx-1.15.1/src/os/unix/ngx_darwin_sendfile_chain.c) vendor/nginx-1.15.2/src/os/unix/ngx_dlopen.c (from vendor/nginx-1.15.1/src/os/unix/ngx_dlopen.c) vendor/nginx-1.15.2/src/os/unix/ngx_dlopen.h (from vendor/nginx-1.15.1/src/os/unix/ngx_dlopen.h) vendor/nginx-1.15.2/src/os/unix/ngx_errno.c (from vendor/nginx-1.15.1/src/os/unix/ngx_errno.c) vendor/nginx-1.15.2/src/os/unix/ngx_errno.h (from vendor/nginx-1.15.1/src/os/unix/ngx_errno.h) vendor/nginx-1.15.2/src/os/unix/ngx_file_aio_read.c (from vendor/nginx-1.15.1/src/os/unix/ngx_file_aio_read.c) vendor/nginx-1.15.2/src/os/unix/ngx_files.c (from vendor/nginx-1.15.1/src/os/unix/ngx_files.c) vendor/nginx-1.15.2/src/os/unix/ngx_files.h (from vendor/nginx-1.15.1/src/os/unix/ngx_files.h) vendor/nginx-1.15.2/src/os/unix/ngx_freebsd.h (from vendor/nginx-1.15.1/src/os/unix/ngx_freebsd.h) vendor/nginx-1.15.2/src/os/unix/ngx_freebsd_config.h (from vendor/nginx-1.15.1/src/os/unix/ngx_freebsd_config.h) vendor/nginx-1.15.2/src/os/unix/ngx_freebsd_init.c (from vendor/nginx-1.15.1/src/os/unix/ngx_freebsd_init.c) vendor/nginx-1.15.2/src/os/unix/ngx_freebsd_sendfile_chain.c (from vendor/nginx-1.15.1/src/os/unix/ngx_freebsd_sendfile_chain.c) vendor/nginx-1.15.2/src/os/unix/ngx_gcc_atomic_amd64.h (from vendor/nginx-1.15.1/src/os/unix/ngx_gcc_atomic_amd64.h) vendor/nginx-1.15.2/src/os/unix/ngx_gcc_atomic_ppc.h (from vendor/nginx-1.15.1/src/os/unix/ngx_gcc_atomic_ppc.h) vendor/nginx-1.15.2/src/os/unix/ngx_gcc_atomic_sparc64.h (from vendor/nginx-1.15.1/src/os/unix/ngx_gcc_atomic_sparc64.h) vendor/nginx-1.15.2/src/os/unix/ngx_gcc_atomic_x86.h (from vendor/nginx-1.15.1/src/os/unix/ngx_gcc_atomic_x86.h) vendor/nginx-1.15.2/src/os/unix/ngx_linux.h (from vendor/nginx-1.15.1/src/os/unix/ngx_linux.h) vendor/nginx-1.15.2/src/os/unix/ngx_linux_aio_read.c (from vendor/nginx-1.15.1/src/os/unix/ngx_linux_aio_read.c) vendor/nginx-1.15.2/src/os/unix/ngx_linux_config.h (from vendor/nginx-1.15.1/src/os/unix/ngx_linux_config.h) vendor/nginx-1.15.2/src/os/unix/ngx_linux_init.c (from vendor/nginx-1.15.1/src/os/unix/ngx_linux_init.c) vendor/nginx-1.15.2/src/os/unix/ngx_linux_sendfile_chain.c (from vendor/nginx-1.15.1/src/os/unix/ngx_linux_sendfile_chain.c) vendor/nginx-1.15.2/src/os/unix/ngx_os.h (from vendor/nginx-1.15.1/src/os/unix/ngx_os.h) vendor/nginx-1.15.2/src/os/unix/ngx_posix_config.h (from vendor/nginx-1.15.1/src/os/unix/ngx_posix_config.h) vendor/nginx-1.15.2/src/os/unix/ngx_posix_init.c (from vendor/nginx-1.15.1/src/os/unix/ngx_posix_init.c) vendor/nginx-1.15.2/src/os/unix/ngx_process.c (from vendor/nginx-1.15.1/src/os/unix/ngx_process.c) vendor/nginx-1.15.2/src/os/unix/ngx_process.h (from vendor/nginx-1.15.1/src/os/unix/ngx_process.h) vendor/nginx-1.15.2/src/os/unix/ngx_process_cycle.c (from vendor/nginx-1.15.1/src/os/unix/ngx_process_cycle.c) vendor/nginx-1.15.2/src/os/unix/ngx_process_cycle.h (from vendor/nginx-1.15.1/src/os/unix/ngx_process_cycle.h) vendor/nginx-1.15.2/src/os/unix/ngx_readv_chain.c (from vendor/nginx-1.15.1/src/os/unix/ngx_readv_chain.c) vendor/nginx-1.15.2/src/os/unix/ngx_recv.c (from vendor/nginx-1.15.1/src/os/unix/ngx_recv.c) vendor/nginx-1.15.2/src/os/unix/ngx_send.c (from vendor/nginx-1.15.1/src/os/unix/ngx_send.c) vendor/nginx-1.15.2/src/os/unix/ngx_setaffinity.c (from vendor/nginx-1.15.1/src/os/unix/ngx_setaffinity.c) vendor/nginx-1.15.2/src/os/unix/ngx_setaffinity.h (from vendor/nginx-1.15.1/src/os/unix/ngx_setaffinity.h) vendor/nginx-1.15.2/src/os/unix/ngx_setproctitle.c (from vendor/nginx-1.15.1/src/os/unix/ngx_setproctitle.c) vendor/nginx-1.15.2/src/os/unix/ngx_setproctitle.h (from vendor/nginx-1.15.1/src/os/unix/ngx_setproctitle.h) vendor/nginx-1.15.2/src/os/unix/ngx_shmem.c (from vendor/nginx-1.15.1/src/os/unix/ngx_shmem.c) vendor/nginx-1.15.2/src/os/unix/ngx_shmem.h (from vendor/nginx-1.15.1/src/os/unix/ngx_shmem.h) vendor/nginx-1.15.2/src/os/unix/ngx_socket.c (from vendor/nginx-1.15.1/src/os/unix/ngx_socket.c) vendor/nginx-1.15.2/src/os/unix/ngx_socket.h (from vendor/nginx-1.15.1/src/os/unix/ngx_socket.h) vendor/nginx-1.15.2/src/os/unix/ngx_solaris.h (from vendor/nginx-1.15.1/src/os/unix/ngx_solaris.h) vendor/nginx-1.15.2/src/os/unix/ngx_solaris_config.h (from vendor/nginx-1.15.1/src/os/unix/ngx_solaris_config.h) vendor/nginx-1.15.2/src/os/unix/ngx_solaris_init.c (from vendor/nginx-1.15.1/src/os/unix/ngx_solaris_init.c) vendor/nginx-1.15.2/src/os/unix/ngx_solaris_sendfilev_chain.c (from vendor/nginx-1.15.1/src/os/unix/ngx_solaris_sendfilev_chain.c) vendor/nginx-1.15.2/src/os/unix/ngx_sunpro_amd64.il (from vendor/nginx-1.15.1/src/os/unix/ngx_sunpro_amd64.il) vendor/nginx-1.15.2/src/os/unix/ngx_sunpro_atomic_sparc64.h (from vendor/nginx-1.15.1/src/os/unix/ngx_sunpro_atomic_sparc64.h) vendor/nginx-1.15.2/src/os/unix/ngx_sunpro_sparc64.il (from vendor/nginx-1.15.1/src/os/unix/ngx_sunpro_sparc64.il) vendor/nginx-1.15.2/src/os/unix/ngx_sunpro_x86.il (from vendor/nginx-1.15.1/src/os/unix/ngx_sunpro_x86.il) vendor/nginx-1.15.2/src/os/unix/ngx_thread.h (from vendor/nginx-1.15.1/src/os/unix/ngx_thread.h) vendor/nginx-1.15.2/src/os/unix/ngx_thread_cond.c (from vendor/nginx-1.15.1/src/os/unix/ngx_thread_cond.c) vendor/nginx-1.15.2/src/os/unix/ngx_thread_id.c (from vendor/nginx-1.15.1/src/os/unix/ngx_thread_id.c) vendor/nginx-1.15.2/src/os/unix/ngx_thread_mutex.c (from vendor/nginx-1.15.1/src/os/unix/ngx_thread_mutex.c) vendor/nginx-1.15.2/src/os/unix/ngx_time.c (from vendor/nginx-1.15.1/src/os/unix/ngx_time.c) vendor/nginx-1.15.2/src/os/unix/ngx_time.h (from vendor/nginx-1.15.1/src/os/unix/ngx_time.h) vendor/nginx-1.15.2/src/os/unix/ngx_udp_recv.c (from vendor/nginx-1.15.1/src/os/unix/ngx_udp_recv.c) vendor/nginx-1.15.2/src/os/unix/ngx_udp_send.c (from vendor/nginx-1.15.1/src/os/unix/ngx_udp_send.c) vendor/nginx-1.15.2/src/os/unix/ngx_udp_sendmsg_chain.c (from vendor/nginx-1.15.1/src/os/unix/ngx_udp_sendmsg_chain.c) vendor/nginx-1.15.2/src/os/unix/ngx_user.c (from vendor/nginx-1.15.1/src/os/unix/ngx_user.c) vendor/nginx-1.15.2/src/os/unix/ngx_user.h (from vendor/nginx-1.15.1/src/os/unix/ngx_user.h) vendor/nginx-1.15.2/src/os/unix/ngx_writev_chain.c (from vendor/nginx-1.15.1/src/os/unix/ngx_writev_chain.c) vendor/nginx-1.15.2/src/os/win32/nginx.ico (from vendor/nginx-1.15.1/src/os/win32/nginx.ico) vendor/nginx-1.15.2/src/os/win32/nginx.rc (from vendor/nginx-1.15.1/src/os/win32/nginx.rc) vendor/nginx-1.15.2/src/os/win32/nginx_icon16.xpm (from vendor/nginx-1.15.1/src/os/win32/nginx_icon16.xpm) vendor/nginx-1.15.2/src/os/win32/nginx_icon32.xpm (from vendor/nginx-1.15.1/src/os/win32/nginx_icon32.xpm) vendor/nginx-1.15.2/src/os/win32/nginx_icon48.xpm (from vendor/nginx-1.15.1/src/os/win32/nginx_icon48.xpm) vendor/nginx-1.15.2/src/os/win32/ngx_alloc.c (from vendor/nginx-1.15.1/src/os/win32/ngx_alloc.c) vendor/nginx-1.15.2/src/os/win32/ngx_alloc.h (from vendor/nginx-1.15.1/src/os/win32/ngx_alloc.h) vendor/nginx-1.15.2/src/os/win32/ngx_atomic.h (from vendor/nginx-1.15.1/src/os/win32/ngx_atomic.h) vendor/nginx-1.15.2/src/os/win32/ngx_dlopen.c (from vendor/nginx-1.15.1/src/os/win32/ngx_dlopen.c) vendor/nginx-1.15.2/src/os/win32/ngx_dlopen.h (from vendor/nginx-1.15.1/src/os/win32/ngx_dlopen.h) vendor/nginx-1.15.2/src/os/win32/ngx_errno.c (from vendor/nginx-1.15.1/src/os/win32/ngx_errno.c) vendor/nginx-1.15.2/src/os/win32/ngx_errno.h (from vendor/nginx-1.15.1/src/os/win32/ngx_errno.h) vendor/nginx-1.15.2/src/os/win32/ngx_event_log.c (from vendor/nginx-1.15.1/src/os/win32/ngx_event_log.c) vendor/nginx-1.15.2/src/os/win32/ngx_files.c (from vendor/nginx-1.15.1/src/os/win32/ngx_files.c) vendor/nginx-1.15.2/src/os/win32/ngx_files.h (from vendor/nginx-1.15.1/src/os/win32/ngx_files.h) vendor/nginx-1.15.2/src/os/win32/ngx_os.h (from vendor/nginx-1.15.1/src/os/win32/ngx_os.h) vendor/nginx-1.15.2/src/os/win32/ngx_process.c (from vendor/nginx-1.15.1/src/os/win32/ngx_process.c) vendor/nginx-1.15.2/src/os/win32/ngx_process.h (from vendor/nginx-1.15.1/src/os/win32/ngx_process.h) vendor/nginx-1.15.2/src/os/win32/ngx_process_cycle.c (from vendor/nginx-1.15.1/src/os/win32/ngx_process_cycle.c) vendor/nginx-1.15.2/src/os/win32/ngx_process_cycle.h (from vendor/nginx-1.15.1/src/os/win32/ngx_process_cycle.h) vendor/nginx-1.15.2/src/os/win32/ngx_service.c (from vendor/nginx-1.15.1/src/os/win32/ngx_service.c) vendor/nginx-1.15.2/src/os/win32/ngx_shmem.c (from vendor/nginx-1.15.1/src/os/win32/ngx_shmem.c) vendor/nginx-1.15.2/src/os/win32/ngx_shmem.h (from vendor/nginx-1.15.1/src/os/win32/ngx_shmem.h) vendor/nginx-1.15.2/src/os/win32/ngx_socket.c (from vendor/nginx-1.15.1/src/os/win32/ngx_socket.c) vendor/nginx-1.15.2/src/os/win32/ngx_socket.h (from vendor/nginx-1.15.1/src/os/win32/ngx_socket.h) vendor/nginx-1.15.2/src/os/win32/ngx_stat.c (from vendor/nginx-1.15.1/src/os/win32/ngx_stat.c) vendor/nginx-1.15.2/src/os/win32/ngx_thread.c (from vendor/nginx-1.15.1/src/os/win32/ngx_thread.c) vendor/nginx-1.15.2/src/os/win32/ngx_thread.h (from vendor/nginx-1.15.1/src/os/win32/ngx_thread.h) vendor/nginx-1.15.2/src/os/win32/ngx_time.c (from vendor/nginx-1.15.1/src/os/win32/ngx_time.c) vendor/nginx-1.15.2/src/os/win32/ngx_time.h (from vendor/nginx-1.15.1/src/os/win32/ngx_time.h) vendor/nginx-1.15.2/src/os/win32/ngx_udp_wsarecv.c (from vendor/nginx-1.15.1/src/os/win32/ngx_udp_wsarecv.c) vendor/nginx-1.15.2/src/os/win32/ngx_user.c (from vendor/nginx-1.15.1/src/os/win32/ngx_user.c) vendor/nginx-1.15.2/src/os/win32/ngx_user.h (from vendor/nginx-1.15.1/src/os/win32/ngx_user.h) vendor/nginx-1.15.2/src/os/win32/ngx_win32_config.h (from vendor/nginx-1.15.1/src/os/win32/ngx_win32_config.h) vendor/nginx-1.15.2/src/os/win32/ngx_win32_init.c (from vendor/nginx-1.15.1/src/os/win32/ngx_win32_init.c) vendor/nginx-1.15.2/src/os/win32/ngx_wsarecv.c (from vendor/nginx-1.15.1/src/os/win32/ngx_wsarecv.c) vendor/nginx-1.15.2/src/os/win32/ngx_wsarecv_chain.c (from vendor/nginx-1.15.1/src/os/win32/ngx_wsarecv_chain.c) vendor/nginx-1.15.2/src/os/win32/ngx_wsasend.c (from vendor/nginx-1.15.1/src/os/win32/ngx_wsasend.c) vendor/nginx-1.15.2/src/os/win32/ngx_wsasend_chain.c (from vendor/nginx-1.15.1/src/os/win32/ngx_wsasend_chain.c) vendor/nginx-1.15.2/src/stream/ngx_stream.c (from vendor/nginx-1.15.1/src/stream/ngx_stream.c) vendor/nginx-1.15.2/src/stream/ngx_stream.h (from vendor/nginx-1.15.1/src/stream/ngx_stream.h) vendor/nginx-1.15.2/src/stream/ngx_stream_access_module.c (from vendor/nginx-1.15.1/src/stream/ngx_stream_access_module.c) vendor/nginx-1.15.2/src/stream/ngx_stream_core_module.c (from vendor/nginx-1.15.1/src/stream/ngx_stream_core_module.c) vendor/nginx-1.15.2/src/stream/ngx_stream_geo_module.c (from vendor/nginx-1.15.1/src/stream/ngx_stream_geo_module.c) vendor/nginx-1.15.2/src/stream/ngx_stream_geoip_module.c (from vendor/nginx-1.15.1/src/stream/ngx_stream_geoip_module.c) vendor/nginx-1.15.2/src/stream/ngx_stream_handler.c (from vendor/nginx-1.15.1/src/stream/ngx_stream_handler.c) vendor/nginx-1.15.2/src/stream/ngx_stream_limit_conn_module.c (from vendor/nginx-1.15.1/src/stream/ngx_stream_limit_conn_module.c) vendor/nginx-1.15.2/src/stream/ngx_stream_log_module.c (from vendor/nginx-1.15.1/src/stream/ngx_stream_log_module.c) vendor/nginx-1.15.2/src/stream/ngx_stream_map_module.c (from vendor/nginx-1.15.1/src/stream/ngx_stream_map_module.c) vendor/nginx-1.15.2/src/stream/ngx_stream_proxy_module.c (from vendor/nginx-1.15.1/src/stream/ngx_stream_proxy_module.c) vendor/nginx-1.15.2/src/stream/ngx_stream_realip_module.c (from vendor/nginx-1.15.1/src/stream/ngx_stream_realip_module.c) vendor/nginx-1.15.2/src/stream/ngx_stream_return_module.c (from vendor/nginx-1.15.1/src/stream/ngx_stream_return_module.c) vendor/nginx-1.15.2/src/stream/ngx_stream_script.c (from vendor/nginx-1.15.1/src/stream/ngx_stream_script.c) vendor/nginx-1.15.2/src/stream/ngx_stream_script.h (from vendor/nginx-1.15.1/src/stream/ngx_stream_script.h) vendor/nginx-1.15.2/src/stream/ngx_stream_split_clients_module.c (from vendor/nginx-1.15.1/src/stream/ngx_stream_split_clients_module.c) vendor/nginx-1.15.2/src/stream/ngx_stream_ssl_module.c (from vendor/nginx-1.15.1/src/stream/ngx_stream_ssl_module.c) vendor/nginx-1.15.2/src/stream/ngx_stream_ssl_module.h (from vendor/nginx-1.15.1/src/stream/ngx_stream_ssl_module.h) vendor/nginx-1.15.2/src/stream/ngx_stream_ssl_preread_module.c (from vendor/nginx-1.15.1/src/stream/ngx_stream_ssl_preread_module.c) vendor/nginx-1.15.2/src/stream/ngx_stream_upstream.c (from vendor/nginx-1.15.1/src/stream/ngx_stream_upstream.c) vendor/nginx-1.15.2/src/stream/ngx_stream_upstream.h (from vendor/nginx-1.15.1/src/stream/ngx_stream_upstream.h) vendor/nginx-1.15.2/src/stream/ngx_stream_upstream_hash_module.c (from vendor/nginx-1.15.1/src/stream/ngx_stream_upstream_hash_module.c) vendor/nginx-1.15.2/src/stream/ngx_stream_upstream_least_conn_module.c (from vendor/nginx-1.15.1/src/stream/ngx_stream_upstream_least_conn_module.c) vendor/nginx-1.15.2/src/stream/ngx_stream_upstream_random_module.c (from vendor/nginx-1.15.1/src/stream/ngx_stream_upstream_random_module.c) vendor/nginx-1.15.2/src/stream/ngx_stream_upstream_round_robin.c (from vendor/nginx-1.15.1/src/stream/ngx_stream_upstream_round_robin.c) vendor/nginx-1.15.2/src/stream/ngx_stream_upstream_round_robin.h (from vendor/nginx-1.15.1/src/stream/ngx_stream_upstream_round_robin.h) vendor/nginx-1.15.2/src/stream/ngx_stream_upstream_zone_module.c (from vendor/nginx-1.15.1/src/stream/ngx_stream_upstream_zone_module.c) vendor/nginx-1.15.2/src/stream/ngx_stream_variables.c (from vendor/nginx-1.15.1/src/stream/ngx_stream_variables.c) vendor/nginx-1.15.2/src/stream/ngx_stream_variables.h (from vendor/nginx-1.15.1/src/stream/ngx_stream_variables.h) vendor/nginx-1.15.2/src/stream/ngx_stream_write_filter_module.c (from vendor/nginx-1.15.1/src/stream/ngx_stream_write_filter_module.c) Modified: nginx_version (+1 -1) =================================================================== --- nginx_version 2018-07-24 17:32:13 +0900 (ace44233b) +++ nginx_version 2018-07-25 00:24:20 +0900 (42cf0675c) @@ -1 +1 @@ -1.15.1 +1.15.2 Renamed: vendor/nginx-1.15.2/auto/cc/acc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/cc/bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/cc/ccc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/cc/clang (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/cc/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/cc/gcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/cc/icc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/cc/msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/cc/name (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/cc/owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/cc/sunc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/configure (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/define (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/endianness (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/feature (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/have (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/have_headers (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/headers (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/include (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/init (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/install (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/lib/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/lib/geoip/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/lib/google-perftools/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/lib/libatomic/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/lib/libatomic/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/lib/libgd/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/lib/libxslt/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/lib/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/lib/openssl/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/lib/openssl/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/lib/openssl/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/lib/openssl/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/lib/pcre/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/lib/pcre/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/lib/pcre/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/lib/pcre/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/lib/pcre/makefile.owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/lib/perl/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/lib/perl/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/lib/zlib/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/lib/zlib/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/lib/zlib/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/lib/zlib/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/lib/zlib/makefile.owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/module (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/modules (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/nohave (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/options (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/os/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/os/darwin (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/os/freebsd (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/os/linux (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/os/solaris (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/os/win32 (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/sources (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/stubs (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/summary (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/threads (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/types/sizeof (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/types/typedef (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/types/uintptr_t (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/types/value (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/auto/unix (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/conf/fastcgi.conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/conf/fastcgi_params (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/conf/koi-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/conf/koi-win (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/conf/mime.types (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/conf/nginx.conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/conf/scgi_params (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/conf/uwsgi_params (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/conf/win-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/contrib/README (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/contrib/geo2nginx.pl (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/contrib/unicode2nginx/koi-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/contrib/unicode2nginx/unicode-to-nginx.pl (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/contrib/unicode2nginx/win-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/contrib/vim/ftdetect/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/contrib/vim/ftplugin/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/contrib/vim/indent/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/contrib/vim/syntax/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/docs/GNUmakefile (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/docs/dtd/change_log_conf.dtd (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/docs/dtd/changes.dtd (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/docs/html/50x.html (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/docs/html/index.html (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/docs/man/nginx.8 (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/docs/text/LICENSE (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/docs/text/README (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/docs/xml/change_log_conf.xml (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/docs/xml/nginx/changes.xml (+86 -0) 99% =================================================================== --- vendor/nginx-1.15.1/docs/xml/nginx/changes.xml 2018-07-24 17:32:13 +0900 (6d4c5d939) +++ vendor/nginx-1.15.2/docs/xml/nginx/changes.xml 2018-07-25 00:24:20 +0900 (bb8948d77) @@ -5,6 +5,92 @@ <change_log title="nginx"> +<changes ver="1.15.2" date="2018-07-24"> + +<change type="feature"> +<para lang="ru"> +переменная $ssl_preread_protocol +в модуле ngx_stream_ssl_preread_module. +</para> +<para lang="en"> +the $ssl_preread_protocol variable +in the ngx_stream_ssl_preread_module. +</para> +</change> + +<change type="feature"> +<para lang="ru"> +теперь при использовании директивы reset_timedout_connection +nginx сбрасывает соединения, закрываемые с кодом 444. +</para> +<para lang="en"> +now when using the "reset_timedout_connection" directive +nginx will reset connections being closed with the 444 code. +</para> +</change> + +<change type="change"> +<para lang="ru"> +уровень логгирования ошибок SSL "http request", "https proxy request", +"unsupported protocol" и "version too low" +понижен с уровня crit до info. +</para> +<para lang="en"> +a logging level of the "http request", "https proxy request", +"unsupported protocol", and "version too low" SSL errors +has been lowered from "crit" to "info". +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +запросы к DNS-серверу не отправлялись повторно, +если при первой попытке отправки происходила ошибка. +</para> +<para lang="en"> +DNS requests were not resent +if initial sending of a request failed. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +параметр reuseport директивы listen игнорировался, +если количество рабочих процессов было задано после директивы listen. +</para> +<para lang="en"> +the "reuseport" parameter of the "listen" directive was ignored +if the number of worker processes was specified after the "listen" directive. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +при использовании OpenSSL 1.1.0 и новее +директиву ssl_prefer_server_ciphers нельзя было выключить +в виртуальном сервере, если она была включена в сервере по умолчанию. +</para> +<para lang="en"> +when using OpenSSL 1.1.0 or newer +it was not possible to switch off "ssl_prefer_server_ciphers" in +a virtual server if it was switched on in the default server. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +повторное использование SSL-сессий к бэкендам +не работало с протоколом TLS 1.3. +</para> +<para lang="en"> +SSL session reuse with upstream servers +did not work with the TLS 1.3 protocol. +</para> +</change> + +</changes> + + <changes ver="1.15.1" date="2018-07-03"> <change type="feature"> Renamed: vendor/nginx-1.15.2/docs/xsls/changes.xsls (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/docs/xslt/changes.xslt (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/misc/GNUmakefile (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/misc/README (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/nginx.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/nginx.h (+2 -2) 85% =================================================================== --- vendor/nginx-1.15.1/src/core/nginx.h 2018-07-24 17:32:13 +0900 (d96c1b436) +++ vendor/nginx-1.15.2/src/core/nginx.h 2018-07-25 00:24:20 +0900 (d563a6a39) @@ -9,8 +9,8 @@ #define _NGINX_H_INCLUDED_ -#define nginx_version 1015001 -#define NGINX_VERSION "1.15.1" +#define nginx_version 1015002 +#define NGINX_VERSION "1.15.2" #define NGINX_VER "nginx/" NGINX_VERSION #ifdef NGX_BUILD Renamed: vendor/nginx-1.15.2/src/core/ngx_array.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_array.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_buf.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_buf.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_conf_file.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_conf_file.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_connection.c (+4 -5) 99% =================================================================== --- vendor/nginx-1.15.1/src/core/ngx_connection.c 2018-07-24 17:32:13 +0900 (61ea4c2dd) +++ vendor/nginx-1.15.2/src/core/ngx_connection.c 2018-07-25 00:24:20 +0900 (33682532a) @@ -96,7 +96,7 @@ ngx_create_listening(ngx_conf_t *cf, struct sockaddr *sockaddr, ngx_int_t -ngx_clone_listening(ngx_conf_t *cf, ngx_listening_t *ls) +ngx_clone_listening(ngx_cycle_t *cycle, ngx_listening_t *ls) { #if (NGX_HAVE_REUSEPORT) @@ -104,20 +104,19 @@ ngx_clone_listening(ngx_conf_t *cf, ngx_listening_t *ls) ngx_core_conf_t *ccf; ngx_listening_t ols; - if (!ls->reuseport) { + if (!ls->reuseport || ls->worker != 0) { return NGX_OK; } ols = *ls; - ccf = (ngx_core_conf_t *) ngx_get_conf(cf->cycle->conf_ctx, - ngx_core_module); + ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module); for (n = 1; n < ccf->worker_processes; n++) { /* create a socket for each worker process */ - ls = ngx_array_push(&cf->cycle->listening); + ls = ngx_array_push(&cycle->listening); if (ls == NULL) { return NGX_ERROR; } Renamed: vendor/nginx-1.15.2/src/core/ngx_connection.h (+1 -1) 98% =================================================================== --- vendor/nginx-1.15.1/src/core/ngx_connection.h 2018-07-24 17:32:13 +0900 (ef0755800) +++ vendor/nginx-1.15.2/src/core/ngx_connection.h 2018-07-25 00:24:20 +0900 (54059629e) @@ -210,7 +210,7 @@ struct ngx_connection_s { ngx_listening_t *ngx_create_listening(ngx_conf_t *cf, struct sockaddr *sockaddr, socklen_t socklen); -ngx_int_t ngx_clone_listening(ngx_conf_t *cf, ngx_listening_t *ls); +ngx_int_t ngx_clone_listening(ngx_cycle_t *cycle, ngx_listening_t *ls); ngx_int_t ngx_set_inherited_sockets(ngx_cycle_t *cycle); ngx_int_t ngx_open_listening_sockets(ngx_cycle_t *cycle); void ngx_configure_listening_sockets(ngx_cycle_t *cycle); Renamed: vendor/nginx-1.15.2/src/core/ngx_core.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_cpuinfo.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_crc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_crc32.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_crc32.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_crypt.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_crypt.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_cycle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_cycle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_file.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_file.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_hash.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_hash.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_inet.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_inet.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_list.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_list.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_log.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_log.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_md5.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_md5.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_murmurhash.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_murmurhash.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_open_file_cache.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_open_file_cache.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_output_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_palloc.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_palloc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_parse.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_parse.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_parse_time.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_parse_time.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_proxy_protocol.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_proxy_protocol.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_queue.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_queue.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_radix_tree.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_radix_tree.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_rbtree.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_rbtree.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_regex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_regex.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_resolver.c (+18 -2) 99% =================================================================== --- vendor/nginx-1.15.1/src/core/ngx_resolver.c 2018-07-24 17:32:13 +0900 (d96970434) +++ vendor/nginx-1.15.2/src/core/ngx_resolver.c 2018-07-25 00:24:20 +0900 (5d7fe312d) @@ -847,7 +847,15 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx, rn->nsrvs = 0; if (ngx_resolver_send_query(r, rn) != NGX_OK) { - goto failed; + + /* immediately retry once on failure */ + + rn->last_connection++; + if (rn->last_connection == r->connections.nelts) { + rn->last_connection = 0; + } + + (void) ngx_resolver_send_query(r, rn); } if (ngx_resolver_set_timeout(r, ctx) != NGX_OK) { @@ -1051,7 +1059,15 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx) rn->nsrvs = 0; if (ngx_resolver_send_query(r, rn) != NGX_OK) { - goto failed; + + /* immediately retry once on failure */ + + rn->last_connection++; + if (rn->last_connection == r->connections.nelts) { + rn->last_connection = 0; + } + + (void) ngx_resolver_send_query(r, rn); } if (ngx_resolver_set_timeout(r, ctx) != NGX_OK) { Renamed: vendor/nginx-1.15.2/src/core/ngx_resolver.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_rwlock.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_rwlock.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_sha1.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_sha1.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_shmtx.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_shmtx.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_slab.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_slab.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_spinlock.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_string.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_string.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_syslog.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_syslog.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_thread_pool.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_thread_pool.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_times.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/core/ngx_times.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/event/modules/ngx_devpoll_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/event/modules/ngx_epoll_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/event/modules/ngx_eventport_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/event/modules/ngx_iocp_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/event/modules/ngx_iocp_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/event/modules/ngx_kqueue_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/event/modules/ngx_poll_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/event/modules/ngx_select_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/event/modules/ngx_win32_select_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/event/ngx_event.c (+40 -0) 97% =================================================================== --- vendor/nginx-1.15.1/src/event/ngx_event.c 2018-07-24 17:32:13 +0900 (57af81324) +++ vendor/nginx-1.15.2/src/event/ngx_event.c 2018-07-25 00:24:20 +0900 (69c55d7a0) @@ -410,12 +410,52 @@ ngx_handle_write_event(ngx_event_t *wev, size_t lowat) static char * ngx_event_init_conf(ngx_cycle_t *cycle, void *conf) { +#if (NGX_HAVE_REUSEPORT) + ngx_uint_t i; + ngx_listening_t *ls; +#endif + if (ngx_get_conf(cycle->conf_ctx, ngx_events_module) == NULL) { ngx_log_error(NGX_LOG_EMERG, cycle->log, 0, "no \"events\" section in configuration"); return NGX_CONF_ERROR; } + if (cycle->connection_n < cycle->listening.nelts + 1) { + + /* + * there should be at least one connection for each listening + * socket, plus an additional connection for channel + */ + + ngx_log_error(NGX_LOG_EMERG, cycle->log, 0, + "%ui worker_connections are not enough " + "for %ui listening sockets", + cycle->connection_n, cycle->listening.nelts); + + return NGX_CONF_ERROR; + } + +#if (NGX_HAVE_REUSEPORT) + + ls = cycle->listening.elts; + for (i = 0; i < cycle->listening.nelts; i++) { + + if (!ls[i].reuseport || ls[i].worker != 0) { + continue; + } + + if (ngx_clone_listening(cycle, &ls[i]) != NGX_OK) { + return NGX_CONF_ERROR; + } + + /* cloning may change cycle->listening.elts */ + + ls = cycle->listening.elts; + } + +#endif + return NGX_CONF_OK; } Renamed: vendor/nginx-1.15.2/src/event/ngx_event.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/event/ngx_event_accept.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/event/ngx_event_acceptex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/event/ngx_event_connect.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/event/ngx_event_connect.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/event/ngx_event_connectex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/event/ngx_event_openssl.c (+74 -1) 98% =================================================================== --- vendor/nginx-1.15.1/src/event/ngx_event_openssl.c 2018-07-24 17:32:13 +0900 (fe14a291a) +++ vendor/nginx-1.15.2/src/event/ngx_event_openssl.c 2018-07-25 00:24:20 +0900 (96ee10543) @@ -24,6 +24,8 @@ static int ngx_ssl_verify_callback(int ok, X509_STORE_CTX *x509_store); static void ngx_ssl_info_callback(const ngx_ssl_conn_t *ssl_conn, int where, int ret); static void ngx_ssl_passwords_cleanup(void *data); +static int ngx_ssl_new_client_session(ngx_ssl_conn_t *ssl_conn, + ngx_ssl_session_t *sess); static void ngx_ssl_handshake_handler(ngx_event_t *ev); static ngx_int_t ngx_ssl_handle_recv(ngx_connection_t *c, int n); static void ngx_ssl_write_handler(ngx_event_t *wev); @@ -295,7 +297,7 @@ ngx_ssl_create(ngx_ssl_t *ssl, ngx_uint_t protocols, void *data) SSL_CTX_set_options(ssl->ctx, SSL_OP_SINGLE_DH_USE); -#ifdef SSL_CTRL_CLEAR_OPTIONS +#if OPENSSL_VERSION_NUMBER >= 0x009080dfL /* only in 0.9.8m+ */ SSL_CTX_clear_options(ssl->ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1); @@ -1162,6 +1164,42 @@ ngx_ssl_ecdh_curve(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *name) ngx_int_t +ngx_ssl_client_session_cache(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_uint_t enable) +{ + if (!enable) { + return NGX_OK; + } + + SSL_CTX_set_session_cache_mode(ssl->ctx, + SSL_SESS_CACHE_CLIENT + |SSL_SESS_CACHE_NO_INTERNAL); + + SSL_CTX_sess_set_new_cb(ssl->ctx, ngx_ssl_new_client_session); + + return NGX_OK; +} + + +static int +ngx_ssl_new_client_session(ngx_ssl_conn_t *ssl_conn, ngx_ssl_session_t *sess) +{ + ngx_connection_t *c; + + c = ngx_ssl_get_connection(ssl_conn); + + if (c->ssl->save_session) { + c->ssl->session = sess; + + c->ssl->save_session(c); + + c->ssl->session = NULL; + } + + return 0; +} + + +ngx_int_t ngx_ssl_create_connection(ngx_ssl_t *ssl, ngx_connection_t *c, ngx_uint_t flags) { ngx_ssl_connection_t *sc; @@ -1193,6 +1231,10 @@ ngx_ssl_create_connection(ngx_ssl_t *ssl, ngx_connection_t *c, ngx_uint_t flags) } else { SSL_set_accept_state(sc->connection); + +#ifdef SSL_OP_NO_RENEGOTIATION + SSL_set_options(sc->connection, SSL_OP_NO_RENEGOTIATION); +#endif } if (SSL_set_ex_data(sc->connection, ngx_ssl_connection_index, c) == 0) { @@ -1206,6 +1248,31 @@ ngx_ssl_create_connection(ngx_ssl_t *ssl, ngx_connection_t *c, ngx_uint_t flags) } +ngx_ssl_session_t * +ngx_ssl_get_session(ngx_connection_t *c) +{ +#ifdef TLS1_3_VERSION + if (c->ssl->session) { + SSL_SESSION_up_ref(c->ssl->session); + return c->ssl->session; + } +#endif + + return SSL_get1_session(c->ssl->connection); +} + + +ngx_ssl_session_t * +ngx_ssl_get0_session(ngx_connection_t *c) +{ + if (c->ssl->session) { + return c->ssl->session; + } + + return SSL_get0_session(c->ssl->connection); +} + + ngx_int_t ngx_ssl_set_session(ngx_connection_t *c, ngx_ssl_session_t *session) { @@ -2062,6 +2129,8 @@ ngx_ssl_connection_error(ngx_connection_t *c, int sslerr, ngx_err_t err, || n == SSL_R_DIGEST_CHECK_FAILED /* 149 */ || n == SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST /* 151 */ || n == SSL_R_EXCESSIVE_MESSAGE_SIZE /* 152 */ + || n == SSL_R_HTTPS_PROXY_REQUEST /* 155 */ + || n == SSL_R_HTTP_REQUEST /* 156 */ || n == SSL_R_LENGTH_MISMATCH /* 159 */ #ifdef SSL_R_NO_CIPHERS_PASSED || n == SSL_R_NO_CIPHERS_PASSED /* 182 */ @@ -2077,6 +2146,7 @@ ngx_ssl_connection_error(ngx_connection_t *c, int sslerr, ngx_err_t err, || n == SSL_R_UNEXPECTED_RECORD /* 245 */ || n == SSL_R_UNKNOWN_ALERT_TYPE /* 246 */ || n == SSL_R_UNKNOWN_PROTOCOL /* 252 */ + || n == SSL_R_UNSUPPORTED_PROTOCOL /* 258 */ || n == SSL_R_WRONG_VERSION_NUMBER /* 267 */ || n == SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC /* 281 */ #ifdef SSL_R_RENEGOTIATE_EXT_TOO_LONG @@ -2093,6 +2163,9 @@ ngx_ssl_connection_error(ngx_connection_t *c, int sslerr, ngx_err_t err, #ifdef SSL_R_INAPPROPRIATE_FALLBACK || n == SSL_R_INAPPROPRIATE_FALLBACK /* 373 */ #endif +#ifdef SSL_R_VERSION_TOO_LOW + || n == SSL_R_VERSION_TOO_LOW /* 396 */ +#endif || n == 1000 /* SSL_R_SSLV3_ALERT_CLOSE_NOTIFY */ #ifdef SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE || n == SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE /* 1010 */ Renamed: vendor/nginx-1.15.2/src/event/ngx_event_openssl.h (+7 -1) 96% =================================================================== --- vendor/nginx-1.15.1/src/event/ngx_event_openssl.h 2018-07-24 17:32:13 +0900 (623d851dc) +++ vendor/nginx-1.15.2/src/event/ngx_event_openssl.h 2018-07-25 00:24:20 +0900 (22350d54b) @@ -77,6 +77,9 @@ struct ngx_ssl_connection_s { ngx_connection_handler_pt handler; + ngx_ssl_session_t *session; + ngx_connection_handler_pt save_session; + ngx_event_handler_pt saved_read_handler; ngx_event_handler_pt saved_write_handler; @@ -168,6 +171,8 @@ RSA *ngx_ssl_rsa512_key_callback(ngx_ssl_conn_t *ssl_conn, int is_export, ngx_array_t *ngx_ssl_read_password_file(ngx_conf_t *cf, ngx_str_t *file); ngx_int_t ngx_ssl_dhparam(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *file); ngx_int_t ngx_ssl_ecdh_curve(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *name); +ngx_int_t ngx_ssl_client_session_cache(ngx_conf_t *cf, ngx_ssl_t *ssl, + ngx_uint_t enable); ngx_int_t ngx_ssl_session_cache(ngx_ssl_t *ssl, ngx_str_t *sess_ctx, ssize_t builtin_session_cache, ngx_shm_zone_t *shm_zone, time_t timeout); ngx_int_t ngx_ssl_session_ticket_keys(ngx_conf_t *cf, ngx_ssl_t *ssl, @@ -178,7 +183,8 @@ ngx_int_t ngx_ssl_create_connection(ngx_ssl_t *ssl, ngx_connection_t *c, void ngx_ssl_remove_cached_session(SSL_CTX *ssl, ngx_ssl_session_t *sess); ngx_int_t ngx_ssl_set_session(ngx_connection_t *c, ngx_ssl_session_t *session); -#define ngx_ssl_get_session(c) SSL_get1_session(c->ssl->connection) +ngx_ssl_session_t *ngx_ssl_get_session(ngx_connection_t *c); +ngx_ssl_session_t *ngx_ssl_get0_session(ngx_connection_t *c); #define ngx_ssl_free_session SSL_SESSION_free #define ngx_ssl_get_connection(ssl_conn) \ SSL_get_ex_data(ssl_conn, ngx_ssl_connection_index) Renamed: vendor/nginx-1.15.2/src/event/ngx_event_openssl_stapling.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/event/ngx_event_pipe.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/event/ngx_event_pipe.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/event/ngx_event_posted.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/event/ngx_event_posted.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/event/ngx_event_timer.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/event/ngx_event_timer.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/event/ngx_event_udp.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_access_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_addition_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_auth_basic_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_auth_request_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_autoindex_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_browser_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_charset_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_chunked_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_dav_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_degradation_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_empty_gif_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_fastcgi_module.c (+1 -1) 99% =================================================================== --- vendor/nginx-1.15.1/src/http/modules/ngx_http_fastcgi_module.c 2018-07-24 17:32:13 +0900 (3eec1b7dd) +++ vendor/nginx-1.15.2/src/http/modules/ngx_http_fastcgi_module.c 2018-07-25 00:24:20 +0900 (f73ff2137) @@ -3501,7 +3501,7 @@ ngx_http_fastcgi_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) clcf->handler = ngx_http_fastcgi_handler; - if (clcf->name.data[clcf->name.len - 1] == '/') { + if (clcf->name.len && clcf->name.data[clcf->name.len - 1] == '/') { clcf->auto_redirect = 1; } Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_flv_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_geo_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_geoip_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_grpc_module.c (+8 -1) 99% =================================================================== --- vendor/nginx-1.15.1/src/http/modules/ngx_http_grpc_module.c 2018-07-24 17:32:13 +0900 (0baa85f28) +++ vendor/nginx-1.15.2/src/http/modules/ngx_http_grpc_module.c 2018-07-25 00:24:20 +0900 (7fbf7366f) @@ -4525,7 +4525,7 @@ ngx_http_grpc_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) clcf->handler = ngx_http_grpc_handler; - if (clcf->name.data[clcf->name.len - 1] == '/') { + if (clcf->name.len && clcf->name.data[clcf->name.len - 1] == '/') { clcf->auto_redirect = 1; } @@ -4627,6 +4627,13 @@ ngx_http_grpc_set_ssl(ngx_conf_t *cf, ngx_http_grpc_loc_conf_t *glcf) } } + if (ngx_ssl_client_session_cache(cf, glcf->upstream.ssl, + glcf->upstream.ssl_session_reuse) + != NGX_OK) + { + return NGX_ERROR; + } + #ifdef TLSEXT_TYPE_application_layer_protocol_negotiation if (SSL_CTX_set_alpn_protos(glcf->upstream.ssl->ctx, Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_gunzip_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_gzip_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_gzip_static_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_headers_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_image_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_index_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_limit_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_limit_req_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_log_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_map_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_memcached_module.c (+1 -1) 99% =================================================================== --- vendor/nginx-1.15.1/src/http/modules/ngx_http_memcached_module.c 2018-07-24 17:32:13 +0900 (82fa71323) +++ vendor/nginx-1.15.2/src/http/modules/ngx_http_memcached_module.c 2018-07-25 00:24:20 +0900 (2624471bb) @@ -707,7 +707,7 @@ ngx_http_memcached_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) clcf->handler = ngx_http_memcached_handler; - if (clcf->name.data[clcf->name.len - 1] == '/') { + if (clcf->name.len && clcf->name.data[clcf->name.len - 1] == '/') { clcf->auto_redirect = 1; } Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_mirror_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_mp4_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_not_modified_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_proxy_module.c (+8 -1) 99% =================================================================== --- vendor/nginx-1.15.1/src/http/modules/ngx_http_proxy_module.c 2018-07-24 17:32:13 +0900 (e7f829d65) +++ vendor/nginx-1.15.2/src/http/modules/ngx_http_proxy_module.c 2018-07-25 00:24:20 +0900 (bc9700771) @@ -3580,7 +3580,7 @@ ngx_http_proxy_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) clcf->handler = ngx_http_proxy_handler; - if (clcf->name.data[clcf->name.len - 1] == '/') { + if (clcf->name.len && clcf->name.data[clcf->name.len - 1] == '/') { clcf->auto_redirect = 1; } @@ -4308,6 +4308,13 @@ ngx_http_proxy_set_ssl(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *plcf) } } + if (ngx_ssl_client_session_cache(cf, plcf->upstream.ssl, + plcf->upstream.ssl_session_reuse) + != NGX_OK) + { + return NGX_ERROR; + } + return NGX_OK; } Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_random_index_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_range_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_realip_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_referer_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_rewrite_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_scgi_module.c (+1 -1) 99% =================================================================== --- vendor/nginx-1.15.1/src/http/modules/ngx_http_scgi_module.c 2018-07-24 17:32:13 +0900 (9bd45bd13) +++ vendor/nginx-1.15.2/src/http/modules/ngx_http_scgi_module.c 2018-07-25 00:24:20 +0900 (ab7769a2a) @@ -1857,7 +1857,7 @@ ngx_http_scgi_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) return NGX_CONF_ERROR; } - if (clcf->name.data[clcf->name.len - 1] == '/') { + if (clcf->name.len && clcf->name.data[clcf->name.len - 1] == '/') { clcf->auto_redirect = 1; } Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_secure_link_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_slice_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_split_clients_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_ssi_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_ssi_filter_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_ssl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_ssl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_static_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_stub_status_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_sub_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_try_files_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_upstream_hash_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_upstream_ip_hash_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_upstream_keepalive_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_upstream_least_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_upstream_random_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_upstream_zone_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_userid_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_uwsgi_module.c (+8 -1) 99% =================================================================== --- vendor/nginx-1.15.1/src/http/modules/ngx_http_uwsgi_module.c 2018-07-24 17:32:13 +0900 (238bcf8a3) +++ vendor/nginx-1.15.2/src/http/modules/ngx_http_uwsgi_module.c 2018-07-25 00:24:20 +0900 (0959133d1) @@ -2144,7 +2144,7 @@ ngx_http_uwsgi_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) return NGX_CONF_ERROR; } - if (clcf->name.data[clcf->name.len - 1] == '/') { + if (clcf->name.len && clcf->name.data[clcf->name.len - 1] == '/') { clcf->auto_redirect = 1; } @@ -2391,6 +2391,13 @@ ngx_http_uwsgi_set_ssl(ngx_conf_t *cf, ngx_http_uwsgi_loc_conf_t *uwcf) } } + if (ngx_ssl_client_session_cache(cf, uwcf->upstream.ssl, + uwcf->upstream.ssl_session_reuse) + != NGX_OK) + { + return NGX_ERROR; + } + return NGX_OK; } Renamed: vendor/nginx-1.15.2/src/http/modules/ngx_http_xslt_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/perl/Makefile.PL (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/perl/nginx.pm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/perl/nginx.xs (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/perl/ngx_http_perl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/perl/ngx_http_perl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/modules/perl/typemap (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/ngx_http.c (+0 -4) 99% =================================================================== --- vendor/nginx-1.15.1/src/http/ngx_http.c 2018-07-24 17:32:13 +0900 (9d8b6d79a) +++ vendor/nginx-1.15.2/src/http/ngx_http.c 2018-07-25 00:24:20 +0900 (5e2022690) @@ -1685,10 +1685,6 @@ ngx_http_init_listening(ngx_conf_t *cf, ngx_http_conf_port_t *port) break; } - if (ngx_clone_listening(cf, ls) != NGX_OK) { - return NGX_ERROR; - } - addr++; last--; } Renamed: vendor/nginx-1.15.2/src/http/ngx_http.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/ngx_http_cache.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/ngx_http_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/ngx_http_copy_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/ngx_http_core_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/ngx_http_core_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/ngx_http_file_cache.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/ngx_http_header_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/ngx_http_parse.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/ngx_http_postpone_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/ngx_http_request.c (+2 -1) 99% =================================================================== --- vendor/nginx-1.15.1/src/http/ngx_http_request.c 2018-07-24 17:32:13 +0900 (0432c91b2) +++ vendor/nginx-1.15.2/src/http/ngx_http_request.c 2018-07-25 00:24:20 +0900 (979009158) @@ -912,7 +912,7 @@ ngx_http_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg) SSL_set_verify_depth(ssl_conn, SSL_CTX_get_verify_depth(sscf->ssl.ctx)); -#ifdef SSL_CTRL_CLEAR_OPTIONS +#if OPENSSL_VERSION_NUMBER >= 0x009080dfL /* only in 0.9.8m+ */ SSL_clear_options(ssl_conn, SSL_get_options(ssl_conn) & ~SSL_CTX_get_options(sscf->ssl.ctx)); @@ -2353,6 +2353,7 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc) || rc == NGX_HTTP_NO_CONTENT) { if (rc == NGX_HTTP_CLOSE) { + c->timedout = 1; ngx_http_terminate_request(r, rc); return; } Renamed: vendor/nginx-1.15.2/src/http/ngx_http_request.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/ngx_http_request_body.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/ngx_http_script.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/ngx_http_script.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/ngx_http_special_response.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/ngx_http_upstream.c (+24 -4) 99% =================================================================== --- vendor/nginx-1.15.1/src/http/ngx_http_upstream.c 2018-07-24 17:32:13 +0900 (aba1fbb07) +++ vendor/nginx-1.15.2/src/http/ngx_http_upstream.c 2018-07-25 00:24:20 +0900 (63fa5d998) @@ -187,6 +187,7 @@ static void ngx_http_upstream_ssl_init_connection(ngx_http_request_t *, static void ngx_http_upstream_ssl_handshake_handler(ngx_connection_t *c); static void ngx_http_upstream_ssl_handshake(ngx_http_request_t *, ngx_http_upstream_t *u, ngx_connection_t *c); +static void ngx_http_upstream_ssl_save_session(ngx_connection_t *c); static ngx_int_t ngx_http_upstream_ssl_name(ngx_http_request_t *r, ngx_http_upstream_t *u, ngx_connection_t *c); #endif @@ -1675,6 +1676,8 @@ ngx_http_upstream_ssl_init_connection(ngx_http_request_t *r, } if (u->conf->ssl_session_reuse) { + c->ssl->save_session = ngx_http_upstream_ssl_save_session; + if (u->peer.set_session(&u->peer, u->peer.data) != NGX_OK) { ngx_http_upstream_finalize_request(r, u, NGX_HTTP_INTERNAL_SERVER_ERROR); @@ -1759,10 +1762,6 @@ ngx_http_upstream_ssl_handshake(ngx_http_request_t *r, ngx_http_upstream_t *u, } } - if (u->conf->ssl_session_reuse) { - u->peer.save_session(&u->peer, u->peer.data); - } - c->write->handler = ngx_http_upstream_handler; c->read->handler = ngx_http_upstream_handler; @@ -1782,6 +1781,27 @@ failed: } +static void +ngx_http_upstream_ssl_save_session(ngx_connection_t *c) +{ + ngx_http_request_t *r; + ngx_http_upstream_t *u; + + if (c->idle) { + return; + } + + r = c->data; + + u = r->upstream; + c = r->connection; + + ngx_http_set_log_request(c->log, r); + + u->peer.save_session(&u->peer, u->peer.data); +} + + static ngx_int_t ngx_http_upstream_ssl_name(ngx_http_request_t *r, ngx_http_upstream_t *u, ngx_connection_t *c) Renamed: vendor/nginx-1.15.2/src/http/ngx_http_upstream.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/ngx_http_upstream_round_robin.c (+1 -1) 99% =================================================================== --- vendor/nginx-1.15.1/src/http/ngx_http_upstream_round_robin.c 2018-07-24 17:32:13 +0900 (f6051ae57) +++ vendor/nginx-1.15.2/src/http/ngx_http_upstream_round_robin.c 2018-07-25 00:24:20 +0900 (f72de3ee6) @@ -744,7 +744,7 @@ ngx_http_upstream_save_round_robin_peer_session(ngx_peer_connection_t *pc, if (peers->shpool) { - ssl_session = SSL_get0_session(pc->connection->ssl->connection); + ssl_session = ngx_ssl_get0_session(pc->connection); if (ssl_session == NULL) { return; Renamed: vendor/nginx-1.15.2/src/http/ngx_http_upstream_round_robin.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/ngx_http_variables.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/ngx_http_variables.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/ngx_http_write_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/v2/ngx_http_v2.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/v2/ngx_http_v2.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/v2/ngx_http_v2_encode.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/v2/ngx_http_v2_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/v2/ngx_http_v2_huff_decode.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/v2/ngx_http_v2_huff_encode.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/v2/ngx_http_v2_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/v2/ngx_http_v2_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/http/v2/ngx_http_v2_table.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/mail/ngx_mail.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/mail/ngx_mail.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/mail/ngx_mail_auth_http_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/mail/ngx_mail_core_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/mail/ngx_mail_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/mail/ngx_mail_imap_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/mail/ngx_mail_imap_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/mail/ngx_mail_imap_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/mail/ngx_mail_parse.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/mail/ngx_mail_pop3_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/mail/ngx_mail_pop3_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/mail/ngx_mail_pop3_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/mail/ngx_mail_proxy_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/mail/ngx_mail_smtp_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/mail/ngx_mail_smtp_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/mail/ngx_mail_smtp_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/mail/ngx_mail_ssl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/mail/ngx_mail_ssl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/misc/ngx_cpp_test_module.cpp (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/misc/ngx_google_perftools_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_alloc.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_alloc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_atomic.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_channel.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_channel.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_daemon.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_darwin.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_darwin_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_darwin_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_darwin_sendfile_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_dlopen.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_dlopen.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_errno.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_errno.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_file_aio_read.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_files.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_files.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_freebsd.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_freebsd_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_freebsd_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_freebsd_sendfile_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_gcc_atomic_amd64.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_gcc_atomic_ppc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_gcc_atomic_sparc64.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_gcc_atomic_x86.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_linux.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_linux_aio_read.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_linux_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_linux_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_linux_sendfile_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_os.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_posix_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_posix_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_process.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_process.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_process_cycle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_process_cycle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_readv_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_recv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_send.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_setaffinity.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_setaffinity.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_setproctitle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_setproctitle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_shmem.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_shmem.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_socket.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_socket.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_solaris.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_solaris_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_solaris_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_solaris_sendfilev_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_sunpro_amd64.il (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_sunpro_atomic_sparc64.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_sunpro_sparc64.il (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_sunpro_x86.il (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_thread.h (+2 -2) 95% =================================================================== --- vendor/nginx-1.15.1/src/os/unix/ngx_thread.h 2018-07-24 17:32:13 +0900 (1b52dd7fb) +++ vendor/nginx-1.15.2/src/os/unix/ngx_thread.h 2018-07-25 00:24:20 +0900 (e3b5e8134) @@ -47,12 +47,12 @@ typedef uint32_t ngx_tid_t; #elif (NGX_DARWIN) typedef uint64_t ngx_tid_t; -#define NGX_TID_T_FMT "%uA" +#define NGX_TID_T_FMT "%uL" #else typedef uint64_t ngx_tid_t; -#define NGX_TID_T_FMT "%uA" +#define NGX_TID_T_FMT "%uL" #endif Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_thread_cond.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_thread_id.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_thread_mutex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_time.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_time.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_udp_recv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_udp_send.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_udp_sendmsg_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_user.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_user.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/unix/ngx_writev_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/nginx.ico (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/nginx.rc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/nginx_icon16.xpm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/nginx_icon32.xpm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/nginx_icon48.xpm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/ngx_alloc.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/ngx_alloc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/ngx_atomic.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/ngx_dlopen.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/ngx_dlopen.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/ngx_errno.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/ngx_errno.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/ngx_event_log.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/ngx_files.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/ngx_files.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/ngx_os.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/ngx_process.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/ngx_process.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/ngx_process_cycle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/ngx_process_cycle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/ngx_service.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/ngx_shmem.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/ngx_shmem.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/ngx_socket.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/ngx_socket.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/ngx_stat.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/ngx_thread.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/ngx_thread.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/ngx_time.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/ngx_time.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/ngx_udp_wsarecv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/ngx_user.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/ngx_user.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/ngx_win32_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/ngx_win32_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/ngx_wsarecv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/ngx_wsarecv_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/ngx_wsasend.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/os/win32/ngx_wsasend_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/stream/ngx_stream.c (+0 -4) 99% =================================================================== --- vendor/nginx-1.15.1/src/stream/ngx_stream.c 2018-07-24 17:32:13 +0900 (0efbda89e) +++ vendor/nginx-1.15.2/src/stream/ngx_stream.c 2018-07-25 00:24:20 +0900 (4abe387e8) @@ -538,10 +538,6 @@ ngx_stream_optimize_servers(ngx_conf_t *cf, ngx_array_t *ports) break; } - if (ngx_clone_listening(cf, ls) != NGX_OK) { - return NGX_CONF_ERROR; - } - addr++; last--; } Renamed: vendor/nginx-1.15.2/src/stream/ngx_stream.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/stream/ngx_stream_access_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/stream/ngx_stream_core_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/stream/ngx_stream_geo_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/stream/ngx_stream_geoip_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/stream/ngx_stream_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/stream/ngx_stream_limit_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/stream/ngx_stream_log_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/stream/ngx_stream_map_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/stream/ngx_stream_proxy_module.c (+22 -5) 99% =================================================================== --- vendor/nginx-1.15.1/src/stream/ngx_stream_proxy_module.c 2018-07-24 17:32:13 +0900 (792bb7758) +++ vendor/nginx-1.15.2/src/stream/ngx_stream_proxy_module.c 2018-07-25 00:24:20 +0900 (d0497f571) @@ -92,6 +92,7 @@ static char *ngx_stream_proxy_ssl_password_file(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); static void ngx_stream_proxy_ssl_init_connection(ngx_stream_session_t *s); static void ngx_stream_proxy_ssl_handshake(ngx_connection_t *pc); +static void ngx_stream_proxy_ssl_save_session(ngx_connection_t *c); static ngx_int_t ngx_stream_proxy_ssl_name(ngx_stream_session_t *s); static ngx_int_t ngx_stream_proxy_set_ssl(ngx_conf_t *cf, ngx_stream_proxy_srv_conf_t *pscf); @@ -1008,6 +1009,8 @@ ngx_stream_proxy_ssl_init_connection(ngx_stream_session_t *s) } if (pscf->ssl_session_reuse) { + pc->ssl->save_session = ngx_stream_proxy_ssl_save_session; + if (u->peer.set_session(&u->peer, u->peer.data) != NGX_OK) { ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR); return; @@ -1066,11 +1069,6 @@ ngx_stream_proxy_ssl_handshake(ngx_connection_t *pc) } } - if (pscf->ssl_session_reuse) { - u = s->upstream; - u->peer.save_session(&u->peer, u->peer.data); - } - if (pc->write->timer_set) { ngx_del_timer(pc->write); } @@ -1086,6 +1084,19 @@ failed: } +static void +ngx_stream_proxy_ssl_save_session(ngx_connection_t *c) +{ + ngx_stream_session_t *s; + ngx_stream_upstream_t *u; + + s = c->data; + u = s->upstream; + + u->peer.save_session(&u->peer, u->peer.data); +} + + static ngx_int_t ngx_stream_proxy_ssl_name(ngx_stream_session_t *s) { @@ -2051,6 +2062,12 @@ ngx_stream_proxy_set_ssl(ngx_conf_t *cf, ngx_stream_proxy_srv_conf_t *pscf) } } + if (ngx_ssl_client_session_cache(cf, pscf->ssl, pscf->ssl_session_reuse) + != NGX_OK) + { + return NGX_ERROR; + } + return NGX_OK; } Renamed: vendor/nginx-1.15.2/src/stream/ngx_stream_realip_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/stream/ngx_stream_return_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/stream/ngx_stream_script.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/stream/ngx_stream_script.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/stream/ngx_stream_split_clients_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/stream/ngx_stream_ssl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/stream/ngx_stream_ssl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/stream/ngx_stream_ssl_preread_module.c (+105 -6) 83% =================================================================== --- vendor/nginx-1.15.1/src/stream/ngx_stream_ssl_preread_module.c 2018-07-24 17:32:13 +0900 (62d6524da) +++ vendor/nginx-1.15.2/src/stream/ngx_stream_ssl_preread_module.c 2018-07-25 00:24:20 +0900 (a236fc555) @@ -21,6 +21,7 @@ typedef struct { u_char *pos; u_char *dst; u_char buf[4]; + u_char version[2]; ngx_str_t host; ngx_str_t alpn; ngx_log_t *log; @@ -32,6 +33,8 @@ typedef struct { static ngx_int_t ngx_stream_ssl_preread_handler(ngx_stream_session_t *s); static ngx_int_t ngx_stream_ssl_preread_parse_record( ngx_stream_ssl_preread_ctx_t *ctx, u_char *pos, u_char *last); +static ngx_int_t ngx_stream_ssl_preread_protocol_variable( + ngx_stream_session_t *s, ngx_stream_variable_value_t *v, uintptr_t data); static ngx_int_t ngx_stream_ssl_preread_server_name_variable( ngx_stream_session_t *s, ngx_stream_variable_value_t *v, uintptr_t data); static ngx_int_t ngx_stream_ssl_preread_alpn_protocols_variable( @@ -86,6 +89,9 @@ ngx_module_t ngx_stream_ssl_preread_module = { static ngx_stream_variable_t ngx_stream_ssl_preread_vars[] = { + { ngx_string("ssl_preread_protocol"), NULL, + ngx_stream_ssl_preread_protocol_variable, 0, 0, 0 }, + { ngx_string("ssl_preread_server_name"), NULL, ngx_stream_ssl_preread_server_name_variable, 0, 0, 0 }, @@ -143,6 +149,14 @@ ngx_stream_ssl_preread_handler(ngx_stream_session_t *s) while (last - p >= 5) { + if ((p[0] & 0x80) && p[2] == 1 && (p[3] == 0 || p[3] == 3)) { + ngx_log_debug0(NGX_LOG_DEBUG_STREAM, ctx->log, 0, + "ssl preread: version 2 ClientHello"); + ctx->version[0] = p[3]; + ctx->version[1] = p[4]; + return NGX_OK; + } + if (p[0] != 0x16) { ngx_log_debug0(NGX_LOG_DEBUG_STREAM, ctx->log, 0, "ssl preread: not a handshake"); @@ -196,7 +210,8 @@ ngx_stream_ssl_preread_parse_record(ngx_stream_ssl_preread_ctx_t *ctx, enum { sw_start = 0, sw_header, /* handshake msg_type, length */ - sw_head_tail, /* version, random */ + sw_version, /* client_version */ + sw_random, /* random */ sw_sid_len, /* session_id length */ sw_sid, /* session_id */ sw_cs_len, /* cipher_suites length */ @@ -210,7 +225,8 @@ ngx_stream_ssl_preread_parse_record(ngx_stream_ssl_preread_ctx_t *ctx, sw_sni_host, /* SNI host_name */ sw_alpn_len, /* ALPN length */ sw_alpn_proto_len, /* ALPN protocol_name length */ - sw_alpn_proto_data /* ALPN protocol_name */ + sw_alpn_proto_data, /* ALPN protocol_name */ + sw_supver_len /* supported_versions length */ } state; ngx_log_debug2(NGX_LOG_DEBUG_STREAM, ctx->log, 0, @@ -254,13 +270,19 @@ ngx_stream_ssl_preread_parse_record(ngx_stream_ssl_preread_ctx_t *ctx, return NGX_DECLINED; } - state = sw_head_tail; - dst = NULL; - size = 34; + state = sw_version; + dst = ctx->version; + size = 2; left = (p[1] << 16) + (p[2] << 8) + p[3]; break; - case sw_head_tail: + case sw_version: + state = sw_random; + dst = NULL; + size = 32; + break; + + case sw_random: state = sw_sid_len; dst = p; size = 1; @@ -334,6 +356,14 @@ ngx_stream_ssl_preread_parse_record(ngx_stream_ssl_preread_ctx_t *ctx, break; } + if (p[0] == 0 && p[1] == 43) { + /* supported_versions extension */ + state = sw_supver_len; + dst = p; + size = 1; + break; + } + state = sw_ext; dst = NULL; size = (p[2] << 8) + p[3]; @@ -434,6 +464,19 @@ ngx_stream_ssl_preread_parse_record(ngx_stream_ssl_preread_ctx_t *ctx, dst = NULL; size = 0; break; + + case sw_supver_len: + ngx_log_debug0(NGX_LOG_DEBUG_STREAM, ctx->log, 0, + "ssl preread: supported_versions"); + + /* set TLSv1.3 */ + ctx->version[0] = 3; + ctx->version[1] = 4; + + state = sw_ext; + dst = NULL; + size = p[0]; + break; } if (left < size) { @@ -454,6 +497,62 @@ ngx_stream_ssl_preread_parse_record(ngx_stream_ssl_preread_ctx_t *ctx, static ngx_int_t +ngx_stream_ssl_preread_protocol_variable(ngx_stream_session_t *s, + ngx_variable_value_t *v, uintptr_t data) +{ + ngx_str_t version; + ngx_stream_ssl_preread_ctx_t *ctx; + + ctx = ngx_stream_get_module_ctx(s, ngx_stream_ssl_preread_module); + + if (ctx == NULL) { + v->not_found = 1; + return NGX_OK; + } + + /* SSL_get_version() format */ + + ngx_str_null(&version); + + switch (ctx->version[0]) { + case 0: + switch (ctx->version[1]) { + case 2: + ngx_str_set(&version, "SSLv2"); + break; + } + break; + case 3: + switch (ctx->version[1]) { + case 0: + ngx_str_set(&version, "SSLv3"); + break; + case 1: + ngx_str_set(&version, "TLSv1"); + break; + case 2: + ngx_str_set(&version, "TLSv1.1"); + break; + case 3: + ngx_str_set(&version, "TLSv1.2"); + break; + case 4: + ngx_str_set(&version, "TLSv1.3"); + break; + } + } + + v->valid = 1; + v->no_cacheable = 0; + v->not_found = 0; + v->len = version.len; + v->data = version.data; + + return NGX_OK; +} + + +static ngx_int_t ngx_stream_ssl_preread_server_name_variable(ngx_stream_session_t *s, ngx_variable_value_t *v, uintptr_t data) { Renamed: vendor/nginx-1.15.2/src/stream/ngx_stream_upstream.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/stream/ngx_stream_upstream.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/stream/ngx_stream_upstream_hash_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/stream/ngx_stream_upstream_least_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/stream/ngx_stream_upstream_random_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/stream/ngx_stream_upstream_round_robin.c (+1 -1) 99% =================================================================== --- vendor/nginx-1.15.1/src/stream/ngx_stream_upstream_round_robin.c 2018-07-24 17:32:13 +0900 (526de3a80) +++ vendor/nginx-1.15.2/src/stream/ngx_stream_upstream_round_robin.c 2018-07-25 00:24:20 +0900 (36e2ec5ca) @@ -776,7 +776,7 @@ ngx_stream_upstream_save_round_robin_peer_session(ngx_peer_connection_t *pc, if (peers->shpool) { - ssl_session = SSL_get0_session(pc->connection->ssl->connection); + ssl_session = ngx_ssl_get0_session(pc->connection); if (ssl_session == NULL) { return; Renamed: vendor/nginx-1.15.2/src/stream/ngx_stream_upstream_round_robin.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/stream/ngx_stream_upstream_zone_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/stream/ngx_stream_variables.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/stream/ngx_stream_variables.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.15.2/src/stream/ngx_stream_write_filter_module.c (+0 -0) 100% ===================================================================
