Yasuhiro Horimoto
null+****@clear*****
Tue May 22 14:04:19 JST 2018
Yasuhiro Horimoto 2018-05-22 14:04:19 +0900 (Tue, 22 May 2018) New Revision: 94e8fdd18c17a96f677152f02dcced9ce90d73ab https://github.com/groonga/groonga/commit/94e8fdd18c17a96f677152f02dcced9ce90d73ab Message: vendor nginx: update nginx version to 1.14.0 Added files: vendor/nginx-1.14.0/src/core/ngx_proxy_protocol.c Removed files: vendor/nginx-1.13.10/src/core/ngx_proxy_protocol.c Modified files: nginx_version Renamed files: vendor/nginx-1.14.0/auto/cc/acc (from vendor/nginx-1.13.10/auto/cc/acc) vendor/nginx-1.14.0/auto/cc/bcc (from vendor/nginx-1.13.10/auto/cc/bcc) vendor/nginx-1.14.0/auto/cc/ccc (from vendor/nginx-1.13.10/auto/cc/ccc) vendor/nginx-1.14.0/auto/cc/clang (from vendor/nginx-1.13.10/auto/cc/clang) vendor/nginx-1.14.0/auto/cc/conf (from vendor/nginx-1.13.10/auto/cc/conf) vendor/nginx-1.14.0/auto/cc/gcc (from vendor/nginx-1.13.10/auto/cc/gcc) vendor/nginx-1.14.0/auto/cc/icc (from vendor/nginx-1.13.10/auto/cc/icc) vendor/nginx-1.14.0/auto/cc/msvc (from vendor/nginx-1.13.10/auto/cc/msvc) vendor/nginx-1.14.0/auto/cc/name (from vendor/nginx-1.13.10/auto/cc/name) vendor/nginx-1.14.0/auto/cc/owc (from vendor/nginx-1.13.10/auto/cc/owc) vendor/nginx-1.14.0/auto/cc/sunc (from vendor/nginx-1.13.10/auto/cc/sunc) vendor/nginx-1.14.0/auto/configure (from vendor/nginx-1.13.10/auto/configure) vendor/nginx-1.14.0/auto/define (from vendor/nginx-1.13.10/auto/define) vendor/nginx-1.14.0/auto/endianness (from vendor/nginx-1.13.10/auto/endianness) vendor/nginx-1.14.0/auto/feature (from vendor/nginx-1.13.10/auto/feature) vendor/nginx-1.14.0/auto/have (from vendor/nginx-1.13.10/auto/have) vendor/nginx-1.14.0/auto/have_headers (from vendor/nginx-1.13.10/auto/have_headers) vendor/nginx-1.14.0/auto/headers (from vendor/nginx-1.13.10/auto/headers) vendor/nginx-1.14.0/auto/include (from vendor/nginx-1.13.10/auto/include) vendor/nginx-1.14.0/auto/init (from vendor/nginx-1.13.10/auto/init) vendor/nginx-1.14.0/auto/install (from vendor/nginx-1.13.10/auto/install) vendor/nginx-1.14.0/auto/lib/conf (from vendor/nginx-1.13.10/auto/lib/conf) vendor/nginx-1.14.0/auto/lib/geoip/conf (from vendor/nginx-1.13.10/auto/lib/geoip/conf) vendor/nginx-1.14.0/auto/lib/google-perftools/conf (from vendor/nginx-1.13.10/auto/lib/google-perftools/conf) vendor/nginx-1.14.0/auto/lib/libatomic/conf (from vendor/nginx-1.13.10/auto/lib/libatomic/conf) vendor/nginx-1.14.0/auto/lib/libatomic/make (from vendor/nginx-1.13.10/auto/lib/libatomic/make) vendor/nginx-1.14.0/auto/lib/libgd/conf (from vendor/nginx-1.13.10/auto/lib/libgd/conf) vendor/nginx-1.14.0/auto/lib/libxslt/conf (from vendor/nginx-1.13.10/auto/lib/libxslt/conf) vendor/nginx-1.14.0/auto/lib/make (from vendor/nginx-1.13.10/auto/lib/make) vendor/nginx-1.14.0/auto/lib/openssl/conf (from vendor/nginx-1.13.10/auto/lib/openssl/conf) vendor/nginx-1.14.0/auto/lib/openssl/make (from vendor/nginx-1.13.10/auto/lib/openssl/make) vendor/nginx-1.14.0/auto/lib/openssl/makefile.bcc (from vendor/nginx-1.13.10/auto/lib/openssl/makefile.bcc) vendor/nginx-1.14.0/auto/lib/openssl/makefile.msvc (from vendor/nginx-1.13.10/auto/lib/openssl/makefile.msvc) vendor/nginx-1.14.0/auto/lib/pcre/conf (from vendor/nginx-1.13.10/auto/lib/pcre/conf) vendor/nginx-1.14.0/auto/lib/pcre/make (from vendor/nginx-1.13.10/auto/lib/pcre/make) vendor/nginx-1.14.0/auto/lib/pcre/makefile.bcc (from vendor/nginx-1.13.10/auto/lib/pcre/makefile.bcc) vendor/nginx-1.14.0/auto/lib/pcre/makefile.msvc (from vendor/nginx-1.13.10/auto/lib/pcre/makefile.msvc) vendor/nginx-1.14.0/auto/lib/pcre/makefile.owc (from vendor/nginx-1.13.10/auto/lib/pcre/makefile.owc) vendor/nginx-1.14.0/auto/lib/perl/conf (from vendor/nginx-1.13.10/auto/lib/perl/conf) vendor/nginx-1.14.0/auto/lib/perl/make (from vendor/nginx-1.13.10/auto/lib/perl/make) vendor/nginx-1.14.0/auto/lib/zlib/conf (from vendor/nginx-1.13.10/auto/lib/zlib/conf) vendor/nginx-1.14.0/auto/lib/zlib/make (from vendor/nginx-1.13.10/auto/lib/zlib/make) vendor/nginx-1.14.0/auto/lib/zlib/makefile.bcc (from vendor/nginx-1.13.10/auto/lib/zlib/makefile.bcc) vendor/nginx-1.14.0/auto/lib/zlib/makefile.msvc (from vendor/nginx-1.13.10/auto/lib/zlib/makefile.msvc) vendor/nginx-1.14.0/auto/lib/zlib/makefile.owc (from vendor/nginx-1.13.10/auto/lib/zlib/makefile.owc) vendor/nginx-1.14.0/auto/make (from vendor/nginx-1.13.10/auto/make) vendor/nginx-1.14.0/auto/module (from vendor/nginx-1.13.10/auto/module) vendor/nginx-1.14.0/auto/modules (from vendor/nginx-1.13.10/auto/modules) vendor/nginx-1.14.0/auto/nohave (from vendor/nginx-1.13.10/auto/nohave) vendor/nginx-1.14.0/auto/options (from vendor/nginx-1.13.10/auto/options) vendor/nginx-1.14.0/auto/os/conf (from vendor/nginx-1.13.10/auto/os/conf) vendor/nginx-1.14.0/auto/os/darwin (from vendor/nginx-1.13.10/auto/os/darwin) vendor/nginx-1.14.0/auto/os/freebsd (from vendor/nginx-1.13.10/auto/os/freebsd) vendor/nginx-1.14.0/auto/os/linux (from vendor/nginx-1.13.10/auto/os/linux) vendor/nginx-1.14.0/auto/os/solaris (from vendor/nginx-1.13.10/auto/os/solaris) vendor/nginx-1.14.0/auto/os/win32 (from vendor/nginx-1.13.10/auto/os/win32) vendor/nginx-1.14.0/auto/sources (from vendor/nginx-1.13.10/auto/sources) vendor/nginx-1.14.0/auto/stubs (from vendor/nginx-1.13.10/auto/stubs) vendor/nginx-1.14.0/auto/summary (from vendor/nginx-1.13.10/auto/summary) vendor/nginx-1.14.0/auto/threads (from vendor/nginx-1.13.10/auto/threads) vendor/nginx-1.14.0/auto/types/sizeof (from vendor/nginx-1.13.10/auto/types/sizeof) vendor/nginx-1.14.0/auto/types/typedef (from vendor/nginx-1.13.10/auto/types/typedef) vendor/nginx-1.14.0/auto/types/uintptr_t (from vendor/nginx-1.13.10/auto/types/uintptr_t) vendor/nginx-1.14.0/auto/types/value (from vendor/nginx-1.13.10/auto/types/value) vendor/nginx-1.14.0/auto/unix (from vendor/nginx-1.13.10/auto/unix) vendor/nginx-1.14.0/conf/fastcgi.conf (from vendor/nginx-1.13.10/conf/fastcgi.conf) vendor/nginx-1.14.0/conf/fastcgi_params (from vendor/nginx-1.13.10/conf/fastcgi_params) vendor/nginx-1.14.0/conf/koi-utf (from vendor/nginx-1.13.10/conf/koi-utf) vendor/nginx-1.14.0/conf/koi-win (from vendor/nginx-1.13.10/conf/koi-win) vendor/nginx-1.14.0/conf/mime.types (from vendor/nginx-1.13.10/conf/mime.types) vendor/nginx-1.14.0/conf/nginx.conf (from vendor/nginx-1.13.10/conf/nginx.conf) vendor/nginx-1.14.0/conf/scgi_params (from vendor/nginx-1.13.10/conf/scgi_params) vendor/nginx-1.14.0/conf/uwsgi_params (from vendor/nginx-1.13.10/conf/uwsgi_params) vendor/nginx-1.14.0/conf/win-utf (from vendor/nginx-1.13.10/conf/win-utf) vendor/nginx-1.14.0/contrib/README (from vendor/nginx-1.13.10/contrib/README) vendor/nginx-1.14.0/contrib/geo2nginx.pl (from vendor/nginx-1.13.10/contrib/geo2nginx.pl) vendor/nginx-1.14.0/contrib/unicode2nginx/koi-utf (from vendor/nginx-1.13.10/contrib/unicode2nginx/koi-utf) vendor/nginx-1.14.0/contrib/unicode2nginx/unicode-to-nginx.pl (from vendor/nginx-1.13.10/contrib/unicode2nginx/unicode-to-nginx.pl) vendor/nginx-1.14.0/contrib/unicode2nginx/win-utf (from vendor/nginx-1.13.10/contrib/unicode2nginx/win-utf) vendor/nginx-1.14.0/contrib/vim/ftdetect/nginx.vim (from vendor/nginx-1.13.10/contrib/vim/ftdetect/nginx.vim) vendor/nginx-1.14.0/contrib/vim/ftplugin/nginx.vim (from vendor/nginx-1.13.10/contrib/vim/ftplugin/nginx.vim) vendor/nginx-1.14.0/contrib/vim/indent/nginx.vim (from vendor/nginx-1.13.10/contrib/vim/indent/nginx.vim) vendor/nginx-1.14.0/contrib/vim/syntax/nginx.vim (from vendor/nginx-1.13.10/contrib/vim/syntax/nginx.vim) vendor/nginx-1.14.0/docs/GNUmakefile (from vendor/nginx-1.13.10/docs/GNUmakefile) vendor/nginx-1.14.0/docs/dtd/change_log_conf.dtd (from vendor/nginx-1.13.10/docs/dtd/change_log_conf.dtd) vendor/nginx-1.14.0/docs/dtd/changes.dtd (from vendor/nginx-1.13.10/docs/dtd/changes.dtd) vendor/nginx-1.14.0/docs/html/50x.html (from vendor/nginx-1.13.10/docs/html/50x.html) vendor/nginx-1.14.0/docs/html/index.html (from vendor/nginx-1.13.10/docs/html/index.html) vendor/nginx-1.14.0/docs/man/nginx.8 (from vendor/nginx-1.13.10/docs/man/nginx.8) vendor/nginx-1.14.0/docs/text/LICENSE (from vendor/nginx-1.13.10/docs/text/LICENSE) vendor/nginx-1.14.0/docs/text/README (from vendor/nginx-1.13.10/docs/text/README) vendor/nginx-1.14.0/docs/xml/change_log_conf.xml (from vendor/nginx-1.13.10/docs/xml/change_log_conf.xml) vendor/nginx-1.14.0/docs/xml/nginx/changes.xml (from vendor/nginx-1.13.10/docs/xml/nginx/changes.xml) vendor/nginx-1.14.0/docs/xsls/changes.xsls (from vendor/nginx-1.13.10/docs/xsls/changes.xsls) vendor/nginx-1.14.0/docs/xslt/changes.xslt (from vendor/nginx-1.13.10/docs/xslt/changes.xslt) vendor/nginx-1.14.0/misc/GNUmakefile (from vendor/nginx-1.13.10/misc/GNUmakefile) vendor/nginx-1.14.0/misc/README (from vendor/nginx-1.13.10/misc/README) vendor/nginx-1.14.0/src/core/nginx.c (from vendor/nginx-1.13.10/src/core/nginx.c) vendor/nginx-1.14.0/src/core/nginx.h (from vendor/nginx-1.13.10/src/core/nginx.h) vendor/nginx-1.14.0/src/core/ngx_array.c (from vendor/nginx-1.13.10/src/core/ngx_array.c) vendor/nginx-1.14.0/src/core/ngx_array.h (from vendor/nginx-1.13.10/src/core/ngx_array.h) vendor/nginx-1.14.0/src/core/ngx_buf.c (from vendor/nginx-1.13.10/src/core/ngx_buf.c) vendor/nginx-1.14.0/src/core/ngx_buf.h (from vendor/nginx-1.13.10/src/core/ngx_buf.h) vendor/nginx-1.14.0/src/core/ngx_conf_file.c (from vendor/nginx-1.13.10/src/core/ngx_conf_file.c) vendor/nginx-1.14.0/src/core/ngx_conf_file.h (from vendor/nginx-1.13.10/src/core/ngx_conf_file.h) vendor/nginx-1.14.0/src/core/ngx_config.h (from vendor/nginx-1.13.10/src/core/ngx_config.h) vendor/nginx-1.14.0/src/core/ngx_connection.c (from vendor/nginx-1.13.10/src/core/ngx_connection.c) vendor/nginx-1.14.0/src/core/ngx_connection.h (from vendor/nginx-1.13.10/src/core/ngx_connection.h) vendor/nginx-1.14.0/src/core/ngx_core.h (from vendor/nginx-1.13.10/src/core/ngx_core.h) vendor/nginx-1.14.0/src/core/ngx_cpuinfo.c (from vendor/nginx-1.13.10/src/core/ngx_cpuinfo.c) vendor/nginx-1.14.0/src/core/ngx_crc.h (from vendor/nginx-1.13.10/src/core/ngx_crc.h) vendor/nginx-1.14.0/src/core/ngx_crc32.c (from vendor/nginx-1.13.10/src/core/ngx_crc32.c) vendor/nginx-1.14.0/src/core/ngx_crc32.h (from vendor/nginx-1.13.10/src/core/ngx_crc32.h) vendor/nginx-1.14.0/src/core/ngx_crypt.c (from vendor/nginx-1.13.10/src/core/ngx_crypt.c) vendor/nginx-1.14.0/src/core/ngx_crypt.h (from vendor/nginx-1.13.10/src/core/ngx_crypt.h) vendor/nginx-1.14.0/src/core/ngx_cycle.c (from vendor/nginx-1.13.10/src/core/ngx_cycle.c) vendor/nginx-1.14.0/src/core/ngx_cycle.h (from vendor/nginx-1.13.10/src/core/ngx_cycle.h) vendor/nginx-1.14.0/src/core/ngx_file.c (from vendor/nginx-1.13.10/src/core/ngx_file.c) vendor/nginx-1.14.0/src/core/ngx_file.h (from vendor/nginx-1.13.10/src/core/ngx_file.h) vendor/nginx-1.14.0/src/core/ngx_hash.c (from vendor/nginx-1.13.10/src/core/ngx_hash.c) vendor/nginx-1.14.0/src/core/ngx_hash.h (from vendor/nginx-1.13.10/src/core/ngx_hash.h) vendor/nginx-1.14.0/src/core/ngx_inet.c (from vendor/nginx-1.13.10/src/core/ngx_inet.c) vendor/nginx-1.14.0/src/core/ngx_inet.h (from vendor/nginx-1.13.10/src/core/ngx_inet.h) vendor/nginx-1.14.0/src/core/ngx_list.c (from vendor/nginx-1.13.10/src/core/ngx_list.c) vendor/nginx-1.14.0/src/core/ngx_list.h (from vendor/nginx-1.13.10/src/core/ngx_list.h) vendor/nginx-1.14.0/src/core/ngx_log.c (from vendor/nginx-1.13.10/src/core/ngx_log.c) vendor/nginx-1.14.0/src/core/ngx_log.h (from vendor/nginx-1.13.10/src/core/ngx_log.h) vendor/nginx-1.14.0/src/core/ngx_md5.c (from vendor/nginx-1.13.10/src/core/ngx_md5.c) vendor/nginx-1.14.0/src/core/ngx_md5.h (from vendor/nginx-1.13.10/src/core/ngx_md5.h) vendor/nginx-1.14.0/src/core/ngx_module.c (from vendor/nginx-1.13.10/src/core/ngx_module.c) vendor/nginx-1.14.0/src/core/ngx_module.h (from vendor/nginx-1.13.10/src/core/ngx_module.h) vendor/nginx-1.14.0/src/core/ngx_murmurhash.c (from vendor/nginx-1.13.10/src/core/ngx_murmurhash.c) vendor/nginx-1.14.0/src/core/ngx_murmurhash.h (from vendor/nginx-1.13.10/src/core/ngx_murmurhash.h) vendor/nginx-1.14.0/src/core/ngx_open_file_cache.c (from vendor/nginx-1.13.10/src/core/ngx_open_file_cache.c) vendor/nginx-1.14.0/src/core/ngx_open_file_cache.h (from vendor/nginx-1.13.10/src/core/ngx_open_file_cache.h) vendor/nginx-1.14.0/src/core/ngx_output_chain.c (from vendor/nginx-1.13.10/src/core/ngx_output_chain.c) vendor/nginx-1.14.0/src/core/ngx_palloc.c (from vendor/nginx-1.13.10/src/core/ngx_palloc.c) vendor/nginx-1.14.0/src/core/ngx_palloc.h (from vendor/nginx-1.13.10/src/core/ngx_palloc.h) vendor/nginx-1.14.0/src/core/ngx_parse.c (from vendor/nginx-1.13.10/src/core/ngx_parse.c) vendor/nginx-1.14.0/src/core/ngx_parse.h (from vendor/nginx-1.13.10/src/core/ngx_parse.h) vendor/nginx-1.14.0/src/core/ngx_parse_time.c (from vendor/nginx-1.13.10/src/core/ngx_parse_time.c) vendor/nginx-1.14.0/src/core/ngx_parse_time.h (from vendor/nginx-1.13.10/src/core/ngx_parse_time.h) vendor/nginx-1.14.0/src/core/ngx_proxy_protocol.h (from vendor/nginx-1.13.10/src/core/ngx_proxy_protocol.h) vendor/nginx-1.14.0/src/core/ngx_queue.c (from vendor/nginx-1.13.10/src/core/ngx_queue.c) vendor/nginx-1.14.0/src/core/ngx_queue.h (from vendor/nginx-1.13.10/src/core/ngx_queue.h) vendor/nginx-1.14.0/src/core/ngx_radix_tree.c (from vendor/nginx-1.13.10/src/core/ngx_radix_tree.c) vendor/nginx-1.14.0/src/core/ngx_radix_tree.h (from vendor/nginx-1.13.10/src/core/ngx_radix_tree.h) vendor/nginx-1.14.0/src/core/ngx_rbtree.c (from vendor/nginx-1.13.10/src/core/ngx_rbtree.c) vendor/nginx-1.14.0/src/core/ngx_rbtree.h (from vendor/nginx-1.13.10/src/core/ngx_rbtree.h) vendor/nginx-1.14.0/src/core/ngx_regex.c (from vendor/nginx-1.13.10/src/core/ngx_regex.c) vendor/nginx-1.14.0/src/core/ngx_regex.h (from vendor/nginx-1.13.10/src/core/ngx_regex.h) vendor/nginx-1.14.0/src/core/ngx_resolver.c (from vendor/nginx-1.13.10/src/core/ngx_resolver.c) vendor/nginx-1.14.0/src/core/ngx_resolver.h (from vendor/nginx-1.13.10/src/core/ngx_resolver.h) vendor/nginx-1.14.0/src/core/ngx_rwlock.c (from vendor/nginx-1.13.10/src/core/ngx_rwlock.c) vendor/nginx-1.14.0/src/core/ngx_rwlock.h (from vendor/nginx-1.13.10/src/core/ngx_rwlock.h) vendor/nginx-1.14.0/src/core/ngx_sha1.c (from vendor/nginx-1.13.10/src/core/ngx_sha1.c) vendor/nginx-1.14.0/src/core/ngx_sha1.h (from vendor/nginx-1.13.10/src/core/ngx_sha1.h) vendor/nginx-1.14.0/src/core/ngx_shmtx.c (from vendor/nginx-1.13.10/src/core/ngx_shmtx.c) vendor/nginx-1.14.0/src/core/ngx_shmtx.h (from vendor/nginx-1.13.10/src/core/ngx_shmtx.h) vendor/nginx-1.14.0/src/core/ngx_slab.c (from vendor/nginx-1.13.10/src/core/ngx_slab.c) vendor/nginx-1.14.0/src/core/ngx_slab.h (from vendor/nginx-1.13.10/src/core/ngx_slab.h) vendor/nginx-1.14.0/src/core/ngx_spinlock.c (from vendor/nginx-1.13.10/src/core/ngx_spinlock.c) vendor/nginx-1.14.0/src/core/ngx_string.c (from vendor/nginx-1.13.10/src/core/ngx_string.c) vendor/nginx-1.14.0/src/core/ngx_string.h (from vendor/nginx-1.13.10/src/core/ngx_string.h) vendor/nginx-1.14.0/src/core/ngx_syslog.c (from vendor/nginx-1.13.10/src/core/ngx_syslog.c) vendor/nginx-1.14.0/src/core/ngx_syslog.h (from vendor/nginx-1.13.10/src/core/ngx_syslog.h) vendor/nginx-1.14.0/src/core/ngx_thread_pool.c (from vendor/nginx-1.13.10/src/core/ngx_thread_pool.c) vendor/nginx-1.14.0/src/core/ngx_thread_pool.h (from vendor/nginx-1.13.10/src/core/ngx_thread_pool.h) vendor/nginx-1.14.0/src/core/ngx_times.c (from vendor/nginx-1.13.10/src/core/ngx_times.c) vendor/nginx-1.14.0/src/core/ngx_times.h (from vendor/nginx-1.13.10/src/core/ngx_times.h) vendor/nginx-1.14.0/src/event/modules/ngx_devpoll_module.c (from vendor/nginx-1.13.10/src/event/modules/ngx_devpoll_module.c) vendor/nginx-1.14.0/src/event/modules/ngx_epoll_module.c (from vendor/nginx-1.13.10/src/event/modules/ngx_epoll_module.c) vendor/nginx-1.14.0/src/event/modules/ngx_eventport_module.c (from vendor/nginx-1.13.10/src/event/modules/ngx_eventport_module.c) vendor/nginx-1.14.0/src/event/modules/ngx_iocp_module.c (from vendor/nginx-1.13.10/src/event/modules/ngx_iocp_module.c) vendor/nginx-1.14.0/src/event/modules/ngx_iocp_module.h (from vendor/nginx-1.13.10/src/event/modules/ngx_iocp_module.h) vendor/nginx-1.14.0/src/event/modules/ngx_kqueue_module.c (from vendor/nginx-1.13.10/src/event/modules/ngx_kqueue_module.c) vendor/nginx-1.14.0/src/event/modules/ngx_poll_module.c (from vendor/nginx-1.13.10/src/event/modules/ngx_poll_module.c) vendor/nginx-1.14.0/src/event/modules/ngx_select_module.c (from vendor/nginx-1.13.10/src/event/modules/ngx_select_module.c) vendor/nginx-1.14.0/src/event/modules/ngx_win32_select_module.c (from vendor/nginx-1.13.10/src/event/modules/ngx_win32_select_module.c) vendor/nginx-1.14.0/src/event/ngx_event.c (from vendor/nginx-1.13.10/src/event/ngx_event.c) vendor/nginx-1.14.0/src/event/ngx_event.h (from vendor/nginx-1.13.10/src/event/ngx_event.h) vendor/nginx-1.14.0/src/event/ngx_event_accept.c (from vendor/nginx-1.13.10/src/event/ngx_event_accept.c) vendor/nginx-1.14.0/src/event/ngx_event_acceptex.c (from vendor/nginx-1.13.10/src/event/ngx_event_acceptex.c) vendor/nginx-1.14.0/src/event/ngx_event_connect.c (from vendor/nginx-1.13.10/src/event/ngx_event_connect.c) vendor/nginx-1.14.0/src/event/ngx_event_connect.h (from vendor/nginx-1.13.10/src/event/ngx_event_connect.h) vendor/nginx-1.14.0/src/event/ngx_event_connectex.c (from vendor/nginx-1.13.10/src/event/ngx_event_connectex.c) vendor/nginx-1.14.0/src/event/ngx_event_openssl.c (from vendor/nginx-1.13.10/src/event/ngx_event_openssl.c) vendor/nginx-1.14.0/src/event/ngx_event_openssl.h (from vendor/nginx-1.13.10/src/event/ngx_event_openssl.h) vendor/nginx-1.14.0/src/event/ngx_event_openssl_stapling.c (from vendor/nginx-1.13.10/src/event/ngx_event_openssl_stapling.c) vendor/nginx-1.14.0/src/event/ngx_event_pipe.c (from vendor/nginx-1.13.10/src/event/ngx_event_pipe.c) vendor/nginx-1.14.0/src/event/ngx_event_pipe.h (from vendor/nginx-1.13.10/src/event/ngx_event_pipe.h) vendor/nginx-1.14.0/src/event/ngx_event_posted.c (from vendor/nginx-1.13.10/src/event/ngx_event_posted.c) vendor/nginx-1.14.0/src/event/ngx_event_posted.h (from vendor/nginx-1.13.10/src/event/ngx_event_posted.h) vendor/nginx-1.14.0/src/event/ngx_event_timer.c (from vendor/nginx-1.13.10/src/event/ngx_event_timer.c) vendor/nginx-1.14.0/src/event/ngx_event_timer.h (from vendor/nginx-1.13.10/src/event/ngx_event_timer.h) vendor/nginx-1.14.0/src/http/modules/ngx_http_access_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_access_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_addition_filter_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_addition_filter_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_auth_basic_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_auth_basic_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_auth_request_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_auth_request_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_autoindex_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_autoindex_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_browser_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_browser_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_charset_filter_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_charset_filter_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_chunked_filter_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_chunked_filter_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_dav_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_dav_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_degradation_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_degradation_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_empty_gif_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_empty_gif_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_fastcgi_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_fastcgi_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_flv_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_flv_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_geo_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_geo_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_geoip_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_geoip_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_grpc_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_grpc_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_gunzip_filter_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_gunzip_filter_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_gzip_filter_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_gzip_filter_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_gzip_static_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_gzip_static_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_headers_filter_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_headers_filter_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_image_filter_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_image_filter_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_index_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_index_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_limit_conn_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_limit_conn_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_limit_req_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_limit_req_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_log_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_log_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_map_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_map_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_memcached_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_memcached_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_mirror_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_mirror_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_mp4_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_mp4_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_not_modified_filter_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_not_modified_filter_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_proxy_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_proxy_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_random_index_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_random_index_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_range_filter_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_range_filter_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_realip_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_realip_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_referer_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_referer_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_rewrite_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_rewrite_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_scgi_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_scgi_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_secure_link_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_secure_link_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_slice_filter_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_slice_filter_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_split_clients_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_split_clients_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_ssi_filter_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_ssi_filter_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_ssi_filter_module.h (from vendor/nginx-1.13.10/src/http/modules/ngx_http_ssi_filter_module.h) vendor/nginx-1.14.0/src/http/modules/ngx_http_ssl_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_ssl_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_ssl_module.h (from vendor/nginx-1.13.10/src/http/modules/ngx_http_ssl_module.h) vendor/nginx-1.14.0/src/http/modules/ngx_http_static_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_static_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_stub_status_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_stub_status_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_sub_filter_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_sub_filter_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_try_files_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_try_files_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_upstream_hash_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_upstream_hash_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_upstream_ip_hash_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_upstream_ip_hash_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_upstream_keepalive_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_upstream_keepalive_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_upstream_least_conn_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_upstream_least_conn_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_upstream_zone_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_upstream_zone_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_userid_filter_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_userid_filter_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_uwsgi_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_uwsgi_module.c) vendor/nginx-1.14.0/src/http/modules/ngx_http_xslt_filter_module.c (from vendor/nginx-1.13.10/src/http/modules/ngx_http_xslt_filter_module.c) vendor/nginx-1.14.0/src/http/modules/perl/Makefile.PL (from vendor/nginx-1.13.10/src/http/modules/perl/Makefile.PL) vendor/nginx-1.14.0/src/http/modules/perl/nginx.pm (from vendor/nginx-1.13.10/src/http/modules/perl/nginx.pm) vendor/nginx-1.14.0/src/http/modules/perl/nginx.xs (from vendor/nginx-1.13.10/src/http/modules/perl/nginx.xs) vendor/nginx-1.14.0/src/http/modules/perl/ngx_http_perl_module.c (from vendor/nginx-1.13.10/src/http/modules/perl/ngx_http_perl_module.c) vendor/nginx-1.14.0/src/http/modules/perl/ngx_http_perl_module.h (from vendor/nginx-1.13.10/src/http/modules/perl/ngx_http_perl_module.h) vendor/nginx-1.14.0/src/http/modules/perl/typemap (from vendor/nginx-1.13.10/src/http/modules/perl/typemap) vendor/nginx-1.14.0/src/http/ngx_http.c (from vendor/nginx-1.13.10/src/http/ngx_http.c) vendor/nginx-1.14.0/src/http/ngx_http.h (from vendor/nginx-1.13.10/src/http/ngx_http.h) vendor/nginx-1.14.0/src/http/ngx_http_cache.h (from vendor/nginx-1.13.10/src/http/ngx_http_cache.h) vendor/nginx-1.14.0/src/http/ngx_http_config.h (from vendor/nginx-1.13.10/src/http/ngx_http_config.h) vendor/nginx-1.14.0/src/http/ngx_http_copy_filter_module.c (from vendor/nginx-1.13.10/src/http/ngx_http_copy_filter_module.c) vendor/nginx-1.14.0/src/http/ngx_http_core_module.c (from vendor/nginx-1.13.10/src/http/ngx_http_core_module.c) vendor/nginx-1.14.0/src/http/ngx_http_core_module.h (from vendor/nginx-1.13.10/src/http/ngx_http_core_module.h) vendor/nginx-1.14.0/src/http/ngx_http_file_cache.c (from vendor/nginx-1.13.10/src/http/ngx_http_file_cache.c) vendor/nginx-1.14.0/src/http/ngx_http_header_filter_module.c (from vendor/nginx-1.13.10/src/http/ngx_http_header_filter_module.c) vendor/nginx-1.14.0/src/http/ngx_http_parse.c (from vendor/nginx-1.13.10/src/http/ngx_http_parse.c) vendor/nginx-1.14.0/src/http/ngx_http_postpone_filter_module.c (from vendor/nginx-1.13.10/src/http/ngx_http_postpone_filter_module.c) vendor/nginx-1.14.0/src/http/ngx_http_request.c (from vendor/nginx-1.13.10/src/http/ngx_http_request.c) vendor/nginx-1.14.0/src/http/ngx_http_request.h (from vendor/nginx-1.13.10/src/http/ngx_http_request.h) vendor/nginx-1.14.0/src/http/ngx_http_request_body.c (from vendor/nginx-1.13.10/src/http/ngx_http_request_body.c) vendor/nginx-1.14.0/src/http/ngx_http_script.c (from vendor/nginx-1.13.10/src/http/ngx_http_script.c) vendor/nginx-1.14.0/src/http/ngx_http_script.h (from vendor/nginx-1.13.10/src/http/ngx_http_script.h) vendor/nginx-1.14.0/src/http/ngx_http_special_response.c (from vendor/nginx-1.13.10/src/http/ngx_http_special_response.c) vendor/nginx-1.14.0/src/http/ngx_http_upstream.c (from vendor/nginx-1.13.10/src/http/ngx_http_upstream.c) vendor/nginx-1.14.0/src/http/ngx_http_upstream.h (from vendor/nginx-1.13.10/src/http/ngx_http_upstream.h) vendor/nginx-1.14.0/src/http/ngx_http_upstream_round_robin.c (from vendor/nginx-1.13.10/src/http/ngx_http_upstream_round_robin.c) vendor/nginx-1.14.0/src/http/ngx_http_upstream_round_robin.h (from vendor/nginx-1.13.10/src/http/ngx_http_upstream_round_robin.h) vendor/nginx-1.14.0/src/http/ngx_http_variables.c (from vendor/nginx-1.13.10/src/http/ngx_http_variables.c) vendor/nginx-1.14.0/src/http/ngx_http_variables.h (from vendor/nginx-1.13.10/src/http/ngx_http_variables.h) vendor/nginx-1.14.0/src/http/ngx_http_write_filter_module.c (from vendor/nginx-1.13.10/src/http/ngx_http_write_filter_module.c) vendor/nginx-1.14.0/src/http/v2/ngx_http_v2.c (from vendor/nginx-1.13.10/src/http/v2/ngx_http_v2.c) vendor/nginx-1.14.0/src/http/v2/ngx_http_v2.h (from vendor/nginx-1.13.10/src/http/v2/ngx_http_v2.h) vendor/nginx-1.14.0/src/http/v2/ngx_http_v2_encode.c (from vendor/nginx-1.13.10/src/http/v2/ngx_http_v2_encode.c) vendor/nginx-1.14.0/src/http/v2/ngx_http_v2_filter_module.c (from vendor/nginx-1.13.10/src/http/v2/ngx_http_v2_filter_module.c) vendor/nginx-1.14.0/src/http/v2/ngx_http_v2_huff_decode.c (from vendor/nginx-1.13.10/src/http/v2/ngx_http_v2_huff_decode.c) vendor/nginx-1.14.0/src/http/v2/ngx_http_v2_huff_encode.c (from vendor/nginx-1.13.10/src/http/v2/ngx_http_v2_huff_encode.c) vendor/nginx-1.14.0/src/http/v2/ngx_http_v2_module.c (from vendor/nginx-1.13.10/src/http/v2/ngx_http_v2_module.c) vendor/nginx-1.14.0/src/http/v2/ngx_http_v2_module.h (from vendor/nginx-1.13.10/src/http/v2/ngx_http_v2_module.h) vendor/nginx-1.14.0/src/http/v2/ngx_http_v2_table.c (from vendor/nginx-1.13.10/src/http/v2/ngx_http_v2_table.c) vendor/nginx-1.14.0/src/mail/ngx_mail.c (from vendor/nginx-1.13.10/src/mail/ngx_mail.c) vendor/nginx-1.14.0/src/mail/ngx_mail.h (from vendor/nginx-1.13.10/src/mail/ngx_mail.h) vendor/nginx-1.14.0/src/mail/ngx_mail_auth_http_module.c (from vendor/nginx-1.13.10/src/mail/ngx_mail_auth_http_module.c) vendor/nginx-1.14.0/src/mail/ngx_mail_core_module.c (from vendor/nginx-1.13.10/src/mail/ngx_mail_core_module.c) vendor/nginx-1.14.0/src/mail/ngx_mail_handler.c (from vendor/nginx-1.13.10/src/mail/ngx_mail_handler.c) vendor/nginx-1.14.0/src/mail/ngx_mail_imap_handler.c (from vendor/nginx-1.13.10/src/mail/ngx_mail_imap_handler.c) vendor/nginx-1.14.0/src/mail/ngx_mail_imap_module.c (from vendor/nginx-1.13.10/src/mail/ngx_mail_imap_module.c) vendor/nginx-1.14.0/src/mail/ngx_mail_imap_module.h (from vendor/nginx-1.13.10/src/mail/ngx_mail_imap_module.h) vendor/nginx-1.14.0/src/mail/ngx_mail_parse.c (from vendor/nginx-1.13.10/src/mail/ngx_mail_parse.c) vendor/nginx-1.14.0/src/mail/ngx_mail_pop3_handler.c (from vendor/nginx-1.13.10/src/mail/ngx_mail_pop3_handler.c) vendor/nginx-1.14.0/src/mail/ngx_mail_pop3_module.c (from vendor/nginx-1.13.10/src/mail/ngx_mail_pop3_module.c) vendor/nginx-1.14.0/src/mail/ngx_mail_pop3_module.h (from vendor/nginx-1.13.10/src/mail/ngx_mail_pop3_module.h) vendor/nginx-1.14.0/src/mail/ngx_mail_proxy_module.c (from vendor/nginx-1.13.10/src/mail/ngx_mail_proxy_module.c) vendor/nginx-1.14.0/src/mail/ngx_mail_smtp_handler.c (from vendor/nginx-1.13.10/src/mail/ngx_mail_smtp_handler.c) vendor/nginx-1.14.0/src/mail/ngx_mail_smtp_module.c (from vendor/nginx-1.13.10/src/mail/ngx_mail_smtp_module.c) vendor/nginx-1.14.0/src/mail/ngx_mail_smtp_module.h (from vendor/nginx-1.13.10/src/mail/ngx_mail_smtp_module.h) vendor/nginx-1.14.0/src/mail/ngx_mail_ssl_module.c (from vendor/nginx-1.13.10/src/mail/ngx_mail_ssl_module.c) vendor/nginx-1.14.0/src/mail/ngx_mail_ssl_module.h (from vendor/nginx-1.13.10/src/mail/ngx_mail_ssl_module.h) vendor/nginx-1.14.0/src/misc/ngx_cpp_test_module.cpp (from vendor/nginx-1.13.10/src/misc/ngx_cpp_test_module.cpp) vendor/nginx-1.14.0/src/misc/ngx_google_perftools_module.c (from vendor/nginx-1.13.10/src/misc/ngx_google_perftools_module.c) vendor/nginx-1.14.0/src/os/unix/ngx_alloc.c (from vendor/nginx-1.13.10/src/os/unix/ngx_alloc.c) vendor/nginx-1.14.0/src/os/unix/ngx_alloc.h (from vendor/nginx-1.13.10/src/os/unix/ngx_alloc.h) vendor/nginx-1.14.0/src/os/unix/ngx_atomic.h (from vendor/nginx-1.13.10/src/os/unix/ngx_atomic.h) vendor/nginx-1.14.0/src/os/unix/ngx_channel.c (from vendor/nginx-1.13.10/src/os/unix/ngx_channel.c) vendor/nginx-1.14.0/src/os/unix/ngx_channel.h (from vendor/nginx-1.13.10/src/os/unix/ngx_channel.h) vendor/nginx-1.14.0/src/os/unix/ngx_daemon.c (from vendor/nginx-1.13.10/src/os/unix/ngx_daemon.c) vendor/nginx-1.14.0/src/os/unix/ngx_darwin.h (from vendor/nginx-1.13.10/src/os/unix/ngx_darwin.h) vendor/nginx-1.14.0/src/os/unix/ngx_darwin_config.h (from vendor/nginx-1.13.10/src/os/unix/ngx_darwin_config.h) vendor/nginx-1.14.0/src/os/unix/ngx_darwin_init.c (from vendor/nginx-1.13.10/src/os/unix/ngx_darwin_init.c) vendor/nginx-1.14.0/src/os/unix/ngx_darwin_sendfile_chain.c (from vendor/nginx-1.13.10/src/os/unix/ngx_darwin_sendfile_chain.c) vendor/nginx-1.14.0/src/os/unix/ngx_dlopen.c (from vendor/nginx-1.13.10/src/os/unix/ngx_dlopen.c) vendor/nginx-1.14.0/src/os/unix/ngx_dlopen.h (from vendor/nginx-1.13.10/src/os/unix/ngx_dlopen.h) vendor/nginx-1.14.0/src/os/unix/ngx_errno.c (from vendor/nginx-1.13.10/src/os/unix/ngx_errno.c) vendor/nginx-1.14.0/src/os/unix/ngx_errno.h (from vendor/nginx-1.13.10/src/os/unix/ngx_errno.h) vendor/nginx-1.14.0/src/os/unix/ngx_file_aio_read.c (from vendor/nginx-1.13.10/src/os/unix/ngx_file_aio_read.c) vendor/nginx-1.14.0/src/os/unix/ngx_files.c (from vendor/nginx-1.13.10/src/os/unix/ngx_files.c) vendor/nginx-1.14.0/src/os/unix/ngx_files.h (from vendor/nginx-1.13.10/src/os/unix/ngx_files.h) vendor/nginx-1.14.0/src/os/unix/ngx_freebsd.h (from vendor/nginx-1.13.10/src/os/unix/ngx_freebsd.h) vendor/nginx-1.14.0/src/os/unix/ngx_freebsd_config.h (from vendor/nginx-1.13.10/src/os/unix/ngx_freebsd_config.h) vendor/nginx-1.14.0/src/os/unix/ngx_freebsd_init.c (from vendor/nginx-1.13.10/src/os/unix/ngx_freebsd_init.c) vendor/nginx-1.14.0/src/os/unix/ngx_freebsd_sendfile_chain.c (from vendor/nginx-1.13.10/src/os/unix/ngx_freebsd_sendfile_chain.c) vendor/nginx-1.14.0/src/os/unix/ngx_gcc_atomic_amd64.h (from vendor/nginx-1.13.10/src/os/unix/ngx_gcc_atomic_amd64.h) vendor/nginx-1.14.0/src/os/unix/ngx_gcc_atomic_ppc.h (from vendor/nginx-1.13.10/src/os/unix/ngx_gcc_atomic_ppc.h) vendor/nginx-1.14.0/src/os/unix/ngx_gcc_atomic_sparc64.h (from vendor/nginx-1.13.10/src/os/unix/ngx_gcc_atomic_sparc64.h) vendor/nginx-1.14.0/src/os/unix/ngx_gcc_atomic_x86.h (from vendor/nginx-1.13.10/src/os/unix/ngx_gcc_atomic_x86.h) vendor/nginx-1.14.0/src/os/unix/ngx_linux.h (from vendor/nginx-1.13.10/src/os/unix/ngx_linux.h) vendor/nginx-1.14.0/src/os/unix/ngx_linux_aio_read.c (from vendor/nginx-1.13.10/src/os/unix/ngx_linux_aio_read.c) vendor/nginx-1.14.0/src/os/unix/ngx_linux_config.h (from vendor/nginx-1.13.10/src/os/unix/ngx_linux_config.h) vendor/nginx-1.14.0/src/os/unix/ngx_linux_init.c (from vendor/nginx-1.13.10/src/os/unix/ngx_linux_init.c) vendor/nginx-1.14.0/src/os/unix/ngx_linux_sendfile_chain.c (from vendor/nginx-1.13.10/src/os/unix/ngx_linux_sendfile_chain.c) vendor/nginx-1.14.0/src/os/unix/ngx_os.h (from vendor/nginx-1.13.10/src/os/unix/ngx_os.h) vendor/nginx-1.14.0/src/os/unix/ngx_posix_config.h (from vendor/nginx-1.13.10/src/os/unix/ngx_posix_config.h) vendor/nginx-1.14.0/src/os/unix/ngx_posix_init.c (from vendor/nginx-1.13.10/src/os/unix/ngx_posix_init.c) vendor/nginx-1.14.0/src/os/unix/ngx_process.c (from vendor/nginx-1.13.10/src/os/unix/ngx_process.c) vendor/nginx-1.14.0/src/os/unix/ngx_process.h (from vendor/nginx-1.13.10/src/os/unix/ngx_process.h) vendor/nginx-1.14.0/src/os/unix/ngx_process_cycle.c (from vendor/nginx-1.13.10/src/os/unix/ngx_process_cycle.c) vendor/nginx-1.14.0/src/os/unix/ngx_process_cycle.h (from vendor/nginx-1.13.10/src/os/unix/ngx_process_cycle.h) vendor/nginx-1.14.0/src/os/unix/ngx_readv_chain.c (from vendor/nginx-1.13.10/src/os/unix/ngx_readv_chain.c) vendor/nginx-1.14.0/src/os/unix/ngx_recv.c (from vendor/nginx-1.13.10/src/os/unix/ngx_recv.c) vendor/nginx-1.14.0/src/os/unix/ngx_send.c (from vendor/nginx-1.13.10/src/os/unix/ngx_send.c) vendor/nginx-1.14.0/src/os/unix/ngx_setaffinity.c (from vendor/nginx-1.13.10/src/os/unix/ngx_setaffinity.c) vendor/nginx-1.14.0/src/os/unix/ngx_setaffinity.h (from vendor/nginx-1.13.10/src/os/unix/ngx_setaffinity.h) vendor/nginx-1.14.0/src/os/unix/ngx_setproctitle.c (from vendor/nginx-1.13.10/src/os/unix/ngx_setproctitle.c) vendor/nginx-1.14.0/src/os/unix/ngx_setproctitle.h (from vendor/nginx-1.13.10/src/os/unix/ngx_setproctitle.h) vendor/nginx-1.14.0/src/os/unix/ngx_shmem.c (from vendor/nginx-1.13.10/src/os/unix/ngx_shmem.c) vendor/nginx-1.14.0/src/os/unix/ngx_shmem.h (from vendor/nginx-1.13.10/src/os/unix/ngx_shmem.h) vendor/nginx-1.14.0/src/os/unix/ngx_socket.c (from vendor/nginx-1.13.10/src/os/unix/ngx_socket.c) vendor/nginx-1.14.0/src/os/unix/ngx_socket.h (from vendor/nginx-1.13.10/src/os/unix/ngx_socket.h) vendor/nginx-1.14.0/src/os/unix/ngx_solaris.h (from vendor/nginx-1.13.10/src/os/unix/ngx_solaris.h) vendor/nginx-1.14.0/src/os/unix/ngx_solaris_config.h (from vendor/nginx-1.13.10/src/os/unix/ngx_solaris_config.h) vendor/nginx-1.14.0/src/os/unix/ngx_solaris_init.c (from vendor/nginx-1.13.10/src/os/unix/ngx_solaris_init.c) vendor/nginx-1.14.0/src/os/unix/ngx_solaris_sendfilev_chain.c (from vendor/nginx-1.13.10/src/os/unix/ngx_solaris_sendfilev_chain.c) vendor/nginx-1.14.0/src/os/unix/ngx_sunpro_amd64.il (from vendor/nginx-1.13.10/src/os/unix/ngx_sunpro_amd64.il) vendor/nginx-1.14.0/src/os/unix/ngx_sunpro_atomic_sparc64.h (from vendor/nginx-1.13.10/src/os/unix/ngx_sunpro_atomic_sparc64.h) vendor/nginx-1.14.0/src/os/unix/ngx_sunpro_sparc64.il (from vendor/nginx-1.13.10/src/os/unix/ngx_sunpro_sparc64.il) vendor/nginx-1.14.0/src/os/unix/ngx_sunpro_x86.il (from vendor/nginx-1.13.10/src/os/unix/ngx_sunpro_x86.il) vendor/nginx-1.14.0/src/os/unix/ngx_thread.h (from vendor/nginx-1.13.10/src/os/unix/ngx_thread.h) vendor/nginx-1.14.0/src/os/unix/ngx_thread_cond.c (from vendor/nginx-1.13.10/src/os/unix/ngx_thread_cond.c) vendor/nginx-1.14.0/src/os/unix/ngx_thread_id.c (from vendor/nginx-1.13.10/src/os/unix/ngx_thread_id.c) vendor/nginx-1.14.0/src/os/unix/ngx_thread_mutex.c (from vendor/nginx-1.13.10/src/os/unix/ngx_thread_mutex.c) vendor/nginx-1.14.0/src/os/unix/ngx_time.c (from vendor/nginx-1.13.10/src/os/unix/ngx_time.c) vendor/nginx-1.14.0/src/os/unix/ngx_time.h (from vendor/nginx-1.13.10/src/os/unix/ngx_time.h) vendor/nginx-1.14.0/src/os/unix/ngx_udp_recv.c (from vendor/nginx-1.13.10/src/os/unix/ngx_udp_recv.c) vendor/nginx-1.14.0/src/os/unix/ngx_udp_send.c (from vendor/nginx-1.13.10/src/os/unix/ngx_udp_send.c) vendor/nginx-1.14.0/src/os/unix/ngx_udp_sendmsg_chain.c (from vendor/nginx-1.13.10/src/os/unix/ngx_udp_sendmsg_chain.c) vendor/nginx-1.14.0/src/os/unix/ngx_user.c (from vendor/nginx-1.13.10/src/os/unix/ngx_user.c) vendor/nginx-1.14.0/src/os/unix/ngx_user.h (from vendor/nginx-1.13.10/src/os/unix/ngx_user.h) vendor/nginx-1.14.0/src/os/unix/ngx_writev_chain.c (from vendor/nginx-1.13.10/src/os/unix/ngx_writev_chain.c) vendor/nginx-1.14.0/src/os/win32/nginx.ico (from vendor/nginx-1.13.10/src/os/win32/nginx.ico) vendor/nginx-1.14.0/src/os/win32/nginx.rc (from vendor/nginx-1.13.10/src/os/win32/nginx.rc) vendor/nginx-1.14.0/src/os/win32/nginx_icon16.xpm (from vendor/nginx-1.13.10/src/os/win32/nginx_icon16.xpm) vendor/nginx-1.14.0/src/os/win32/nginx_icon32.xpm (from vendor/nginx-1.13.10/src/os/win32/nginx_icon32.xpm) vendor/nginx-1.14.0/src/os/win32/nginx_icon48.xpm (from vendor/nginx-1.13.10/src/os/win32/nginx_icon48.xpm) vendor/nginx-1.14.0/src/os/win32/ngx_alloc.c (from vendor/nginx-1.13.10/src/os/win32/ngx_alloc.c) vendor/nginx-1.14.0/src/os/win32/ngx_alloc.h (from vendor/nginx-1.13.10/src/os/win32/ngx_alloc.h) vendor/nginx-1.14.0/src/os/win32/ngx_atomic.h (from vendor/nginx-1.13.10/src/os/win32/ngx_atomic.h) vendor/nginx-1.14.0/src/os/win32/ngx_dlopen.c (from vendor/nginx-1.13.10/src/os/win32/ngx_dlopen.c) vendor/nginx-1.14.0/src/os/win32/ngx_dlopen.h (from vendor/nginx-1.13.10/src/os/win32/ngx_dlopen.h) vendor/nginx-1.14.0/src/os/win32/ngx_errno.c (from vendor/nginx-1.13.10/src/os/win32/ngx_errno.c) vendor/nginx-1.14.0/src/os/win32/ngx_errno.h (from vendor/nginx-1.13.10/src/os/win32/ngx_errno.h) vendor/nginx-1.14.0/src/os/win32/ngx_event_log.c (from vendor/nginx-1.13.10/src/os/win32/ngx_event_log.c) vendor/nginx-1.14.0/src/os/win32/ngx_files.c (from vendor/nginx-1.13.10/src/os/win32/ngx_files.c) vendor/nginx-1.14.0/src/os/win32/ngx_files.h (from vendor/nginx-1.13.10/src/os/win32/ngx_files.h) vendor/nginx-1.14.0/src/os/win32/ngx_os.h (from vendor/nginx-1.13.10/src/os/win32/ngx_os.h) vendor/nginx-1.14.0/src/os/win32/ngx_process.c (from vendor/nginx-1.13.10/src/os/win32/ngx_process.c) vendor/nginx-1.14.0/src/os/win32/ngx_process.h (from vendor/nginx-1.13.10/src/os/win32/ngx_process.h) vendor/nginx-1.14.0/src/os/win32/ngx_process_cycle.c (from vendor/nginx-1.13.10/src/os/win32/ngx_process_cycle.c) vendor/nginx-1.14.0/src/os/win32/ngx_process_cycle.h (from vendor/nginx-1.13.10/src/os/win32/ngx_process_cycle.h) vendor/nginx-1.14.0/src/os/win32/ngx_service.c (from vendor/nginx-1.13.10/src/os/win32/ngx_service.c) vendor/nginx-1.14.0/src/os/win32/ngx_shmem.c (from vendor/nginx-1.13.10/src/os/win32/ngx_shmem.c) vendor/nginx-1.14.0/src/os/win32/ngx_shmem.h (from vendor/nginx-1.13.10/src/os/win32/ngx_shmem.h) vendor/nginx-1.14.0/src/os/win32/ngx_socket.c (from vendor/nginx-1.13.10/src/os/win32/ngx_socket.c) vendor/nginx-1.14.0/src/os/win32/ngx_socket.h (from vendor/nginx-1.13.10/src/os/win32/ngx_socket.h) vendor/nginx-1.14.0/src/os/win32/ngx_stat.c (from vendor/nginx-1.13.10/src/os/win32/ngx_stat.c) vendor/nginx-1.14.0/src/os/win32/ngx_thread.c (from vendor/nginx-1.13.10/src/os/win32/ngx_thread.c) vendor/nginx-1.14.0/src/os/win32/ngx_thread.h (from vendor/nginx-1.13.10/src/os/win32/ngx_thread.h) vendor/nginx-1.14.0/src/os/win32/ngx_time.c (from vendor/nginx-1.13.10/src/os/win32/ngx_time.c) vendor/nginx-1.14.0/src/os/win32/ngx_time.h (from vendor/nginx-1.13.10/src/os/win32/ngx_time.h) vendor/nginx-1.14.0/src/os/win32/ngx_udp_wsarecv.c (from vendor/nginx-1.13.10/src/os/win32/ngx_udp_wsarecv.c) vendor/nginx-1.14.0/src/os/win32/ngx_user.c (from vendor/nginx-1.13.10/src/os/win32/ngx_user.c) vendor/nginx-1.14.0/src/os/win32/ngx_user.h (from vendor/nginx-1.13.10/src/os/win32/ngx_user.h) vendor/nginx-1.14.0/src/os/win32/ngx_win32_config.h (from vendor/nginx-1.13.10/src/os/win32/ngx_win32_config.h) vendor/nginx-1.14.0/src/os/win32/ngx_win32_init.c (from vendor/nginx-1.13.10/src/os/win32/ngx_win32_init.c) vendor/nginx-1.14.0/src/os/win32/ngx_wsarecv.c (from vendor/nginx-1.13.10/src/os/win32/ngx_wsarecv.c) vendor/nginx-1.14.0/src/os/win32/ngx_wsarecv_chain.c (from vendor/nginx-1.13.10/src/os/win32/ngx_wsarecv_chain.c) vendor/nginx-1.14.0/src/os/win32/ngx_wsasend.c (from vendor/nginx-1.13.10/src/os/win32/ngx_wsasend.c) vendor/nginx-1.14.0/src/os/win32/ngx_wsasend_chain.c (from vendor/nginx-1.13.10/src/os/win32/ngx_wsasend_chain.c) vendor/nginx-1.14.0/src/stream/ngx_stream.c (from vendor/nginx-1.13.10/src/stream/ngx_stream.c) vendor/nginx-1.14.0/src/stream/ngx_stream.h (from vendor/nginx-1.13.10/src/stream/ngx_stream.h) vendor/nginx-1.14.0/src/stream/ngx_stream_access_module.c (from vendor/nginx-1.13.10/src/stream/ngx_stream_access_module.c) vendor/nginx-1.14.0/src/stream/ngx_stream_core_module.c (from vendor/nginx-1.13.10/src/stream/ngx_stream_core_module.c) vendor/nginx-1.14.0/src/stream/ngx_stream_geo_module.c (from vendor/nginx-1.13.10/src/stream/ngx_stream_geo_module.c) vendor/nginx-1.14.0/src/stream/ngx_stream_geoip_module.c (from vendor/nginx-1.13.10/src/stream/ngx_stream_geoip_module.c) vendor/nginx-1.14.0/src/stream/ngx_stream_handler.c (from vendor/nginx-1.13.10/src/stream/ngx_stream_handler.c) vendor/nginx-1.14.0/src/stream/ngx_stream_limit_conn_module.c (from vendor/nginx-1.13.10/src/stream/ngx_stream_limit_conn_module.c) vendor/nginx-1.14.0/src/stream/ngx_stream_log_module.c (from vendor/nginx-1.13.10/src/stream/ngx_stream_log_module.c) vendor/nginx-1.14.0/src/stream/ngx_stream_map_module.c (from vendor/nginx-1.13.10/src/stream/ngx_stream_map_module.c) vendor/nginx-1.14.0/src/stream/ngx_stream_proxy_module.c (from vendor/nginx-1.13.10/src/stream/ngx_stream_proxy_module.c) vendor/nginx-1.14.0/src/stream/ngx_stream_realip_module.c (from vendor/nginx-1.13.10/src/stream/ngx_stream_realip_module.c) vendor/nginx-1.14.0/src/stream/ngx_stream_return_module.c (from vendor/nginx-1.13.10/src/stream/ngx_stream_return_module.c) vendor/nginx-1.14.0/src/stream/ngx_stream_script.c (from vendor/nginx-1.13.10/src/stream/ngx_stream_script.c) vendor/nginx-1.14.0/src/stream/ngx_stream_script.h (from vendor/nginx-1.13.10/src/stream/ngx_stream_script.h) vendor/nginx-1.14.0/src/stream/ngx_stream_split_clients_module.c (from vendor/nginx-1.13.10/src/stream/ngx_stream_split_clients_module.c) vendor/nginx-1.14.0/src/stream/ngx_stream_ssl_module.c (from vendor/nginx-1.13.10/src/stream/ngx_stream_ssl_module.c) vendor/nginx-1.14.0/src/stream/ngx_stream_ssl_module.h (from vendor/nginx-1.13.10/src/stream/ngx_stream_ssl_module.h) vendor/nginx-1.14.0/src/stream/ngx_stream_ssl_preread_module.c (from vendor/nginx-1.13.10/src/stream/ngx_stream_ssl_preread_module.c) vendor/nginx-1.14.0/src/stream/ngx_stream_upstream.c (from vendor/nginx-1.13.10/src/stream/ngx_stream_upstream.c) vendor/nginx-1.14.0/src/stream/ngx_stream_upstream.h (from vendor/nginx-1.13.10/src/stream/ngx_stream_upstream.h) vendor/nginx-1.14.0/src/stream/ngx_stream_upstream_hash_module.c (from vendor/nginx-1.13.10/src/stream/ngx_stream_upstream_hash_module.c) vendor/nginx-1.14.0/src/stream/ngx_stream_upstream_least_conn_module.c (from vendor/nginx-1.13.10/src/stream/ngx_stream_upstream_least_conn_module.c) vendor/nginx-1.14.0/src/stream/ngx_stream_upstream_round_robin.c (from vendor/nginx-1.13.10/src/stream/ngx_stream_upstream_round_robin.c) vendor/nginx-1.14.0/src/stream/ngx_stream_upstream_round_robin.h (from vendor/nginx-1.13.10/src/stream/ngx_stream_upstream_round_robin.h) vendor/nginx-1.14.0/src/stream/ngx_stream_upstream_zone_module.c (from vendor/nginx-1.13.10/src/stream/ngx_stream_upstream_zone_module.c) vendor/nginx-1.14.0/src/stream/ngx_stream_variables.c (from vendor/nginx-1.13.10/src/stream/ngx_stream_variables.c) vendor/nginx-1.14.0/src/stream/ngx_stream_variables.h (from vendor/nginx-1.13.10/src/stream/ngx_stream_variables.h) vendor/nginx-1.14.0/src/stream/ngx_stream_write_filter_module.c (from vendor/nginx-1.13.10/src/stream/ngx_stream_write_filter_module.c) Modified: nginx_version (+1 -1) =================================================================== --- nginx_version 2018-05-22 14:38:17 +0900 (f3352b3fe) +++ nginx_version 2018-05-22 14:04:19 +0900 (850e74240) @@ -1 +1 @@ -1.13.10 +1.14.0 Deleted: vendor/nginx-1.13.10/src/core/ngx_proxy_protocol.c (+0 -168) 100644 =================================================================== --- vendor/nginx-1.13.10/src/core/ngx_proxy_protocol.c 2018-05-22 14:38:17 +0900 (523ec35dd) +++ /dev/null @@ -1,168 +0,0 @@ - -/* - * Copyright (C) Roman Arutyunyan - * Copyright (C) Nginx, Inc. - */ - - -#include <ngx_config.h> -#include <ngx_core.h> - - -u_char * -ngx_proxy_protocol_read(ngx_connection_t *c, u_char *buf, u_char *last) -{ - size_t len; - u_char ch, *p, *addr, *port; - ngx_int_t n; - - p = buf; - len = last - buf; - - if (len < 8 || ngx_strncmp(p, "PROXY ", 6) != 0) { - goto invalid; - } - - p += 6; - len -= 6; - - if (len >= 7 && ngx_strncmp(p, "UNKNOWN", 7) == 0) { - ngx_log_debug0(NGX_LOG_DEBUG_CORE, c->log, 0, - "PROXY protocol unknown protocol"); - p += 7; - goto skip; - } - - if (len < 5 || ngx_strncmp(p, "TCP", 3) != 0 - || (p[3] != '4' && p[3] != '6') || p[4] != ' ') - { - goto invalid; - } - - p += 5; - addr = p; - - for ( ;; ) { - if (p == last) { - goto invalid; - } - - ch = *p++; - - if (ch == ' ') { - break; - } - - if (ch != ':' && ch != '.' - && (ch < 'a' || ch > 'f') - && (ch < 'A' || ch > 'F') - && (ch < '0' || ch > '9')) - { - goto invalid; - } - } - - len = p - addr - 1; - c->proxy_protocol_addr.data = ngx_pnalloc(c->pool, len); - - if (c->proxy_protocol_addr.data == NULL) { - return NULL; - } - - ngx_memcpy(c->proxy_protocol_addr.data, addr, len); - c->proxy_protocol_addr.len = len; - - for ( ;; ) { - if (p == last) { - goto invalid; - } - - if (*p++ == ' ') { - break; - } - } - - port = p; - - for ( ;; ) { - if (p == last) { - goto invalid; - } - - if (*p++ == ' ') { - break; - } - } - - len = p - port - 1; - - n = ngx_atoi(port, len); - - if (n < 0 || n > 65535) { - goto invalid; - } - - c->proxy_protocol_port = (in_port_t) n; - - ngx_log_debug2(NGX_LOG_DEBUG_CORE, c->log, 0, - "PROXY protocol address: %V %i", &c->proxy_protocol_addr, n); - -skip: - - for ( /* void */ ; p < last - 1; p++) { - if (p[0] == CR && p[1] == LF) { - return p + 2; - } - } - -invalid: - - ngx_log_error(NGX_LOG_ERR, c->log, 0, - "broken header: \"%*s\"", (size_t) (last - buf), buf); - - return NULL; -} - - -u_char * -ngx_proxy_protocol_write(ngx_connection_t *c, u_char *buf, u_char *last) -{ - ngx_uint_t port, lport; - - if (last - buf < NGX_PROXY_PROTOCOL_MAX_HEADER) { - return NULL; - } - - if (ngx_connection_local_sockaddr(c, NULL, 0) != NGX_OK) { - return NULL; - } - - switch (c->sockaddr->sa_family) { - - case AF_INET: - buf = ngx_cpymem(buf, "PROXY TCP4 ", sizeof("PROXY TCP4 ") - 1); - break; - -#if (NGX_HAVE_INET6) - case AF_INET6: - buf = ngx_cpymem(buf, "PROXY TCP6 ", sizeof("PROXY TCP6 ") - 1); - break; -#endif - - default: - return ngx_cpymem(buf, "PROXY UNKNOWN" CRLF, - sizeof("PROXY UNKNOWN" CRLF) - 1); - } - - buf += ngx_sock_ntop(c->sockaddr, c->socklen, buf, last - buf, 0); - - *buf++ = ' '; - - buf += ngx_sock_ntop(c->local_sockaddr, c->local_socklen, buf, last - buf, - 0); - - port = ngx_inet_get_port(c->sockaddr); - lport = ngx_inet_get_port(c->local_sockaddr); - - return ngx_slprintf(buf, last, " %ui %ui" CRLF, port, lport); -} Renamed: vendor/nginx-1.14.0/auto/cc/acc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/cc/bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/cc/ccc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/cc/clang (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/cc/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/cc/gcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/cc/icc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/cc/msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/cc/name (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/cc/owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/cc/sunc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/configure (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/define (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/endianness (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/feature (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/have (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/have_headers (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/headers (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/include (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/init (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/install (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/lib/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/lib/geoip/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/lib/google-perftools/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/lib/libatomic/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/lib/libatomic/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/lib/libgd/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/lib/libxslt/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/lib/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/lib/openssl/conf (+14 -7) 88% =================================================================== --- vendor/nginx-1.13.10/auto/lib/openssl/conf 2018-05-22 14:38:17 +0900 (e7d3795b2) +++ vendor/nginx-1.14.0/auto/lib/openssl/conf 2018-05-22 14:04:19 +0900 (4fb52df7f) @@ -41,6 +41,7 @@ if [ $OPENSSL != NONE ]; then CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libssl.a" CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libcrypto.a" CORE_LIBS="$CORE_LIBS $NGX_LIBDL" + CORE_LIBS="$CORE_LIBS $NGX_LIBPTHREAD" if [ "$NGX_PLATFORM" = win32 ]; then CORE_LIBS="$CORE_LIBS -lgdi32 -lcrypt32 -lws2_32" @@ -59,7 +60,7 @@ else ngx_feature_run=no ngx_feature_incs="#include <openssl/ssl.h>" ngx_feature_path= - ngx_feature_libs="-lssl -lcrypto $NGX_LIBDL" + ngx_feature_libs="-lssl -lcrypto $NGX_LIBDL $NGX_LIBPTHREAD" ngx_feature_test="SSL_CTX_set_options(NULL, 0)" . auto/feature @@ -71,11 +72,13 @@ else ngx_feature_path="/usr/local/include" if [ $NGX_RPATH = YES ]; then - ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lssl -lcrypto $NGX_LIBDL" + ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lssl -lcrypto" else - ngx_feature_libs="-L/usr/local/lib -lssl -lcrypto $NGX_LIBDL" + ngx_feature_libs="-L/usr/local/lib -lssl -lcrypto" fi + ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD" + . auto/feature fi @@ -87,11 +90,13 @@ else ngx_feature_path="/usr/pkg/include" if [ $NGX_RPATH = YES ]; then - ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lssl -lcrypto $NGX_LIBDL" + ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lssl -lcrypto" else - ngx_feature_libs="-L/usr/pkg/lib -lssl -lcrypto $NGX_LIBDL" + ngx_feature_libs="-L/usr/pkg/lib -lssl -lcrypto" fi + ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD" + . auto/feature fi @@ -103,11 +108,13 @@ else ngx_feature_path="/opt/local/include" if [ $NGX_RPATH = YES ]; then - ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -lssl -lcrypto $NGX_LIBDL" + ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -lssl -lcrypto" else - ngx_feature_libs="-L/opt/local/lib -lssl -lcrypto $NGX_LIBDL" + ngx_feature_libs="-L/opt/local/lib -lssl -lcrypto" fi + ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD" + . auto/feature fi Renamed: vendor/nginx-1.14.0/auto/lib/openssl/make (+1 -1) 95% =================================================================== --- vendor/nginx-1.13.10/auto/lib/openssl/make 2018-05-22 14:38:17 +0900 (a6090c6d4) +++ vendor/nginx-1.14.0/auto/lib/openssl/make 2018-05-22 14:04:19 +0900 (126a23875) @@ -51,7 +51,7 @@ END $OPENSSL/.openssl/include/openssl/ssl.h: $NGX_MAKEFILE cd $OPENSSL \\ && if [ -f Makefile ]; then \$(MAKE) clean; fi \\ - && ./config --prefix=$ngx_prefix no-shared $OPENSSL_OPT \\ + && ./config --prefix=$ngx_prefix no-shared no-threads $OPENSSL_OPT \\ && \$(MAKE) \\ && \$(MAKE) install_sw LIBDIR=lib Renamed: vendor/nginx-1.14.0/auto/lib/openssl/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/lib/openssl/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/lib/pcre/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/lib/pcre/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/lib/pcre/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/lib/pcre/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/lib/pcre/makefile.owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/lib/perl/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/lib/perl/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/lib/zlib/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/lib/zlib/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/lib/zlib/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/lib/zlib/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/lib/zlib/makefile.owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/module (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/modules (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/nohave (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/options (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/os/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/os/darwin (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/os/freebsd (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/os/linux (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/os/solaris (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/os/win32 (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/sources (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/stubs (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/summary (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/threads (+1 -0) 92% =================================================================== --- vendor/nginx-1.13.10/auto/threads 2018-05-22 14:38:17 +0900 (381f07ac3) +++ vendor/nginx-1.14.0/auto/threads 2018-05-22 14:04:19 +0900 (943127f63) @@ -17,4 +17,5 @@ END CORE_DEPS="$CORE_DEPS $THREAD_POOL_DEPS" CORE_SRCS="$CORE_SRCS $THREAD_POOL_SRCS" CORE_LIBS="$CORE_LIBS -lpthread" + NGX_LIBPTHREAD="-lpthread" fi Renamed: vendor/nginx-1.14.0/auto/types/sizeof (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/types/typedef (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/types/uintptr_t (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/types/value (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/auto/unix (+1 -0) 99% =================================================================== --- vendor/nginx-1.13.10/auto/unix 2018-05-22 14:38:17 +0900 (90b5894a3) +++ vendor/nginx-1.14.0/auto/unix 2018-05-22 14:04:19 +0900 (43d3b25a5) @@ -901,6 +901,7 @@ if [ $ngx_found = no ]; then if [ $ngx_found = yes ]; then CORE_LIBS="$CORE_LIBS -lpthread" + NGX_LIBPTHREAD="-lpthread" fi fi Renamed: vendor/nginx-1.14.0/conf/fastcgi.conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/conf/fastcgi_params (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/conf/koi-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/conf/koi-win (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/conf/mime.types (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/conf/nginx.conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/conf/scgi_params (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/conf/uwsgi_params (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/conf/win-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/contrib/README (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/contrib/geo2nginx.pl (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/contrib/unicode2nginx/koi-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/contrib/unicode2nginx/unicode-to-nginx.pl (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/contrib/unicode2nginx/win-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/contrib/vim/ftdetect/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/contrib/vim/ftplugin/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/contrib/vim/indent/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/contrib/vim/syntax/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/docs/GNUmakefile (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/docs/dtd/change_log_conf.dtd (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/docs/dtd/changes.dtd (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/docs/html/50x.html (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/docs/html/index.html (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/docs/man/nginx.8 (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/docs/text/LICENSE (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/docs/text/README (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/docs/xml/change_log_conf.xml (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/docs/xml/nginx/changes.xml (+66 -0) 99% =================================================================== --- vendor/nginx-1.13.10/docs/xml/nginx/changes.xml 2018-05-22 14:38:17 +0900 (7cb1fcf06) +++ vendor/nginx-1.14.0/docs/xml/nginx/changes.xml 2018-05-22 14:04:19 +0900 (ae5282987) @@ -5,6 +5,72 @@ <change_log title="nginx"> +<changes ver="1.14.0" date="2018-04-17"> + +<change> +<para lang="ru"> +Стабильная ветка 1.14.x. +</para> +<para lang="en"> +1.14.x stable branch. +</para> +</change> + +</changes> + + +<changes ver="1.13.12" date="2018-04-10"> + +<change type="bugfix"> +<para lang="ru"> +при возврате большого ответа +соединения с gRPC-бэкендами могли неожиданно закрываться. +</para> +<para lang="en"> +connections with gRPC backends might be closed unexpectedly +when returning a large response. +</para> +</change> + +</changes> + + +<changes ver="1.13.11" date="2018-04-03"> + +<change type="feature"> +<para lang="ru"> +параметр proxy_protocol директивы listen +теперь поддерживает протокол PROXY версии 2. +</para> +<para lang="en"> +the "proxy_protocol" parameter of the "listen" directive +now supports the PROXY protocol version 2. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +nginx не собирался с OpenSSL 1.1.1 статически на Linux. +</para> +<para lang="en"> +nginx could not be built with OpenSSL 1.1.1 statically on Linux. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +в параметрах http_404, http_500 и им подобных +директивы proxy_next_upstream. +</para> +<para lang="en"> +in the "http_404", "http_500", etc. parameters +of the "proxy_next_upstream" directive. +</para> +</change> + +</changes> + + <changes ver="1.13.10" date="2018-03-20"> <change type="feature"> Renamed: vendor/nginx-1.14.0/docs/xsls/changes.xsls (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/docs/xslt/changes.xslt (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/misc/GNUmakefile (+2 -2) 98% =================================================================== --- vendor/nginx-1.13.10/misc/GNUmakefile 2018-05-22 14:38:17 +0900 (9a9405c2b) +++ vendor/nginx-1.14.0/misc/GNUmakefile 2018-05-22 14:04:19 +0900 (243a18e73) @@ -6,9 +6,9 @@ TEMP = tmp CC = cl OBJS = objs.msvc8 -OPENSSL = openssl-1.0.2n +OPENSSL = openssl-1.0.2o ZLIB = zlib-1.2.11 -PCRE = pcre-8.41 +PCRE = pcre-8.42 release: export Renamed: vendor/nginx-1.14.0/misc/README (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/nginx.c (+2 -2) 99% =================================================================== --- vendor/nginx-1.13.10/src/core/nginx.c 2018-05-22 14:38:17 +0900 (3894c29fa) +++ vendor/nginx-1.14.0/src/core/nginx.c 2018-05-22 14:04:19 +0900 (9fcb0eb23) @@ -985,8 +985,8 @@ ngx_process_options(ngx_cycle_t *cycle) p--) { if (ngx_path_separator(*p)) { - cycle->conf_prefix.len = p - ngx_cycle->conf_file.data + 1; - cycle->conf_prefix.data = ngx_cycle->conf_file.data; + cycle->conf_prefix.len = p - cycle->conf_file.data + 1; + cycle->conf_prefix.data = cycle->conf_file.data; break; } } Renamed: vendor/nginx-1.14.0/src/core/nginx.h (+2 -2) 84% =================================================================== --- vendor/nginx-1.13.10/src/core/nginx.h 2018-05-22 14:38:17 +0900 (677d6cf06) +++ vendor/nginx-1.14.0/src/core/nginx.h 2018-05-22 14:04:19 +0900 (be4563d1e) @@ -9,8 +9,8 @@ #define _NGINX_H_INCLUDED_ -#define nginx_version 1013010 -#define NGINX_VERSION "1.13.10" +#define nginx_version 1014000 +#define NGINX_VERSION "1.14.0" #define NGINX_VER "nginx/" NGINX_VERSION #ifdef NGX_BUILD Renamed: vendor/nginx-1.14.0/src/core/ngx_array.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_array.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_buf.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_buf.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_conf_file.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_conf_file.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_connection.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_connection.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_core.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_cpuinfo.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_crc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_crc32.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_crc32.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_crypt.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_crypt.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_cycle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_cycle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_file.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_file.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_hash.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_hash.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_inet.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_inet.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_list.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_list.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_log.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_log.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_md5.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_md5.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_murmurhash.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_murmurhash.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_open_file_cache.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_open_file_cache.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_output_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_palloc.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_palloc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_parse.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_parse.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_parse_time.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_parse_time.h (+0 -0) 100% =================================================================== Added: vendor/nginx-1.14.0/src/core/ngx_proxy_protocol.c (+343 -0) 100644 =================================================================== --- /dev/null +++ vendor/nginx-1.14.0/src/core/ngx_proxy_protocol.c 2018-05-22 14:04:19 +0900 (c3d7fd30d) @@ -0,0 +1,343 @@ + +/* + * Copyright (C) Roman Arutyunyan + * Copyright (C) Nginx, Inc. + */ + + +#include <ngx_config.h> +#include <ngx_core.h> + + +#define NGX_PROXY_PROTOCOL_AF_INET 1 +#define NGX_PROXY_PROTOCOL_AF_INET6 2 + + +#define ngx_proxy_protocol_parse_uint16(p) ((p)[0] << 8 | (p)[1]) + + +typedef struct { + u_char signature[12]; + u_char version_command; + u_char family_transport; + u_char len[2]; +} ngx_proxy_protocol_header_t; + + +typedef struct { + u_char src_addr[4]; + u_char dst_addr[4]; + u_char src_port[2]; + u_char dst_port[2]; +} ngx_proxy_protocol_inet_addrs_t; + + +typedef struct { + u_char src_addr[16]; + u_char dst_addr[16]; + u_char src_port[2]; + u_char dst_port[2]; +} ngx_proxy_protocol_inet6_addrs_t; + + +static u_char *ngx_proxy_protocol_v2_read(ngx_connection_t *c, u_char *buf, + u_char *last); + + +u_char * +ngx_proxy_protocol_read(ngx_connection_t *c, u_char *buf, u_char *last) +{ + size_t len; + u_char ch, *p, *addr, *port; + ngx_int_t n; + + static const u_char signature[] = "\r\n\r\n\0\r\nQUIT\n"; + + p = buf; + len = last - buf; + + if (len >= sizeof(ngx_proxy_protocol_header_t) + && memcmp(p, signature, sizeof(signature) - 1) == 0) + { + return ngx_proxy_protocol_v2_read(c, buf, last); + } + + if (len < 8 || ngx_strncmp(p, "PROXY ", 6) != 0) { + goto invalid; + } + + p += 6; + len -= 6; + + if (len >= 7 && ngx_strncmp(p, "UNKNOWN", 7) == 0) { + ngx_log_debug0(NGX_LOG_DEBUG_CORE, c->log, 0, + "PROXY protocol unknown protocol"); + p += 7; + goto skip; + } + + if (len < 5 || ngx_strncmp(p, "TCP", 3) != 0 + || (p[3] != '4' && p[3] != '6') || p[4] != ' ') + { + goto invalid; + } + + p += 5; + addr = p; + + for ( ;; ) { + if (p == last) { + goto invalid; + } + + ch = *p++; + + if (ch == ' ') { + break; + } + + if (ch != ':' && ch != '.' + && (ch < 'a' || ch > 'f') + && (ch < 'A' || ch > 'F') + && (ch < '0' || ch > '9')) + { + goto invalid; + } + } + + len = p - addr - 1; + c->proxy_protocol_addr.data = ngx_pnalloc(c->pool, len); + + if (c->proxy_protocol_addr.data == NULL) { + return NULL; + } + + ngx_memcpy(c->proxy_protocol_addr.data, addr, len); + c->proxy_protocol_addr.len = len; + + for ( ;; ) { + if (p == last) { + goto invalid; + } + + if (*p++ == ' ') { + break; + } + } + + port = p; + + for ( ;; ) { + if (p == last) { + goto invalid; + } + + if (*p++ == ' ') { + break; + } + } + + len = p - port - 1; + + n = ngx_atoi(port, len); + + if (n < 0 || n > 65535) { + goto invalid; + } + + c->proxy_protocol_port = (in_port_t) n; + + ngx_log_debug2(NGX_LOG_DEBUG_CORE, c->log, 0, + "PROXY protocol address: %V %d", &c->proxy_protocol_addr, + c->proxy_protocol_port); + +skip: + + for ( /* void */ ; p < last - 1; p++) { + if (p[0] == CR && p[1] == LF) { + return p + 2; + } + } + +invalid: + + ngx_log_error(NGX_LOG_ERR, c->log, 0, + "broken header: \"%*s\"", (size_t) (last - buf), buf); + + return NULL; +} + + +u_char * +ngx_proxy_protocol_write(ngx_connection_t *c, u_char *buf, u_char *last) +{ + ngx_uint_t port, lport; + + if (last - buf < NGX_PROXY_PROTOCOL_MAX_HEADER) { + return NULL; + } + + if (ngx_connection_local_sockaddr(c, NULL, 0) != NGX_OK) { + return NULL; + } + + switch (c->sockaddr->sa_family) { + + case AF_INET: + buf = ngx_cpymem(buf, "PROXY TCP4 ", sizeof("PROXY TCP4 ") - 1); + break; + +#if (NGX_HAVE_INET6) + case AF_INET6: + buf = ngx_cpymem(buf, "PROXY TCP6 ", sizeof("PROXY TCP6 ") - 1); + break; +#endif + + default: + return ngx_cpymem(buf, "PROXY UNKNOWN" CRLF, + sizeof("PROXY UNKNOWN" CRLF) - 1); + } + + buf += ngx_sock_ntop(c->sockaddr, c->socklen, buf, last - buf, 0); + + *buf++ = ' '; + + buf += ngx_sock_ntop(c->local_sockaddr, c->local_socklen, buf, last - buf, + 0); + + port = ngx_inet_get_port(c->sockaddr); + lport = ngx_inet_get_port(c->local_sockaddr); + + return ngx_slprintf(buf, last, " %ui %ui" CRLF, port, lport); +} + + +static u_char * +ngx_proxy_protocol_v2_read(ngx_connection_t *c, u_char *buf, u_char *last) +{ + u_char *end; + size_t len; + socklen_t socklen; + ngx_uint_t version, command, family, transport; + ngx_sockaddr_t sockaddr; + ngx_proxy_protocol_header_t *header; + ngx_proxy_protocol_inet_addrs_t *in; +#if (NGX_HAVE_INET6) + ngx_proxy_protocol_inet6_addrs_t *in6; +#endif + + header = (ngx_proxy_protocol_header_t *) buf; + + buf += sizeof(ngx_proxy_protocol_header_t); + + version = header->version_command >> 4; + + if (version != 2) { + ngx_log_error(NGX_LOG_ERR, c->log, 0, + "unknown PROXY protocol version: %ui", version); + return NULL; + } + + len = ngx_proxy_protocol_parse_uint16(header->len); + + if ((size_t) (last - buf) < len) { + ngx_log_error(NGX_LOG_ERR, c->log, 0, "header is too large"); + return NULL; + } + + end = buf + len; + + command = header->version_command & 0x0f; + + /* only PROXY is supported */ + if (command != 1) { + ngx_log_debug1(NGX_LOG_DEBUG_CORE, c->log, 0, + "PROXY protocol v2 unsupported command %ui", command); + return end; + } + + transport = header->family_transport & 0x0f; + + /* only STREAM is supported */ + if (transport != 1) { + ngx_log_debug1(NGX_LOG_DEBUG_CORE, c->log, 0, + "PROXY protocol v2 unsupported transport %ui", + transport); + return end; + } + + family = header->family_transport >> 4; + + switch (family) { + + case NGX_PROXY_PROTOCOL_AF_INET: + + if ((size_t) (end - buf) < sizeof(ngx_proxy_protocol_inet_addrs_t)) { + return NULL; + } + + in = (ngx_proxy_protocol_inet_addrs_t *) buf; + + sockaddr.sockaddr_in.sin_family = AF_INET; + sockaddr.sockaddr_in.sin_port = 0; + memcpy(&sockaddr.sockaddr_in.sin_addr, in->src_addr, 4); + + c->proxy_protocol_port = ngx_proxy_protocol_parse_uint16(in->src_port); + + socklen = sizeof(struct sockaddr_in); + + buf += sizeof(ngx_proxy_protocol_inet_addrs_t); + + break; + +#if (NGX_HAVE_INET6) + + case NGX_PROXY_PROTOCOL_AF_INET6: + + if ((size_t) (end - buf) < sizeof(ngx_proxy_protocol_inet6_addrs_t)) { + return NULL; + } + + in6 = (ngx_proxy_protocol_inet6_addrs_t *) buf; + + sockaddr.sockaddr_in6.sin6_family = AF_INET6; + sockaddr.sockaddr_in6.sin6_port = 0; + memcpy(&sockaddr.sockaddr_in6.sin6_addr, in6->src_addr, 16); + + c->proxy_protocol_port = ngx_proxy_protocol_parse_uint16(in6->src_port); + + socklen = sizeof(struct sockaddr_in6); + + buf += sizeof(ngx_proxy_protocol_inet6_addrs_t); + + break; + +#endif + + default: + ngx_log_debug1(NGX_LOG_DEBUG_CORE, c->log, 0, + "PROXY protocol v2 unsupported address family %ui", + family); + return end; + } + + c->proxy_protocol_addr.data = ngx_pnalloc(c->pool, NGX_SOCKADDR_STRLEN); + if (c->proxy_protocol_addr.data == NULL) { + return NULL; + } + + c->proxy_protocol_addr.len = ngx_sock_ntop(&sockaddr.sockaddr, socklen, + c->proxy_protocol_addr.data, + NGX_SOCKADDR_STRLEN, 0); + + ngx_log_debug2(NGX_LOG_DEBUG_CORE, c->log, 0, + "PROXY protocol v2 address: %V %d", &c->proxy_protocol_addr, + c->proxy_protocol_port); + + if (buf < end) { + ngx_log_debug1(NGX_LOG_DEBUG_CORE, c->log, 0, + "PROXY protocol v2 %z bytes of tlv ignored", end - buf); + } + + return end; +} Renamed: vendor/nginx-1.14.0/src/core/ngx_proxy_protocol.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_queue.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_queue.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_radix_tree.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_radix_tree.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_rbtree.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_rbtree.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_regex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_regex.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_resolver.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_resolver.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_rwlock.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_rwlock.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_sha1.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_sha1.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_shmtx.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_shmtx.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_slab.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_slab.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_spinlock.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_string.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_string.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_syslog.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_syslog.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_thread_pool.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_thread_pool.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_times.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/core/ngx_times.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/event/modules/ngx_devpoll_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/event/modules/ngx_epoll_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/event/modules/ngx_eventport_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/event/modules/ngx_iocp_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/event/modules/ngx_iocp_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/event/modules/ngx_kqueue_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/event/modules/ngx_poll_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/event/modules/ngx_select_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/event/modules/ngx_win32_select_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/event/ngx_event.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/event/ngx_event.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/event/ngx_event_accept.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/event/ngx_event_acceptex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/event/ngx_event_connect.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/event/ngx_event_connect.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/event/ngx_event_connectex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/event/ngx_event_openssl.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/event/ngx_event_openssl.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/event/ngx_event_openssl_stapling.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/event/ngx_event_pipe.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/event/ngx_event_pipe.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/event/ngx_event_posted.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/event/ngx_event_posted.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/event/ngx_event_timer.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/event/ngx_event_timer.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_access_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_addition_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_auth_basic_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_auth_request_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_autoindex_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_browser_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_charset_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_chunked_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_dav_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_degradation_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_empty_gif_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_fastcgi_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_flv_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_geo_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_geoip_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_grpc_module.c (+3 -3) 99% =================================================================== --- vendor/nginx-1.13.10/src/http/modules/ngx_http_grpc_module.c 2018-05-22 14:38:17 +0900 (b6be9b874) +++ vendor/nginx-1.14.0/src/http/modules/ngx_http_grpc_module.c 2018-05-22 14:04:19 +0900 (837ad9a2e) @@ -3212,7 +3212,7 @@ ngx_http_grpc_parse_rst_stream(ngx_http_request_t *r, ngx_http_grpc_ctx_t *ctx, switch (state) { case sw_start: - ctx->error = ch << 24; + ctx->error = (ngx_uint_t) ch << 24; state = sw_error_2; break; @@ -3325,7 +3325,7 @@ ngx_http_grpc_parse_goaway(ngx_http_request_t *r, ngx_http_grpc_ctx_t *ctx, break; case sw_error: - ctx->error = ch << 24; + ctx->error = (ngx_uint_t) ch << 24; state = sw_error_2; break; @@ -3555,7 +3555,7 @@ ngx_http_grpc_parse_settings(ngx_http_request_t *r, ngx_http_grpc_ctx_t *ctx, break; case sw_value: - ctx->setting_value = ch << 24; + ctx->setting_value = (ngx_uint_t) ch << 24; state = sw_value_2; break; Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_gunzip_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_gzip_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_gzip_static_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_headers_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_image_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_index_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_limit_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_limit_req_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_log_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_map_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_memcached_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_mirror_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_mp4_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_not_modified_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_proxy_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_random_index_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_range_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_realip_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_referer_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_rewrite_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_scgi_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_secure_link_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_slice_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_split_clients_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_ssi_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_ssi_filter_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_ssl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_ssl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_static_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_stub_status_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_sub_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_try_files_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_upstream_hash_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_upstream_ip_hash_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_upstream_keepalive_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_upstream_least_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_upstream_zone_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_userid_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_uwsgi_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/ngx_http_xslt_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/perl/Makefile.PL (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/perl/nginx.pm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/perl/nginx.xs (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/perl/ngx_http_perl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/perl/ngx_http_perl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/modules/perl/typemap (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/ngx_http.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/ngx_http.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/ngx_http_cache.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/ngx_http_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/ngx_http_copy_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/ngx_http_core_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/ngx_http_core_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/ngx_http_file_cache.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/ngx_http_header_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/ngx_http_parse.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/ngx_http_postpone_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/ngx_http_request.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/ngx_http_request.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/ngx_http_request_body.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/ngx_http_script.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/ngx_http_script.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/ngx_http_special_response.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/ngx_http_upstream.c (+30 -8) 99% =================================================================== --- vendor/nginx-1.13.10/src/http/ngx_http_upstream.c 2018-05-22 14:38:17 +0900 (e6f9c09dc) +++ vendor/nginx-1.14.0/src/http/ngx_http_upstream.c 2018-05-22 14:04:19 +0900 (8fc3042e7) @@ -2013,8 +2013,6 @@ ngx_http_upstream_send_request(ngx_http_request_t *r, ngx_http_upstream_t *u, /* rc == NGX_OK */ - u->request_body_sent = 1; - if (c->write->timer_set) { ngx_del_timer(c->write); } @@ -2041,11 +2039,19 @@ ngx_http_upstream_send_request(ngx_http_request_t *r, ngx_http_upstream_t *u, return; } - ngx_add_timer(c->read, u->conf->read_timeout); + if (!u->request_body_sent) { + u->request_body_sent = 1; - if (c->read->ready) { - ngx_http_upstream_process_header(r, u); - return; + if (u->header_sent) { + return; + } + + ngx_add_timer(c->read, u->conf->read_timeout); + + if (c->read->ready) { + ngx_http_upstream_process_header(r, u); + return; + } } } @@ -2389,7 +2395,8 @@ ngx_http_upstream_process_header(ngx_http_request_t *r, ngx_http_upstream_t *u) static ngx_int_t ngx_http_upstream_test_next(ngx_http_request_t *r, ngx_http_upstream_t *u) { - ngx_uint_t status; + ngx_msec_t timeout; + ngx_uint_t status, mask; ngx_http_upstream_next_t *un; status = u->headers_in.status_n; @@ -2400,7 +2407,22 @@ ngx_http_upstream_test_next(ngx_http_request_t *r, ngx_http_upstream_t *u) continue; } - if (u->peer.tries > 1 && (u->conf->next_upstream & un->mask)) { + timeout = u->conf->next_upstream_timeout; + + if (u->request_sent + && (r->method & (NGX_HTTP_POST|NGX_HTTP_LOCK|NGX_HTTP_PATCH))) + { + mask = un->mask | NGX_HTTP_UPSTREAM_FT_NON_IDEMPOTENT; + + } else { + mask = un->mask; + } + + if (u->peer.tries > 1 + && ((u->conf->next_upstream & mask) == mask) + && !(u->request_sent && r->request_body_no_buffering) + && !(timeout && ngx_current_msec - u->peer.start_time >= timeout)) + { ngx_http_upstream_next(r, u, un->mask); return NGX_OK; } Renamed: vendor/nginx-1.14.0/src/http/ngx_http_upstream.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/ngx_http_upstream_round_robin.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/ngx_http_upstream_round_robin.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/ngx_http_variables.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/ngx_http_variables.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/ngx_http_write_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/v2/ngx_http_v2.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/v2/ngx_http_v2.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/v2/ngx_http_v2_encode.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/v2/ngx_http_v2_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/v2/ngx_http_v2_huff_decode.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/v2/ngx_http_v2_huff_encode.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/v2/ngx_http_v2_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/v2/ngx_http_v2_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/http/v2/ngx_http_v2_table.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/mail/ngx_mail.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/mail/ngx_mail.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/mail/ngx_mail_auth_http_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/mail/ngx_mail_core_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/mail/ngx_mail_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/mail/ngx_mail_imap_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/mail/ngx_mail_imap_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/mail/ngx_mail_imap_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/mail/ngx_mail_parse.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/mail/ngx_mail_pop3_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/mail/ngx_mail_pop3_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/mail/ngx_mail_pop3_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/mail/ngx_mail_proxy_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/mail/ngx_mail_smtp_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/mail/ngx_mail_smtp_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/mail/ngx_mail_smtp_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/mail/ngx_mail_ssl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/mail/ngx_mail_ssl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/misc/ngx_cpp_test_module.cpp (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/misc/ngx_google_perftools_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_alloc.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_alloc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_atomic.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_channel.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_channel.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_daemon.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_darwin.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_darwin_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_darwin_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_darwin_sendfile_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_dlopen.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_dlopen.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_errno.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_errno.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_file_aio_read.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_files.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_files.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_freebsd.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_freebsd_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_freebsd_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_freebsd_sendfile_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_gcc_atomic_amd64.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_gcc_atomic_ppc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_gcc_atomic_sparc64.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_gcc_atomic_x86.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_linux.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_linux_aio_read.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_linux_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_linux_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_linux_sendfile_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_os.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_posix_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_posix_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_process.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_process.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_process_cycle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_process_cycle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_readv_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_recv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_send.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_setaffinity.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_setaffinity.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_setproctitle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_setproctitle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_shmem.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_shmem.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_socket.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_socket.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_solaris.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_solaris_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_solaris_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_solaris_sendfilev_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_sunpro_amd64.il (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_sunpro_atomic_sparc64.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_sunpro_sparc64.il (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_sunpro_x86.il (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_thread.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_thread_cond.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_thread_id.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_thread_mutex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_time.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_time.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_udp_recv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_udp_send.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_udp_sendmsg_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_user.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_user.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/unix/ngx_writev_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/nginx.ico (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/nginx.rc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/nginx_icon16.xpm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/nginx_icon32.xpm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/nginx_icon48.xpm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/ngx_alloc.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/ngx_alloc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/ngx_atomic.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/ngx_dlopen.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/ngx_dlopen.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/ngx_errno.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/ngx_errno.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/ngx_event_log.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/ngx_files.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/ngx_files.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/ngx_os.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/ngx_process.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/ngx_process.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/ngx_process_cycle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/ngx_process_cycle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/ngx_service.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/ngx_shmem.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/ngx_shmem.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/ngx_socket.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/ngx_socket.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/ngx_stat.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/ngx_thread.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/ngx_thread.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/ngx_time.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/ngx_time.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/ngx_udp_wsarecv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/ngx_user.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/ngx_user.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/ngx_win32_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/ngx_win32_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/ngx_wsarecv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/ngx_wsarecv_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/ngx_wsasend.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/os/win32/ngx_wsasend_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/stream/ngx_stream.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/stream/ngx_stream.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/stream/ngx_stream_access_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/stream/ngx_stream_core_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/stream/ngx_stream_geo_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/stream/ngx_stream_geoip_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/stream/ngx_stream_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/stream/ngx_stream_limit_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/stream/ngx_stream_log_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/stream/ngx_stream_map_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/stream/ngx_stream_proxy_module.c (+11 -2) 99% =================================================================== --- vendor/nginx-1.13.10/src/stream/ngx_stream_proxy_module.c 2018-05-22 14:38:17 +0900 (818d7329b) +++ vendor/nginx-1.14.0/src/stream/ngx_stream_proxy_module.c 2018-05-22 14:04:19 +0900 (30572cdd9) @@ -801,8 +801,6 @@ ngx_stream_proxy_init_upstream(ngx_stream_session_t *s) NGX_STREAM_UPSTREAM_NOTIFY_CONNECT); } - c->log->action = "proxying connection"; - if (u->upstream_buf.start == NULL) { p = ngx_pnalloc(c->pool, pscf->buffer_size); if (p == NULL) { @@ -1449,6 +1447,7 @@ static void ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream, ngx_uint_t do_write) { + char *recv_action, *send_action; off_t *received, limit; size_t size, limit_rate; ssize_t n; @@ -1492,6 +1491,8 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream, received = &u->received; out = &u->downstream_out; busy = &u->downstream_busy; + recv_action = "proxying and reading from upstream"; + send_action = "proxying and sending to client"; } else { src = c; @@ -1501,6 +1502,8 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream, received = &s->received; out = &u->upstream_out; busy = &u->upstream_busy; + recv_action = "proxying and reading from client"; + send_action = "proxying and sending to upstream"; } for ( ;; ) { @@ -1508,6 +1511,8 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream, if (do_write && dst) { if (*out || *busy || dst->buffered) { + c->log->action = send_action; + rc = ngx_stream_top_filter(s, *out, from_upstream); if (rc == NGX_ERROR) { @@ -1551,6 +1556,8 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream, } } + c->log->action = recv_action; + n = src->recv(src, b->last, size); if (n == NGX_AGAIN) { @@ -1620,6 +1627,8 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream, break; } + c->log->action = "proxying connection"; + if (src->read->eof && dst && (dst->read->eof || !dst->buffered)) { handler = c->log->handler; c->log->handler = NULL; Renamed: vendor/nginx-1.14.0/src/stream/ngx_stream_realip_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/stream/ngx_stream_return_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/stream/ngx_stream_script.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/stream/ngx_stream_script.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/stream/ngx_stream_split_clients_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/stream/ngx_stream_ssl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/stream/ngx_stream_ssl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/stream/ngx_stream_ssl_preread_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/stream/ngx_stream_upstream.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/stream/ngx_stream_upstream.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/stream/ngx_stream_upstream_hash_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/stream/ngx_stream_upstream_least_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/stream/ngx_stream_upstream_round_robin.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/stream/ngx_stream_upstream_round_robin.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/stream/ngx_stream_upstream_zone_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/stream/ngx_stream_variables.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/stream/ngx_stream_variables.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.14.0/src/stream/ngx_stream_write_filter_module.c (+0 -0) 100% ===================================================================
