Kentaro Hayashi
null+****@clear*****
Fri Jun 30 22:53:57 JST 2017
Kentaro Hayashi 2017-06-30 22:53:57 +0900 (Fri, 30 Jun 2017) New Revision: 72b28139b96c450834ad8a0a621285803f5f5fdb https://github.com/groonga/groonga/commit/72b28139b96c450834ad8a0a621285803f5f5fdb Message: nginx: use latest nginx $ ./update_nginx.sh 1.13.2 Modified files: nginx_version Renamed files: vendor/nginx-1.13.2/auto/cc/acc (from vendor/nginx-1.13.1/auto/cc/acc) vendor/nginx-1.13.2/auto/cc/bcc (from vendor/nginx-1.13.1/auto/cc/bcc) vendor/nginx-1.13.2/auto/cc/ccc (from vendor/nginx-1.13.1/auto/cc/ccc) vendor/nginx-1.13.2/auto/cc/clang (from vendor/nginx-1.13.1/auto/cc/clang) vendor/nginx-1.13.2/auto/cc/conf (from vendor/nginx-1.13.1/auto/cc/conf) vendor/nginx-1.13.2/auto/cc/gcc (from vendor/nginx-1.13.1/auto/cc/gcc) vendor/nginx-1.13.2/auto/cc/icc (from vendor/nginx-1.13.1/auto/cc/icc) vendor/nginx-1.13.2/auto/cc/msvc (from vendor/nginx-1.13.1/auto/cc/msvc) vendor/nginx-1.13.2/auto/cc/name (from vendor/nginx-1.13.1/auto/cc/name) vendor/nginx-1.13.2/auto/cc/owc (from vendor/nginx-1.13.1/auto/cc/owc) vendor/nginx-1.13.2/auto/cc/sunc (from vendor/nginx-1.13.1/auto/cc/sunc) vendor/nginx-1.13.2/auto/configure (from vendor/nginx-1.13.1/auto/configure) vendor/nginx-1.13.2/auto/define (from vendor/nginx-1.13.1/auto/define) vendor/nginx-1.13.2/auto/endianness (from vendor/nginx-1.13.1/auto/endianness) vendor/nginx-1.13.2/auto/feature (from vendor/nginx-1.13.1/auto/feature) vendor/nginx-1.13.2/auto/have (from vendor/nginx-1.13.1/auto/have) vendor/nginx-1.13.2/auto/have_headers (from vendor/nginx-1.13.1/auto/have_headers) vendor/nginx-1.13.2/auto/headers (from vendor/nginx-1.13.1/auto/headers) vendor/nginx-1.13.2/auto/include (from vendor/nginx-1.13.1/auto/include) vendor/nginx-1.13.2/auto/init (from vendor/nginx-1.13.1/auto/init) vendor/nginx-1.13.2/auto/install (from vendor/nginx-1.13.1/auto/install) vendor/nginx-1.13.2/auto/lib/conf (from vendor/nginx-1.13.1/auto/lib/conf) vendor/nginx-1.13.2/auto/lib/geoip/conf (from vendor/nginx-1.13.1/auto/lib/geoip/conf) vendor/nginx-1.13.2/auto/lib/google-perftools/conf (from vendor/nginx-1.13.1/auto/lib/google-perftools/conf) vendor/nginx-1.13.2/auto/lib/libatomic/conf (from vendor/nginx-1.13.1/auto/lib/libatomic/conf) vendor/nginx-1.13.2/auto/lib/libatomic/make (from vendor/nginx-1.13.1/auto/lib/libatomic/make) vendor/nginx-1.13.2/auto/lib/libgd/conf (from vendor/nginx-1.13.1/auto/lib/libgd/conf) vendor/nginx-1.13.2/auto/lib/libxslt/conf (from vendor/nginx-1.13.1/auto/lib/libxslt/conf) vendor/nginx-1.13.2/auto/lib/make (from vendor/nginx-1.13.1/auto/lib/make) vendor/nginx-1.13.2/auto/lib/openssl/conf (from vendor/nginx-1.13.1/auto/lib/openssl/conf) vendor/nginx-1.13.2/auto/lib/openssl/make (from vendor/nginx-1.13.1/auto/lib/openssl/make) vendor/nginx-1.13.2/auto/lib/openssl/makefile.bcc (from vendor/nginx-1.13.1/auto/lib/openssl/makefile.bcc) vendor/nginx-1.13.2/auto/lib/openssl/makefile.msvc (from vendor/nginx-1.13.1/auto/lib/openssl/makefile.msvc) vendor/nginx-1.13.2/auto/lib/pcre/conf (from vendor/nginx-1.13.1/auto/lib/pcre/conf) vendor/nginx-1.13.2/auto/lib/pcre/make (from vendor/nginx-1.13.1/auto/lib/pcre/make) vendor/nginx-1.13.2/auto/lib/pcre/makefile.bcc (from vendor/nginx-1.13.1/auto/lib/pcre/makefile.bcc) vendor/nginx-1.13.2/auto/lib/pcre/makefile.msvc (from vendor/nginx-1.13.1/auto/lib/pcre/makefile.msvc) vendor/nginx-1.13.2/auto/lib/pcre/makefile.owc (from vendor/nginx-1.13.1/auto/lib/pcre/makefile.owc) vendor/nginx-1.13.2/auto/lib/perl/conf (from vendor/nginx-1.13.1/auto/lib/perl/conf) vendor/nginx-1.13.2/auto/lib/perl/make (from vendor/nginx-1.13.1/auto/lib/perl/make) vendor/nginx-1.13.2/auto/lib/zlib/conf (from vendor/nginx-1.13.1/auto/lib/zlib/conf) vendor/nginx-1.13.2/auto/lib/zlib/make (from vendor/nginx-1.13.1/auto/lib/zlib/make) vendor/nginx-1.13.2/auto/lib/zlib/makefile.bcc (from vendor/nginx-1.13.1/auto/lib/zlib/makefile.bcc) vendor/nginx-1.13.2/auto/lib/zlib/makefile.msvc (from vendor/nginx-1.13.1/auto/lib/zlib/makefile.msvc) vendor/nginx-1.13.2/auto/lib/zlib/makefile.owc (from vendor/nginx-1.13.1/auto/lib/zlib/makefile.owc) vendor/nginx-1.13.2/auto/make (from vendor/nginx-1.13.1/auto/make) vendor/nginx-1.13.2/auto/module (from vendor/nginx-1.13.1/auto/module) vendor/nginx-1.13.2/auto/modules (from vendor/nginx-1.13.1/auto/modules) vendor/nginx-1.13.2/auto/nohave (from vendor/nginx-1.13.1/auto/nohave) vendor/nginx-1.13.2/auto/options (from vendor/nginx-1.13.1/auto/options) vendor/nginx-1.13.2/auto/os/conf (from vendor/nginx-1.13.1/auto/os/conf) vendor/nginx-1.13.2/auto/os/darwin (from vendor/nginx-1.13.1/auto/os/darwin) vendor/nginx-1.13.2/auto/os/freebsd (from vendor/nginx-1.13.1/auto/os/freebsd) vendor/nginx-1.13.2/auto/os/linux (from vendor/nginx-1.13.1/auto/os/linux) vendor/nginx-1.13.2/auto/os/solaris (from vendor/nginx-1.13.1/auto/os/solaris) vendor/nginx-1.13.2/auto/os/win32 (from vendor/nginx-1.13.1/auto/os/win32) vendor/nginx-1.13.2/auto/sources (from vendor/nginx-1.13.1/auto/sources) vendor/nginx-1.13.2/auto/stubs (from vendor/nginx-1.13.1/auto/stubs) vendor/nginx-1.13.2/auto/summary (from vendor/nginx-1.13.1/auto/summary) vendor/nginx-1.13.2/auto/threads (from vendor/nginx-1.13.1/auto/threads) vendor/nginx-1.13.2/auto/types/sizeof (from vendor/nginx-1.13.1/auto/types/sizeof) vendor/nginx-1.13.2/auto/types/typedef (from vendor/nginx-1.13.1/auto/types/typedef) vendor/nginx-1.13.2/auto/types/uintptr_t (from vendor/nginx-1.13.1/auto/types/uintptr_t) vendor/nginx-1.13.2/auto/types/value (from vendor/nginx-1.13.1/auto/types/value) vendor/nginx-1.13.2/auto/unix (from vendor/nginx-1.13.1/auto/unix) vendor/nginx-1.13.2/conf/fastcgi.conf (from vendor/nginx-1.13.1/conf/fastcgi.conf) vendor/nginx-1.13.2/conf/fastcgi_params (from vendor/nginx-1.13.1/conf/fastcgi_params) vendor/nginx-1.13.2/conf/koi-utf (from vendor/nginx-1.13.1/conf/koi-utf) vendor/nginx-1.13.2/conf/koi-win (from vendor/nginx-1.13.1/conf/koi-win) vendor/nginx-1.13.2/conf/mime.types (from vendor/nginx-1.13.1/conf/mime.types) vendor/nginx-1.13.2/conf/nginx.conf (from vendor/nginx-1.13.1/conf/nginx.conf) vendor/nginx-1.13.2/conf/scgi_params (from vendor/nginx-1.13.1/conf/scgi_params) vendor/nginx-1.13.2/conf/uwsgi_params (from vendor/nginx-1.13.1/conf/uwsgi_params) vendor/nginx-1.13.2/conf/win-utf (from vendor/nginx-1.13.1/conf/win-utf) vendor/nginx-1.13.2/contrib/README (from vendor/nginx-1.13.1/contrib/README) vendor/nginx-1.13.2/contrib/geo2nginx.pl (from vendor/nginx-1.13.1/contrib/geo2nginx.pl) vendor/nginx-1.13.2/contrib/unicode2nginx/koi-utf (from vendor/nginx-1.13.1/contrib/unicode2nginx/koi-utf) vendor/nginx-1.13.2/contrib/unicode2nginx/unicode-to-nginx.pl (from vendor/nginx-1.13.1/contrib/unicode2nginx/unicode-to-nginx.pl) vendor/nginx-1.13.2/contrib/unicode2nginx/win-utf (from vendor/nginx-1.13.1/contrib/unicode2nginx/win-utf) vendor/nginx-1.13.2/contrib/vim/ftdetect/nginx.vim (from vendor/nginx-1.13.1/contrib/vim/ftdetect/nginx.vim) vendor/nginx-1.13.2/contrib/vim/ftplugin/nginx.vim (from vendor/nginx-1.13.1/contrib/vim/ftplugin/nginx.vim) vendor/nginx-1.13.2/contrib/vim/indent/nginx.vim (from vendor/nginx-1.13.1/contrib/vim/indent/nginx.vim) vendor/nginx-1.13.2/contrib/vim/syntax/nginx.vim (from vendor/nginx-1.13.1/contrib/vim/syntax/nginx.vim) vendor/nginx-1.13.2/docs/GNUmakefile (from vendor/nginx-1.13.1/docs/GNUmakefile) vendor/nginx-1.13.2/docs/dtd/change_log_conf.dtd (from vendor/nginx-1.13.1/docs/dtd/change_log_conf.dtd) vendor/nginx-1.13.2/docs/dtd/changes.dtd (from vendor/nginx-1.13.1/docs/dtd/changes.dtd) vendor/nginx-1.13.2/docs/html/50x.html (from vendor/nginx-1.13.1/docs/html/50x.html) vendor/nginx-1.13.2/docs/html/index.html (from vendor/nginx-1.13.1/docs/html/index.html) vendor/nginx-1.13.2/docs/man/nginx.8 (from vendor/nginx-1.13.1/docs/man/nginx.8) vendor/nginx-1.13.2/docs/text/LICENSE (from vendor/nginx-1.13.1/docs/text/LICENSE) vendor/nginx-1.13.2/docs/text/README (from vendor/nginx-1.13.1/docs/text/README) vendor/nginx-1.13.2/docs/xml/change_log_conf.xml (from vendor/nginx-1.13.1/docs/xml/change_log_conf.xml) vendor/nginx-1.13.2/docs/xml/nginx/changes.xml (from vendor/nginx-1.13.1/docs/xml/nginx/changes.xml) vendor/nginx-1.13.2/docs/xsls/changes.xsls (from vendor/nginx-1.13.1/docs/xsls/changes.xsls) vendor/nginx-1.13.2/docs/xslt/changes.xslt (from vendor/nginx-1.13.1/docs/xslt/changes.xslt) vendor/nginx-1.13.2/misc/GNUmakefile (from vendor/nginx-1.13.1/misc/GNUmakefile) vendor/nginx-1.13.2/misc/README (from vendor/nginx-1.13.1/misc/README) vendor/nginx-1.13.2/src/core/nginx.c (from vendor/nginx-1.13.1/src/core/nginx.c) vendor/nginx-1.13.2/src/core/nginx.h (from vendor/nginx-1.13.1/src/core/nginx.h) vendor/nginx-1.13.2/src/core/ngx_array.c (from vendor/nginx-1.13.1/src/core/ngx_array.c) vendor/nginx-1.13.2/src/core/ngx_array.h (from vendor/nginx-1.13.1/src/core/ngx_array.h) vendor/nginx-1.13.2/src/core/ngx_buf.c (from vendor/nginx-1.13.1/src/core/ngx_buf.c) vendor/nginx-1.13.2/src/core/ngx_buf.h (from vendor/nginx-1.13.1/src/core/ngx_buf.h) vendor/nginx-1.13.2/src/core/ngx_conf_file.c (from vendor/nginx-1.13.1/src/core/ngx_conf_file.c) vendor/nginx-1.13.2/src/core/ngx_conf_file.h (from vendor/nginx-1.13.1/src/core/ngx_conf_file.h) vendor/nginx-1.13.2/src/core/ngx_config.h (from vendor/nginx-1.13.1/src/core/ngx_config.h) vendor/nginx-1.13.2/src/core/ngx_connection.c (from vendor/nginx-1.13.1/src/core/ngx_connection.c) vendor/nginx-1.13.2/src/core/ngx_connection.h (from vendor/nginx-1.13.1/src/core/ngx_connection.h) vendor/nginx-1.13.2/src/core/ngx_core.h (from vendor/nginx-1.13.1/src/core/ngx_core.h) vendor/nginx-1.13.2/src/core/ngx_cpuinfo.c (from vendor/nginx-1.13.1/src/core/ngx_cpuinfo.c) vendor/nginx-1.13.2/src/core/ngx_crc.h (from vendor/nginx-1.13.1/src/core/ngx_crc.h) vendor/nginx-1.13.2/src/core/ngx_crc32.c (from vendor/nginx-1.13.1/src/core/ngx_crc32.c) vendor/nginx-1.13.2/src/core/ngx_crc32.h (from vendor/nginx-1.13.1/src/core/ngx_crc32.h) vendor/nginx-1.13.2/src/core/ngx_crypt.c (from vendor/nginx-1.13.1/src/core/ngx_crypt.c) vendor/nginx-1.13.2/src/core/ngx_crypt.h (from vendor/nginx-1.13.1/src/core/ngx_crypt.h) vendor/nginx-1.13.2/src/core/ngx_cycle.c (from vendor/nginx-1.13.1/src/core/ngx_cycle.c) vendor/nginx-1.13.2/src/core/ngx_cycle.h (from vendor/nginx-1.13.1/src/core/ngx_cycle.h) vendor/nginx-1.13.2/src/core/ngx_file.c (from vendor/nginx-1.13.1/src/core/ngx_file.c) vendor/nginx-1.13.2/src/core/ngx_file.h (from vendor/nginx-1.13.1/src/core/ngx_file.h) vendor/nginx-1.13.2/src/core/ngx_hash.c (from vendor/nginx-1.13.1/src/core/ngx_hash.c) vendor/nginx-1.13.2/src/core/ngx_hash.h (from vendor/nginx-1.13.1/src/core/ngx_hash.h) vendor/nginx-1.13.2/src/core/ngx_inet.c (from vendor/nginx-1.13.1/src/core/ngx_inet.c) vendor/nginx-1.13.2/src/core/ngx_inet.h (from vendor/nginx-1.13.1/src/core/ngx_inet.h) vendor/nginx-1.13.2/src/core/ngx_list.c (from vendor/nginx-1.13.1/src/core/ngx_list.c) vendor/nginx-1.13.2/src/core/ngx_list.h (from vendor/nginx-1.13.1/src/core/ngx_list.h) vendor/nginx-1.13.2/src/core/ngx_log.c (from vendor/nginx-1.13.1/src/core/ngx_log.c) vendor/nginx-1.13.2/src/core/ngx_log.h (from vendor/nginx-1.13.1/src/core/ngx_log.h) vendor/nginx-1.13.2/src/core/ngx_md5.c (from vendor/nginx-1.13.1/src/core/ngx_md5.c) vendor/nginx-1.13.2/src/core/ngx_md5.h (from vendor/nginx-1.13.1/src/core/ngx_md5.h) vendor/nginx-1.13.2/src/core/ngx_module.c (from vendor/nginx-1.13.1/src/core/ngx_module.c) vendor/nginx-1.13.2/src/core/ngx_module.h (from vendor/nginx-1.13.1/src/core/ngx_module.h) vendor/nginx-1.13.2/src/core/ngx_murmurhash.c (from vendor/nginx-1.13.1/src/core/ngx_murmurhash.c) vendor/nginx-1.13.2/src/core/ngx_murmurhash.h (from vendor/nginx-1.13.1/src/core/ngx_murmurhash.h) vendor/nginx-1.13.2/src/core/ngx_open_file_cache.c (from vendor/nginx-1.13.1/src/core/ngx_open_file_cache.c) vendor/nginx-1.13.2/src/core/ngx_open_file_cache.h (from vendor/nginx-1.13.1/src/core/ngx_open_file_cache.h) vendor/nginx-1.13.2/src/core/ngx_output_chain.c (from vendor/nginx-1.13.1/src/core/ngx_output_chain.c) vendor/nginx-1.13.2/src/core/ngx_palloc.c (from vendor/nginx-1.13.1/src/core/ngx_palloc.c) vendor/nginx-1.13.2/src/core/ngx_palloc.h (from vendor/nginx-1.13.1/src/core/ngx_palloc.h) vendor/nginx-1.13.2/src/core/ngx_parse.c (from vendor/nginx-1.13.1/src/core/ngx_parse.c) vendor/nginx-1.13.2/src/core/ngx_parse.h (from vendor/nginx-1.13.1/src/core/ngx_parse.h) vendor/nginx-1.13.2/src/core/ngx_parse_time.c (from vendor/nginx-1.13.1/src/core/ngx_parse_time.c) vendor/nginx-1.13.2/src/core/ngx_parse_time.h (from vendor/nginx-1.13.1/src/core/ngx_parse_time.h) vendor/nginx-1.13.2/src/core/ngx_proxy_protocol.c (from vendor/nginx-1.13.1/src/core/ngx_proxy_protocol.c) vendor/nginx-1.13.2/src/core/ngx_proxy_protocol.h (from vendor/nginx-1.13.1/src/core/ngx_proxy_protocol.h) vendor/nginx-1.13.2/src/core/ngx_queue.c (from vendor/nginx-1.13.1/src/core/ngx_queue.c) vendor/nginx-1.13.2/src/core/ngx_queue.h (from vendor/nginx-1.13.1/src/core/ngx_queue.h) vendor/nginx-1.13.2/src/core/ngx_radix_tree.c (from vendor/nginx-1.13.1/src/core/ngx_radix_tree.c) vendor/nginx-1.13.2/src/core/ngx_radix_tree.h (from vendor/nginx-1.13.1/src/core/ngx_radix_tree.h) vendor/nginx-1.13.2/src/core/ngx_rbtree.c (from vendor/nginx-1.13.1/src/core/ngx_rbtree.c) vendor/nginx-1.13.2/src/core/ngx_rbtree.h (from vendor/nginx-1.13.1/src/core/ngx_rbtree.h) vendor/nginx-1.13.2/src/core/ngx_regex.c (from vendor/nginx-1.13.1/src/core/ngx_regex.c) vendor/nginx-1.13.2/src/core/ngx_regex.h (from vendor/nginx-1.13.1/src/core/ngx_regex.h) vendor/nginx-1.13.2/src/core/ngx_resolver.c (from vendor/nginx-1.13.1/src/core/ngx_resolver.c) vendor/nginx-1.13.2/src/core/ngx_resolver.h (from vendor/nginx-1.13.1/src/core/ngx_resolver.h) vendor/nginx-1.13.2/src/core/ngx_rwlock.c (from vendor/nginx-1.13.1/src/core/ngx_rwlock.c) vendor/nginx-1.13.2/src/core/ngx_rwlock.h (from vendor/nginx-1.13.1/src/core/ngx_rwlock.h) vendor/nginx-1.13.2/src/core/ngx_sha1.c (from vendor/nginx-1.13.1/src/core/ngx_sha1.c) vendor/nginx-1.13.2/src/core/ngx_sha1.h (from vendor/nginx-1.13.1/src/core/ngx_sha1.h) vendor/nginx-1.13.2/src/core/ngx_shmtx.c (from vendor/nginx-1.13.1/src/core/ngx_shmtx.c) vendor/nginx-1.13.2/src/core/ngx_shmtx.h (from vendor/nginx-1.13.1/src/core/ngx_shmtx.h) vendor/nginx-1.13.2/src/core/ngx_slab.c (from vendor/nginx-1.13.1/src/core/ngx_slab.c) vendor/nginx-1.13.2/src/core/ngx_slab.h (from vendor/nginx-1.13.1/src/core/ngx_slab.h) vendor/nginx-1.13.2/src/core/ngx_spinlock.c (from vendor/nginx-1.13.1/src/core/ngx_spinlock.c) vendor/nginx-1.13.2/src/core/ngx_string.c (from vendor/nginx-1.13.1/src/core/ngx_string.c) vendor/nginx-1.13.2/src/core/ngx_string.h (from vendor/nginx-1.13.1/src/core/ngx_string.h) vendor/nginx-1.13.2/src/core/ngx_syslog.c (from vendor/nginx-1.13.1/src/core/ngx_syslog.c) vendor/nginx-1.13.2/src/core/ngx_syslog.h (from vendor/nginx-1.13.1/src/core/ngx_syslog.h) vendor/nginx-1.13.2/src/core/ngx_thread_pool.c (from vendor/nginx-1.13.1/src/core/ngx_thread_pool.c) vendor/nginx-1.13.2/src/core/ngx_thread_pool.h (from vendor/nginx-1.13.1/src/core/ngx_thread_pool.h) vendor/nginx-1.13.2/src/core/ngx_times.c (from vendor/nginx-1.13.1/src/core/ngx_times.c) vendor/nginx-1.13.2/src/core/ngx_times.h (from vendor/nginx-1.13.1/src/core/ngx_times.h) vendor/nginx-1.13.2/src/event/modules/ngx_devpoll_module.c (from vendor/nginx-1.13.1/src/event/modules/ngx_devpoll_module.c) vendor/nginx-1.13.2/src/event/modules/ngx_epoll_module.c (from vendor/nginx-1.13.1/src/event/modules/ngx_epoll_module.c) vendor/nginx-1.13.2/src/event/modules/ngx_eventport_module.c (from vendor/nginx-1.13.1/src/event/modules/ngx_eventport_module.c) vendor/nginx-1.13.2/src/event/modules/ngx_iocp_module.c (from vendor/nginx-1.13.1/src/event/modules/ngx_iocp_module.c) vendor/nginx-1.13.2/src/event/modules/ngx_iocp_module.h (from vendor/nginx-1.13.1/src/event/modules/ngx_iocp_module.h) vendor/nginx-1.13.2/src/event/modules/ngx_kqueue_module.c (from vendor/nginx-1.13.1/src/event/modules/ngx_kqueue_module.c) vendor/nginx-1.13.2/src/event/modules/ngx_poll_module.c (from vendor/nginx-1.13.1/src/event/modules/ngx_poll_module.c) vendor/nginx-1.13.2/src/event/modules/ngx_select_module.c (from vendor/nginx-1.13.1/src/event/modules/ngx_select_module.c) vendor/nginx-1.13.2/src/event/modules/ngx_win32_select_module.c (from vendor/nginx-1.13.1/src/event/modules/ngx_win32_select_module.c) vendor/nginx-1.13.2/src/event/ngx_event.c (from vendor/nginx-1.13.1/src/event/ngx_event.c) vendor/nginx-1.13.2/src/event/ngx_event.h (from vendor/nginx-1.13.1/src/event/ngx_event.h) vendor/nginx-1.13.2/src/event/ngx_event_accept.c (from vendor/nginx-1.13.1/src/event/ngx_event_accept.c) vendor/nginx-1.13.2/src/event/ngx_event_acceptex.c (from vendor/nginx-1.13.1/src/event/ngx_event_acceptex.c) vendor/nginx-1.13.2/src/event/ngx_event_connect.c (from vendor/nginx-1.13.1/src/event/ngx_event_connect.c) vendor/nginx-1.13.2/src/event/ngx_event_connect.h (from vendor/nginx-1.13.1/src/event/ngx_event_connect.h) vendor/nginx-1.13.2/src/event/ngx_event_connectex.c (from vendor/nginx-1.13.1/src/event/ngx_event_connectex.c) vendor/nginx-1.13.2/src/event/ngx_event_openssl.c (from vendor/nginx-1.13.1/src/event/ngx_event_openssl.c) vendor/nginx-1.13.2/src/event/ngx_event_openssl.h (from vendor/nginx-1.13.1/src/event/ngx_event_openssl.h) vendor/nginx-1.13.2/src/event/ngx_event_openssl_stapling.c (from vendor/nginx-1.13.1/src/event/ngx_event_openssl_stapling.c) vendor/nginx-1.13.2/src/event/ngx_event_pipe.c (from vendor/nginx-1.13.1/src/event/ngx_event_pipe.c) vendor/nginx-1.13.2/src/event/ngx_event_pipe.h (from vendor/nginx-1.13.1/src/event/ngx_event_pipe.h) vendor/nginx-1.13.2/src/event/ngx_event_posted.c (from vendor/nginx-1.13.1/src/event/ngx_event_posted.c) vendor/nginx-1.13.2/src/event/ngx_event_posted.h (from vendor/nginx-1.13.1/src/event/ngx_event_posted.h) vendor/nginx-1.13.2/src/event/ngx_event_timer.c (from vendor/nginx-1.13.1/src/event/ngx_event_timer.c) vendor/nginx-1.13.2/src/event/ngx_event_timer.h (from vendor/nginx-1.13.1/src/event/ngx_event_timer.h) vendor/nginx-1.13.2/src/http/modules/ngx_http_access_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_access_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_addition_filter_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_addition_filter_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_auth_basic_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_auth_basic_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_auth_request_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_auth_request_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_autoindex_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_autoindex_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_browser_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_browser_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_charset_filter_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_charset_filter_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_chunked_filter_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_chunked_filter_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_dav_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_dav_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_degradation_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_degradation_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_empty_gif_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_empty_gif_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_fastcgi_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_fastcgi_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_flv_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_flv_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_geo_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_geo_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_geoip_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_geoip_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_gunzip_filter_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_gunzip_filter_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_gzip_filter_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_gzip_filter_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_gzip_static_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_gzip_static_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_headers_filter_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_headers_filter_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_image_filter_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_image_filter_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_index_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_index_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_limit_conn_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_limit_conn_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_limit_req_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_limit_req_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_log_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_log_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_map_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_map_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_memcached_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_memcached_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_mp4_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_mp4_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_not_modified_filter_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_not_modified_filter_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_proxy_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_proxy_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_random_index_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_random_index_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_range_filter_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_range_filter_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_realip_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_realip_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_referer_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_referer_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_rewrite_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_rewrite_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_scgi_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_scgi_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_secure_link_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_secure_link_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_slice_filter_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_slice_filter_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_split_clients_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_split_clients_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_ssi_filter_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_ssi_filter_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_ssi_filter_module.h (from vendor/nginx-1.13.1/src/http/modules/ngx_http_ssi_filter_module.h) vendor/nginx-1.13.2/src/http/modules/ngx_http_ssl_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_ssl_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_ssl_module.h (from vendor/nginx-1.13.1/src/http/modules/ngx_http_ssl_module.h) vendor/nginx-1.13.2/src/http/modules/ngx_http_static_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_static_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_stub_status_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_stub_status_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_sub_filter_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_sub_filter_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_upstream_hash_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_upstream_hash_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_upstream_ip_hash_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_upstream_ip_hash_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_upstream_keepalive_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_upstream_keepalive_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_upstream_least_conn_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_upstream_least_conn_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_upstream_zone_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_upstream_zone_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_userid_filter_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_userid_filter_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_uwsgi_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_uwsgi_module.c) vendor/nginx-1.13.2/src/http/modules/ngx_http_xslt_filter_module.c (from vendor/nginx-1.13.1/src/http/modules/ngx_http_xslt_filter_module.c) vendor/nginx-1.13.2/src/http/modules/perl/Makefile.PL (from vendor/nginx-1.13.1/src/http/modules/perl/Makefile.PL) vendor/nginx-1.13.2/src/http/modules/perl/nginx.pm (from vendor/nginx-1.13.1/src/http/modules/perl/nginx.pm) vendor/nginx-1.13.2/src/http/modules/perl/nginx.xs (from vendor/nginx-1.13.1/src/http/modules/perl/nginx.xs) vendor/nginx-1.13.2/src/http/modules/perl/ngx_http_perl_module.c (from vendor/nginx-1.13.1/src/http/modules/perl/ngx_http_perl_module.c) vendor/nginx-1.13.2/src/http/modules/perl/ngx_http_perl_module.h (from vendor/nginx-1.13.1/src/http/modules/perl/ngx_http_perl_module.h) vendor/nginx-1.13.2/src/http/modules/perl/typemap (from vendor/nginx-1.13.1/src/http/modules/perl/typemap) vendor/nginx-1.13.2/src/http/ngx_http.c (from vendor/nginx-1.13.1/src/http/ngx_http.c) vendor/nginx-1.13.2/src/http/ngx_http.h (from vendor/nginx-1.13.1/src/http/ngx_http.h) vendor/nginx-1.13.2/src/http/ngx_http_cache.h (from vendor/nginx-1.13.1/src/http/ngx_http_cache.h) vendor/nginx-1.13.2/src/http/ngx_http_config.h (from vendor/nginx-1.13.1/src/http/ngx_http_config.h) vendor/nginx-1.13.2/src/http/ngx_http_copy_filter_module.c (from vendor/nginx-1.13.1/src/http/ngx_http_copy_filter_module.c) vendor/nginx-1.13.2/src/http/ngx_http_core_module.c (from vendor/nginx-1.13.1/src/http/ngx_http_core_module.c) vendor/nginx-1.13.2/src/http/ngx_http_core_module.h (from vendor/nginx-1.13.1/src/http/ngx_http_core_module.h) vendor/nginx-1.13.2/src/http/ngx_http_file_cache.c (from vendor/nginx-1.13.1/src/http/ngx_http_file_cache.c) vendor/nginx-1.13.2/src/http/ngx_http_header_filter_module.c (from vendor/nginx-1.13.1/src/http/ngx_http_header_filter_module.c) vendor/nginx-1.13.2/src/http/ngx_http_parse.c (from vendor/nginx-1.13.1/src/http/ngx_http_parse.c) vendor/nginx-1.13.2/src/http/ngx_http_postpone_filter_module.c (from vendor/nginx-1.13.1/src/http/ngx_http_postpone_filter_module.c) vendor/nginx-1.13.2/src/http/ngx_http_request.c (from vendor/nginx-1.13.1/src/http/ngx_http_request.c) vendor/nginx-1.13.2/src/http/ngx_http_request.h (from vendor/nginx-1.13.1/src/http/ngx_http_request.h) vendor/nginx-1.13.2/src/http/ngx_http_request_body.c (from vendor/nginx-1.13.1/src/http/ngx_http_request_body.c) vendor/nginx-1.13.2/src/http/ngx_http_script.c (from vendor/nginx-1.13.1/src/http/ngx_http_script.c) vendor/nginx-1.13.2/src/http/ngx_http_script.h (from vendor/nginx-1.13.1/src/http/ngx_http_script.h) vendor/nginx-1.13.2/src/http/ngx_http_special_response.c (from vendor/nginx-1.13.1/src/http/ngx_http_special_response.c) vendor/nginx-1.13.2/src/http/ngx_http_upstream.c (from vendor/nginx-1.13.1/src/http/ngx_http_upstream.c) vendor/nginx-1.13.2/src/http/ngx_http_upstream.h (from vendor/nginx-1.13.1/src/http/ngx_http_upstream.h) vendor/nginx-1.13.2/src/http/ngx_http_upstream_round_robin.c (from vendor/nginx-1.13.1/src/http/ngx_http_upstream_round_robin.c) vendor/nginx-1.13.2/src/http/ngx_http_upstream_round_robin.h (from vendor/nginx-1.13.1/src/http/ngx_http_upstream_round_robin.h) vendor/nginx-1.13.2/src/http/ngx_http_variables.c (from vendor/nginx-1.13.1/src/http/ngx_http_variables.c) vendor/nginx-1.13.2/src/http/ngx_http_variables.h (from vendor/nginx-1.13.1/src/http/ngx_http_variables.h) vendor/nginx-1.13.2/src/http/ngx_http_write_filter_module.c (from vendor/nginx-1.13.1/src/http/ngx_http_write_filter_module.c) vendor/nginx-1.13.2/src/http/v2/ngx_http_v2.c (from vendor/nginx-1.13.1/src/http/v2/ngx_http_v2.c) vendor/nginx-1.13.2/src/http/v2/ngx_http_v2.h (from vendor/nginx-1.13.1/src/http/v2/ngx_http_v2.h) vendor/nginx-1.13.2/src/http/v2/ngx_http_v2_filter_module.c (from vendor/nginx-1.13.1/src/http/v2/ngx_http_v2_filter_module.c) vendor/nginx-1.13.2/src/http/v2/ngx_http_v2_huff_decode.c (from vendor/nginx-1.13.1/src/http/v2/ngx_http_v2_huff_decode.c) vendor/nginx-1.13.2/src/http/v2/ngx_http_v2_huff_encode.c (from vendor/nginx-1.13.1/src/http/v2/ngx_http_v2_huff_encode.c) vendor/nginx-1.13.2/src/http/v2/ngx_http_v2_module.c (from vendor/nginx-1.13.1/src/http/v2/ngx_http_v2_module.c) vendor/nginx-1.13.2/src/http/v2/ngx_http_v2_module.h (from vendor/nginx-1.13.1/src/http/v2/ngx_http_v2_module.h) vendor/nginx-1.13.2/src/http/v2/ngx_http_v2_table.c (from vendor/nginx-1.13.1/src/http/v2/ngx_http_v2_table.c) vendor/nginx-1.13.2/src/mail/ngx_mail.c (from vendor/nginx-1.13.1/src/mail/ngx_mail.c) vendor/nginx-1.13.2/src/mail/ngx_mail.h (from vendor/nginx-1.13.1/src/mail/ngx_mail.h) vendor/nginx-1.13.2/src/mail/ngx_mail_auth_http_module.c (from vendor/nginx-1.13.1/src/mail/ngx_mail_auth_http_module.c) vendor/nginx-1.13.2/src/mail/ngx_mail_core_module.c (from vendor/nginx-1.13.1/src/mail/ngx_mail_core_module.c) vendor/nginx-1.13.2/src/mail/ngx_mail_handler.c (from vendor/nginx-1.13.1/src/mail/ngx_mail_handler.c) vendor/nginx-1.13.2/src/mail/ngx_mail_imap_handler.c (from vendor/nginx-1.13.1/src/mail/ngx_mail_imap_handler.c) vendor/nginx-1.13.2/src/mail/ngx_mail_imap_module.c (from vendor/nginx-1.13.1/src/mail/ngx_mail_imap_module.c) vendor/nginx-1.13.2/src/mail/ngx_mail_imap_module.h (from vendor/nginx-1.13.1/src/mail/ngx_mail_imap_module.h) vendor/nginx-1.13.2/src/mail/ngx_mail_parse.c (from vendor/nginx-1.13.1/src/mail/ngx_mail_parse.c) vendor/nginx-1.13.2/src/mail/ngx_mail_pop3_handler.c (from vendor/nginx-1.13.1/src/mail/ngx_mail_pop3_handler.c) vendor/nginx-1.13.2/src/mail/ngx_mail_pop3_module.c (from vendor/nginx-1.13.1/src/mail/ngx_mail_pop3_module.c) vendor/nginx-1.13.2/src/mail/ngx_mail_pop3_module.h (from vendor/nginx-1.13.1/src/mail/ngx_mail_pop3_module.h) vendor/nginx-1.13.2/src/mail/ngx_mail_proxy_module.c (from vendor/nginx-1.13.1/src/mail/ngx_mail_proxy_module.c) vendor/nginx-1.13.2/src/mail/ngx_mail_smtp_handler.c (from vendor/nginx-1.13.1/src/mail/ngx_mail_smtp_handler.c) vendor/nginx-1.13.2/src/mail/ngx_mail_smtp_module.c (from vendor/nginx-1.13.1/src/mail/ngx_mail_smtp_module.c) vendor/nginx-1.13.2/src/mail/ngx_mail_smtp_module.h (from vendor/nginx-1.13.1/src/mail/ngx_mail_smtp_module.h) vendor/nginx-1.13.2/src/mail/ngx_mail_ssl_module.c (from vendor/nginx-1.13.1/src/mail/ngx_mail_ssl_module.c) vendor/nginx-1.13.2/src/mail/ngx_mail_ssl_module.h (from vendor/nginx-1.13.1/src/mail/ngx_mail_ssl_module.h) vendor/nginx-1.13.2/src/misc/ngx_cpp_test_module.cpp (from vendor/nginx-1.13.1/src/misc/ngx_cpp_test_module.cpp) vendor/nginx-1.13.2/src/misc/ngx_google_perftools_module.c (from vendor/nginx-1.13.1/src/misc/ngx_google_perftools_module.c) vendor/nginx-1.13.2/src/os/unix/ngx_alloc.c (from vendor/nginx-1.13.1/src/os/unix/ngx_alloc.c) vendor/nginx-1.13.2/src/os/unix/ngx_alloc.h (from vendor/nginx-1.13.1/src/os/unix/ngx_alloc.h) vendor/nginx-1.13.2/src/os/unix/ngx_atomic.h (from vendor/nginx-1.13.1/src/os/unix/ngx_atomic.h) vendor/nginx-1.13.2/src/os/unix/ngx_channel.c (from vendor/nginx-1.13.1/src/os/unix/ngx_channel.c) vendor/nginx-1.13.2/src/os/unix/ngx_channel.h (from vendor/nginx-1.13.1/src/os/unix/ngx_channel.h) vendor/nginx-1.13.2/src/os/unix/ngx_daemon.c (from vendor/nginx-1.13.1/src/os/unix/ngx_daemon.c) vendor/nginx-1.13.2/src/os/unix/ngx_darwin.h (from vendor/nginx-1.13.1/src/os/unix/ngx_darwin.h) vendor/nginx-1.13.2/src/os/unix/ngx_darwin_config.h (from vendor/nginx-1.13.1/src/os/unix/ngx_darwin_config.h) vendor/nginx-1.13.2/src/os/unix/ngx_darwin_init.c (from vendor/nginx-1.13.1/src/os/unix/ngx_darwin_init.c) vendor/nginx-1.13.2/src/os/unix/ngx_darwin_sendfile_chain.c (from vendor/nginx-1.13.1/src/os/unix/ngx_darwin_sendfile_chain.c) vendor/nginx-1.13.2/src/os/unix/ngx_dlopen.c (from vendor/nginx-1.13.1/src/os/unix/ngx_dlopen.c) vendor/nginx-1.13.2/src/os/unix/ngx_dlopen.h (from vendor/nginx-1.13.1/src/os/unix/ngx_dlopen.h) vendor/nginx-1.13.2/src/os/unix/ngx_errno.c (from vendor/nginx-1.13.1/src/os/unix/ngx_errno.c) vendor/nginx-1.13.2/src/os/unix/ngx_errno.h (from vendor/nginx-1.13.1/src/os/unix/ngx_errno.h) vendor/nginx-1.13.2/src/os/unix/ngx_file_aio_read.c (from vendor/nginx-1.13.1/src/os/unix/ngx_file_aio_read.c) vendor/nginx-1.13.2/src/os/unix/ngx_files.c (from vendor/nginx-1.13.1/src/os/unix/ngx_files.c) vendor/nginx-1.13.2/src/os/unix/ngx_files.h (from vendor/nginx-1.13.1/src/os/unix/ngx_files.h) vendor/nginx-1.13.2/src/os/unix/ngx_freebsd.h (from vendor/nginx-1.13.1/src/os/unix/ngx_freebsd.h) vendor/nginx-1.13.2/src/os/unix/ngx_freebsd_config.h (from vendor/nginx-1.13.1/src/os/unix/ngx_freebsd_config.h) vendor/nginx-1.13.2/src/os/unix/ngx_freebsd_init.c (from vendor/nginx-1.13.1/src/os/unix/ngx_freebsd_init.c) vendor/nginx-1.13.2/src/os/unix/ngx_freebsd_sendfile_chain.c (from vendor/nginx-1.13.1/src/os/unix/ngx_freebsd_sendfile_chain.c) vendor/nginx-1.13.2/src/os/unix/ngx_gcc_atomic_amd64.h (from vendor/nginx-1.13.1/src/os/unix/ngx_gcc_atomic_amd64.h) vendor/nginx-1.13.2/src/os/unix/ngx_gcc_atomic_ppc.h (from vendor/nginx-1.13.1/src/os/unix/ngx_gcc_atomic_ppc.h) vendor/nginx-1.13.2/src/os/unix/ngx_gcc_atomic_sparc64.h (from vendor/nginx-1.13.1/src/os/unix/ngx_gcc_atomic_sparc64.h) vendor/nginx-1.13.2/src/os/unix/ngx_gcc_atomic_x86.h (from vendor/nginx-1.13.1/src/os/unix/ngx_gcc_atomic_x86.h) vendor/nginx-1.13.2/src/os/unix/ngx_linux.h (from vendor/nginx-1.13.1/src/os/unix/ngx_linux.h) vendor/nginx-1.13.2/src/os/unix/ngx_linux_aio_read.c (from vendor/nginx-1.13.1/src/os/unix/ngx_linux_aio_read.c) vendor/nginx-1.13.2/src/os/unix/ngx_linux_config.h (from vendor/nginx-1.13.1/src/os/unix/ngx_linux_config.h) vendor/nginx-1.13.2/src/os/unix/ngx_linux_init.c (from vendor/nginx-1.13.1/src/os/unix/ngx_linux_init.c) vendor/nginx-1.13.2/src/os/unix/ngx_linux_sendfile_chain.c (from vendor/nginx-1.13.1/src/os/unix/ngx_linux_sendfile_chain.c) vendor/nginx-1.13.2/src/os/unix/ngx_os.h (from vendor/nginx-1.13.1/src/os/unix/ngx_os.h) vendor/nginx-1.13.2/src/os/unix/ngx_posix_config.h (from vendor/nginx-1.13.1/src/os/unix/ngx_posix_config.h) vendor/nginx-1.13.2/src/os/unix/ngx_posix_init.c (from vendor/nginx-1.13.1/src/os/unix/ngx_posix_init.c) vendor/nginx-1.13.2/src/os/unix/ngx_process.c (from vendor/nginx-1.13.1/src/os/unix/ngx_process.c) vendor/nginx-1.13.2/src/os/unix/ngx_process.h (from vendor/nginx-1.13.1/src/os/unix/ngx_process.h) vendor/nginx-1.13.2/src/os/unix/ngx_process_cycle.c (from vendor/nginx-1.13.1/src/os/unix/ngx_process_cycle.c) vendor/nginx-1.13.2/src/os/unix/ngx_process_cycle.h (from vendor/nginx-1.13.1/src/os/unix/ngx_process_cycle.h) vendor/nginx-1.13.2/src/os/unix/ngx_readv_chain.c (from vendor/nginx-1.13.1/src/os/unix/ngx_readv_chain.c) vendor/nginx-1.13.2/src/os/unix/ngx_recv.c (from vendor/nginx-1.13.1/src/os/unix/ngx_recv.c) vendor/nginx-1.13.2/src/os/unix/ngx_send.c (from vendor/nginx-1.13.1/src/os/unix/ngx_send.c) vendor/nginx-1.13.2/src/os/unix/ngx_setaffinity.c (from vendor/nginx-1.13.1/src/os/unix/ngx_setaffinity.c) vendor/nginx-1.13.2/src/os/unix/ngx_setaffinity.h (from vendor/nginx-1.13.1/src/os/unix/ngx_setaffinity.h) vendor/nginx-1.13.2/src/os/unix/ngx_setproctitle.c (from vendor/nginx-1.13.1/src/os/unix/ngx_setproctitle.c) vendor/nginx-1.13.2/src/os/unix/ngx_setproctitle.h (from vendor/nginx-1.13.1/src/os/unix/ngx_setproctitle.h) vendor/nginx-1.13.2/src/os/unix/ngx_shmem.c (from vendor/nginx-1.13.1/src/os/unix/ngx_shmem.c) vendor/nginx-1.13.2/src/os/unix/ngx_shmem.h (from vendor/nginx-1.13.1/src/os/unix/ngx_shmem.h) vendor/nginx-1.13.2/src/os/unix/ngx_socket.c (from vendor/nginx-1.13.1/src/os/unix/ngx_socket.c) vendor/nginx-1.13.2/src/os/unix/ngx_socket.h (from vendor/nginx-1.13.1/src/os/unix/ngx_socket.h) vendor/nginx-1.13.2/src/os/unix/ngx_solaris.h (from vendor/nginx-1.13.1/src/os/unix/ngx_solaris.h) vendor/nginx-1.13.2/src/os/unix/ngx_solaris_config.h (from vendor/nginx-1.13.1/src/os/unix/ngx_solaris_config.h) vendor/nginx-1.13.2/src/os/unix/ngx_solaris_init.c (from vendor/nginx-1.13.1/src/os/unix/ngx_solaris_init.c) vendor/nginx-1.13.2/src/os/unix/ngx_solaris_sendfilev_chain.c (from vendor/nginx-1.13.1/src/os/unix/ngx_solaris_sendfilev_chain.c) vendor/nginx-1.13.2/src/os/unix/ngx_sunpro_amd64.il (from vendor/nginx-1.13.1/src/os/unix/ngx_sunpro_amd64.il) vendor/nginx-1.13.2/src/os/unix/ngx_sunpro_atomic_sparc64.h (from vendor/nginx-1.13.1/src/os/unix/ngx_sunpro_atomic_sparc64.h) vendor/nginx-1.13.2/src/os/unix/ngx_sunpro_sparc64.il (from vendor/nginx-1.13.1/src/os/unix/ngx_sunpro_sparc64.il) vendor/nginx-1.13.2/src/os/unix/ngx_sunpro_x86.il (from vendor/nginx-1.13.1/src/os/unix/ngx_sunpro_x86.il) vendor/nginx-1.13.2/src/os/unix/ngx_thread.h (from vendor/nginx-1.13.1/src/os/unix/ngx_thread.h) vendor/nginx-1.13.2/src/os/unix/ngx_thread_cond.c (from vendor/nginx-1.13.1/src/os/unix/ngx_thread_cond.c) vendor/nginx-1.13.2/src/os/unix/ngx_thread_id.c (from vendor/nginx-1.13.1/src/os/unix/ngx_thread_id.c) vendor/nginx-1.13.2/src/os/unix/ngx_thread_mutex.c (from vendor/nginx-1.13.1/src/os/unix/ngx_thread_mutex.c) vendor/nginx-1.13.2/src/os/unix/ngx_time.c (from vendor/nginx-1.13.1/src/os/unix/ngx_time.c) vendor/nginx-1.13.2/src/os/unix/ngx_time.h (from vendor/nginx-1.13.1/src/os/unix/ngx_time.h) vendor/nginx-1.13.2/src/os/unix/ngx_udp_recv.c (from vendor/nginx-1.13.1/src/os/unix/ngx_udp_recv.c) vendor/nginx-1.13.2/src/os/unix/ngx_udp_send.c (from vendor/nginx-1.13.1/src/os/unix/ngx_udp_send.c) vendor/nginx-1.13.2/src/os/unix/ngx_udp_sendmsg_chain.c (from vendor/nginx-1.13.1/src/os/unix/ngx_udp_sendmsg_chain.c) vendor/nginx-1.13.2/src/os/unix/ngx_user.c (from vendor/nginx-1.13.1/src/os/unix/ngx_user.c) vendor/nginx-1.13.2/src/os/unix/ngx_user.h (from vendor/nginx-1.13.1/src/os/unix/ngx_user.h) vendor/nginx-1.13.2/src/os/unix/ngx_writev_chain.c (from vendor/nginx-1.13.1/src/os/unix/ngx_writev_chain.c) vendor/nginx-1.13.2/src/os/win32/nginx.ico (from vendor/nginx-1.13.1/src/os/win32/nginx.ico) vendor/nginx-1.13.2/src/os/win32/nginx.rc (from vendor/nginx-1.13.1/src/os/win32/nginx.rc) vendor/nginx-1.13.2/src/os/win32/nginx_icon16.xpm (from vendor/nginx-1.13.1/src/os/win32/nginx_icon16.xpm) vendor/nginx-1.13.2/src/os/win32/nginx_icon32.xpm (from vendor/nginx-1.13.1/src/os/win32/nginx_icon32.xpm) vendor/nginx-1.13.2/src/os/win32/nginx_icon48.xpm (from vendor/nginx-1.13.1/src/os/win32/nginx_icon48.xpm) vendor/nginx-1.13.2/src/os/win32/ngx_alloc.c (from vendor/nginx-1.13.1/src/os/win32/ngx_alloc.c) vendor/nginx-1.13.2/src/os/win32/ngx_alloc.h (from vendor/nginx-1.13.1/src/os/win32/ngx_alloc.h) vendor/nginx-1.13.2/src/os/win32/ngx_atomic.h (from vendor/nginx-1.13.1/src/os/win32/ngx_atomic.h) vendor/nginx-1.13.2/src/os/win32/ngx_dlopen.c (from vendor/nginx-1.13.1/src/os/win32/ngx_dlopen.c) vendor/nginx-1.13.2/src/os/win32/ngx_dlopen.h (from vendor/nginx-1.13.1/src/os/win32/ngx_dlopen.h) vendor/nginx-1.13.2/src/os/win32/ngx_errno.c (from vendor/nginx-1.13.1/src/os/win32/ngx_errno.c) vendor/nginx-1.13.2/src/os/win32/ngx_errno.h (from vendor/nginx-1.13.1/src/os/win32/ngx_errno.h) vendor/nginx-1.13.2/src/os/win32/ngx_event_log.c (from vendor/nginx-1.13.1/src/os/win32/ngx_event_log.c) vendor/nginx-1.13.2/src/os/win32/ngx_files.c (from vendor/nginx-1.13.1/src/os/win32/ngx_files.c) vendor/nginx-1.13.2/src/os/win32/ngx_files.h (from vendor/nginx-1.13.1/src/os/win32/ngx_files.h) vendor/nginx-1.13.2/src/os/win32/ngx_os.h (from vendor/nginx-1.13.1/src/os/win32/ngx_os.h) vendor/nginx-1.13.2/src/os/win32/ngx_process.c (from vendor/nginx-1.13.1/src/os/win32/ngx_process.c) vendor/nginx-1.13.2/src/os/win32/ngx_process.h (from vendor/nginx-1.13.1/src/os/win32/ngx_process.h) vendor/nginx-1.13.2/src/os/win32/ngx_process_cycle.c (from vendor/nginx-1.13.1/src/os/win32/ngx_process_cycle.c) vendor/nginx-1.13.2/src/os/win32/ngx_process_cycle.h (from vendor/nginx-1.13.1/src/os/win32/ngx_process_cycle.h) vendor/nginx-1.13.2/src/os/win32/ngx_service.c (from vendor/nginx-1.13.1/src/os/win32/ngx_service.c) vendor/nginx-1.13.2/src/os/win32/ngx_shmem.c (from vendor/nginx-1.13.1/src/os/win32/ngx_shmem.c) vendor/nginx-1.13.2/src/os/win32/ngx_shmem.h (from vendor/nginx-1.13.1/src/os/win32/ngx_shmem.h) vendor/nginx-1.13.2/src/os/win32/ngx_socket.c (from vendor/nginx-1.13.1/src/os/win32/ngx_socket.c) vendor/nginx-1.13.2/src/os/win32/ngx_socket.h (from vendor/nginx-1.13.1/src/os/win32/ngx_socket.h) vendor/nginx-1.13.2/src/os/win32/ngx_stat.c (from vendor/nginx-1.13.1/src/os/win32/ngx_stat.c) vendor/nginx-1.13.2/src/os/win32/ngx_thread.c (from vendor/nginx-1.13.1/src/os/win32/ngx_thread.c) vendor/nginx-1.13.2/src/os/win32/ngx_thread.h (from vendor/nginx-1.13.1/src/os/win32/ngx_thread.h) vendor/nginx-1.13.2/src/os/win32/ngx_time.c (from vendor/nginx-1.13.1/src/os/win32/ngx_time.c) vendor/nginx-1.13.2/src/os/win32/ngx_time.h (from vendor/nginx-1.13.1/src/os/win32/ngx_time.h) vendor/nginx-1.13.2/src/os/win32/ngx_udp_wsarecv.c (from vendor/nginx-1.13.1/src/os/win32/ngx_udp_wsarecv.c) vendor/nginx-1.13.2/src/os/win32/ngx_user.c (from vendor/nginx-1.13.1/src/os/win32/ngx_user.c) vendor/nginx-1.13.2/src/os/win32/ngx_user.h (from vendor/nginx-1.13.1/src/os/win32/ngx_user.h) vendor/nginx-1.13.2/src/os/win32/ngx_win32_config.h (from vendor/nginx-1.13.1/src/os/win32/ngx_win32_config.h) vendor/nginx-1.13.2/src/os/win32/ngx_win32_init.c (from vendor/nginx-1.13.1/src/os/win32/ngx_win32_init.c) vendor/nginx-1.13.2/src/os/win32/ngx_wsarecv.c (from vendor/nginx-1.13.1/src/os/win32/ngx_wsarecv.c) vendor/nginx-1.13.2/src/os/win32/ngx_wsarecv_chain.c (from vendor/nginx-1.13.1/src/os/win32/ngx_wsarecv_chain.c) vendor/nginx-1.13.2/src/os/win32/ngx_wsasend.c (from vendor/nginx-1.13.1/src/os/win32/ngx_wsasend.c) vendor/nginx-1.13.2/src/os/win32/ngx_wsasend_chain.c (from vendor/nginx-1.13.1/src/os/win32/ngx_wsasend_chain.c) vendor/nginx-1.13.2/src/stream/ngx_stream.c (from vendor/nginx-1.13.1/src/stream/ngx_stream.c) vendor/nginx-1.13.2/src/stream/ngx_stream.h (from vendor/nginx-1.13.1/src/stream/ngx_stream.h) vendor/nginx-1.13.2/src/stream/ngx_stream_access_module.c (from vendor/nginx-1.13.1/src/stream/ngx_stream_access_module.c) vendor/nginx-1.13.2/src/stream/ngx_stream_core_module.c (from vendor/nginx-1.13.1/src/stream/ngx_stream_core_module.c) vendor/nginx-1.13.2/src/stream/ngx_stream_geo_module.c (from vendor/nginx-1.13.1/src/stream/ngx_stream_geo_module.c) vendor/nginx-1.13.2/src/stream/ngx_stream_geoip_module.c (from vendor/nginx-1.13.1/src/stream/ngx_stream_geoip_module.c) vendor/nginx-1.13.2/src/stream/ngx_stream_handler.c (from vendor/nginx-1.13.1/src/stream/ngx_stream_handler.c) vendor/nginx-1.13.2/src/stream/ngx_stream_limit_conn_module.c (from vendor/nginx-1.13.1/src/stream/ngx_stream_limit_conn_module.c) vendor/nginx-1.13.2/src/stream/ngx_stream_log_module.c (from vendor/nginx-1.13.1/src/stream/ngx_stream_log_module.c) vendor/nginx-1.13.2/src/stream/ngx_stream_map_module.c (from vendor/nginx-1.13.1/src/stream/ngx_stream_map_module.c) vendor/nginx-1.13.2/src/stream/ngx_stream_proxy_module.c (from vendor/nginx-1.13.1/src/stream/ngx_stream_proxy_module.c) vendor/nginx-1.13.2/src/stream/ngx_stream_realip_module.c (from vendor/nginx-1.13.1/src/stream/ngx_stream_realip_module.c) vendor/nginx-1.13.2/src/stream/ngx_stream_return_module.c (from vendor/nginx-1.13.1/src/stream/ngx_stream_return_module.c) vendor/nginx-1.13.2/src/stream/ngx_stream_script.c (from vendor/nginx-1.13.1/src/stream/ngx_stream_script.c) vendor/nginx-1.13.2/src/stream/ngx_stream_script.h (from vendor/nginx-1.13.1/src/stream/ngx_stream_script.h) vendor/nginx-1.13.2/src/stream/ngx_stream_split_clients_module.c (from vendor/nginx-1.13.1/src/stream/ngx_stream_split_clients_module.c) vendor/nginx-1.13.2/src/stream/ngx_stream_ssl_module.c (from vendor/nginx-1.13.1/src/stream/ngx_stream_ssl_module.c) vendor/nginx-1.13.2/src/stream/ngx_stream_ssl_module.h (from vendor/nginx-1.13.1/src/stream/ngx_stream_ssl_module.h) vendor/nginx-1.13.2/src/stream/ngx_stream_ssl_preread_module.c (from vendor/nginx-1.13.1/src/stream/ngx_stream_ssl_preread_module.c) vendor/nginx-1.13.2/src/stream/ngx_stream_upstream.c (from vendor/nginx-1.13.1/src/stream/ngx_stream_upstream.c) vendor/nginx-1.13.2/src/stream/ngx_stream_upstream.h (from vendor/nginx-1.13.1/src/stream/ngx_stream_upstream.h) vendor/nginx-1.13.2/src/stream/ngx_stream_upstream_hash_module.c (from vendor/nginx-1.13.1/src/stream/ngx_stream_upstream_hash_module.c) vendor/nginx-1.13.2/src/stream/ngx_stream_upstream_least_conn_module.c (from vendor/nginx-1.13.1/src/stream/ngx_stream_upstream_least_conn_module.c) vendor/nginx-1.13.2/src/stream/ngx_stream_upstream_round_robin.c (from vendor/nginx-1.13.1/src/stream/ngx_stream_upstream_round_robin.c) vendor/nginx-1.13.2/src/stream/ngx_stream_upstream_round_robin.h (from vendor/nginx-1.13.1/src/stream/ngx_stream_upstream_round_robin.h) vendor/nginx-1.13.2/src/stream/ngx_stream_upstream_zone_module.c (from vendor/nginx-1.13.1/src/stream/ngx_stream_upstream_zone_module.c) vendor/nginx-1.13.2/src/stream/ngx_stream_variables.c (from vendor/nginx-1.13.1/src/stream/ngx_stream_variables.c) vendor/nginx-1.13.2/src/stream/ngx_stream_variables.h (from vendor/nginx-1.13.1/src/stream/ngx_stream_variables.h) vendor/nginx-1.13.2/src/stream/ngx_stream_write_filter_module.c (from vendor/nginx-1.13.1/src/stream/ngx_stream_write_filter_module.c) Modified: nginx_version (+1 -1) =================================================================== --- nginx_version 2017-06-30 22:31:23 +0900 (b50dd27) +++ nginx_version 2017-06-30 22:53:57 +0900 (61ce01b) @@ -1 +1 @@ -1.13.1 +1.13.2 Renamed: vendor/nginx-1.13.2/auto/cc/acc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/cc/bcc (+0 -1) 98% =================================================================== --- vendor/nginx-1.13.1/auto/cc/bcc 2017-06-30 22:31:23 +0900 (ec82e60) +++ vendor/nginx-1.13.2/auto/cc/bcc 2017-06-30 22:53:57 +0900 (e990a9f) @@ -62,7 +62,6 @@ ngx_include_opt="-I" ngx_objout="-o" ngx_binout="-e" ngx_objext="obj" -ngx_binext=".exe" ngx_long_start='@&&| ' Renamed: vendor/nginx-1.13.2/auto/cc/ccc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/cc/clang (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/cc/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/cc/gcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/cc/icc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/cc/msvc (+0 -1) 99% =================================================================== --- vendor/nginx-1.13.1/auto/cc/msvc 2017-06-30 22:31:23 +0900 (4eef101) +++ vendor/nginx-1.13.2/auto/cc/msvc 2017-06-30 22:53:57 +0900 (8257252) @@ -142,7 +142,6 @@ ngx_pic_opt= ngx_objout="-Fo" ngx_binout="-Fe" ngx_objext="obj" -ngx_binext=".exe" ngx_long_start='@<< ' Renamed: vendor/nginx-1.13.2/auto/cc/name (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/cc/owc (+0 -1) 99% =================================================================== --- vendor/nginx-1.13.1/auto/cc/owc 2017-06-30 22:31:23 +0900 (a063aa3) +++ vendor/nginx-1.13.2/auto/cc/owc 2017-06-30 22:53:57 +0900 (f7fd88c) @@ -84,7 +84,6 @@ ngx_include_opt="-i=" ngx_objout="-fo" ngx_binout="-fe=" ngx_objext="obj" -ngx_binext=".exe" ngx_regex_dirsep='\\' ngx_dirsep="\\" Renamed: vendor/nginx-1.13.2/auto/cc/sunc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/configure (+1 -1) 98% =================================================================== --- vendor/nginx-1.13.1/auto/configure 2017-06-30 22:31:23 +0900 (ceff15e) +++ vendor/nginx-1.13.2/auto/configure 2017-06-30 22:53:57 +0900 (7e6e33a) @@ -36,7 +36,7 @@ if test -z "$NGX_PLATFORM"; then NGX_PLATFORM="$NGX_SYSTEM:$NGX_RELEASE:$NGX_MACHINE"; case "$NGX_SYSTEM" in - MINGW32_*) + MINGW32_* | MINGW64_* | MSYS_*) NGX_PLATFORM=win32 ;; esac Renamed: vendor/nginx-1.13.2/auto/define (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/endianness (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/feature (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/have (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/have_headers (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/headers (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/include (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/init (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/install (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/lib/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/lib/geoip/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/lib/google-perftools/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/lib/libatomic/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/lib/libatomic/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/lib/libgd/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/lib/libxslt/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/lib/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/lib/openssl/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/lib/openssl/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/lib/openssl/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/lib/openssl/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/lib/pcre/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/lib/pcre/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/lib/pcre/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/lib/pcre/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/lib/pcre/makefile.owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/lib/perl/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/lib/perl/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/lib/zlib/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/lib/zlib/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/lib/zlib/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/lib/zlib/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/lib/zlib/makefile.owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/module (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/modules (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/nohave (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/options (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/os/conf (+8 -0) 94% =================================================================== --- vendor/nginx-1.13.1/auto/os/conf 2017-06-30 22:31:23 +0900 (6ad0e74) +++ vendor/nginx-1.13.2/auto/os/conf 2017-06-30 22:53:57 +0900 (6096af5) @@ -41,6 +41,14 @@ case "$NGX_PLATFORM" in ' ;; + NetBSD:*) + CORE_INCS="$UNIX_INCS" + CORE_DEPS="$UNIX_DEPS $POSIX_DEPS" + CORE_SRCS="$UNIX_SRCS" + + NGX_RPATH=YES + ;; + HP-UX:*) # HP/UX have=NGX_HPUX . auto/have_headers Renamed: vendor/nginx-1.13.2/auto/os/darwin (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/os/freebsd (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/os/linux (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/os/solaris (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/os/win32 (+1 -0) 97% =================================================================== --- vendor/nginx-1.13.1/auto/os/win32 2017-06-30 22:31:23 +0900 (650cf49) +++ vendor/nginx-1.13.2/auto/os/win32 2017-06-30 22:53:57 +0900 (7a82774) @@ -13,6 +13,7 @@ NGX_ICONS="$NGX_WIN32_ICONS" SELECT_SRCS=$WIN32_SELECT_SRCS ngx_pic_opt= +ngx_binext=".exe" case "$NGX_CC_NAME" in Renamed: vendor/nginx-1.13.2/auto/sources (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/stubs (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/summary (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/threads (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/types/sizeof (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/types/typedef (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/types/uintptr_t (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/types/value (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/auto/unix (+4 -1) 99% =================================================================== --- vendor/nginx-1.13.1/auto/unix 2017-06-30 22:31:23 +0900 (7c6a855) +++ vendor/nginx-1.13.2/auto/unix 2017-06-30 22:53:57 +0900 (10835f6) @@ -428,7 +428,10 @@ ngx_feature_incs="#include <sys/socket.h> #include <netinet/in.h>" ngx_feature_path= ngx_feature_libs= -ngx_feature_test="setsockopt(0, IPPROTO_IP, IP_PKTINFO, NULL, 0)" +ngx_feature_test="struct in_pktinfo pkt; + pkt.ipi_spec_dst.s_addr = INADDR_ANY; + (void) pkt; + setsockopt(0, IPPROTO_IP, IP_PKTINFO, NULL, 0)" . auto/feature Renamed: vendor/nginx-1.13.2/conf/fastcgi.conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/conf/fastcgi_params (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/conf/koi-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/conf/koi-win (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/conf/mime.types (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/conf/nginx.conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/conf/scgi_params (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/conf/uwsgi_params (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/conf/win-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/contrib/README (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/contrib/geo2nginx.pl (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/contrib/unicode2nginx/koi-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/contrib/unicode2nginx/unicode-to-nginx.pl (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/contrib/unicode2nginx/win-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/contrib/vim/ftdetect/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/contrib/vim/ftplugin/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/contrib/vim/indent/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/contrib/vim/syntax/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/docs/GNUmakefile (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/docs/dtd/change_log_conf.dtd (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/docs/dtd/changes.dtd (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/docs/html/50x.html (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/docs/html/index.html (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/docs/man/nginx.8 (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/docs/text/LICENSE (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/docs/text/README (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/docs/xml/change_log_conf.xml (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/docs/xml/nginx/changes.xml (+73 -0) 99% =================================================================== --- vendor/nginx-1.13.1/docs/xml/nginx/changes.xml 2017-06-30 22:31:23 +0900 (c43b6f7) +++ vendor/nginx-1.13.2/docs/xml/nginx/changes.xml 2017-06-30 22:53:57 +0900 (535704c) @@ -5,6 +5,79 @@ <change_log title="nginx"> +<changes ver="1.13.2" date="2017-06-27"> + +<change type="change"> +<para lang="ru"> +теперь при запросе диапазона, начинающегося с 0, из пустого файла +nginx возвращает ответ 200 вместо 416. +</para> +<para lang="en"> +nginx now returns 200 instead of 416 +when a range starting with 0 is requested from an empty file. +</para> +</change> + +<change type="feature"> +<para lang="ru"> +директива add_trailer.<br/> +Спасибо Piotr Sikora. +</para> +<para lang="en"> +the "add_trailer" directive.<br/> +Thanks to Piotr Sikora. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +nginx не собирался под Cygwin и NetBSD; +ошибка появилась в 1.13.0. +</para> +<para lang="en"> +nginx could not be built on Cygwin and NetBSD; +the bug had appeared in 1.13.0. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +nginx не собирался под MSYS2 / MinGW 64-bit.<br/> +Спасибо Orgad Shaneh. +</para> +<para lang="en"> +nginx could not be built under MSYS2 / MinGW 64-bit.<br/> +Thanks to Orgad Shaneh. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +при использовании SSI с большим количеством подзапросов +и proxy_pass с переменными +в рабочем процессе мог произойти segmentation fault. +</para> +<para lang="en"> +a segmentation fault might occur in a worker process +when using SSI with many includes +and proxy_pass with variables. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +в модуле ngx_http_v2_module.<br/> +Спасибо Piotr Sikora. +</para> +<para lang="en"> +in the ngx_http_v2_module.<br/> +Thanks to Piotr Sikora. +</para> +</change> + +</changes> + + <changes ver="1.13.1" date="2017-05-30"> <change type="feature"> Renamed: vendor/nginx-1.13.2/docs/xsls/changes.xsls (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/docs/xslt/changes.xslt (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/misc/GNUmakefile (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/misc/README (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/nginx.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/nginx.h (+2 -2) 85% =================================================================== --- vendor/nginx-1.13.1/src/core/nginx.h 2017-06-30 22:31:23 +0900 (8cc2d80) +++ vendor/nginx-1.13.2/src/core/nginx.h 2017-06-30 22:53:57 +0900 (37e257f) @@ -9,8 +9,8 @@ #define _NGINX_H_INCLUDED_ -#define nginx_version 1013001 -#define NGINX_VERSION "1.13.1" +#define nginx_version 1013002 +#define NGINX_VERSION "1.13.2" #define NGINX_VER "nginx/" NGINX_VERSION #ifdef NGX_BUILD Renamed: vendor/nginx-1.13.2/src/core/ngx_array.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_array.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_buf.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_buf.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_conf_file.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_conf_file.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_connection.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_connection.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_core.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_cpuinfo.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_crc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_crc32.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_crc32.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_crypt.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_crypt.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_cycle.c (+1 -3) 99% =================================================================== --- vendor/nginx-1.13.1/src/core/ngx_cycle.c 2017-06-30 22:31:23 +0900 (aee7a58) +++ vendor/nginx-1.13.2/src/core/ngx_cycle.c 2017-06-30 22:53:57 +0900 (675a506) @@ -1124,9 +1124,7 @@ ngx_reopen_files(ngx_cycle_t *cycle, ngx_uid_t user) if (user != (ngx_uid_t) NGX_CONF_UNSET_UINT) { ngx_file_info_t fi; - if (ngx_file_info((const char *) file[i].name.data, &fi) - == NGX_FILE_ERROR) - { + if (ngx_file_info(file[i].name.data, &fi) == NGX_FILE_ERROR) { ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno, ngx_file_info_n " \"%s\" failed", file[i].name.data); Renamed: vendor/nginx-1.13.2/src/core/ngx_cycle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_file.c (+1 -3) 99% =================================================================== --- vendor/nginx-1.13.1/src/core/ngx_file.c 2017-06-30 22:31:23 +0900 (b7dd4bc) +++ vendor/nginx-1.13.2/src/core/ngx_file.c 2017-06-30 22:53:57 +0900 (3a94089) @@ -622,9 +622,7 @@ ngx_create_paths(ngx_cycle_t *cycle, ngx_uid_t user) { ngx_file_info_t fi; - if (ngx_file_info((const char *) path[i]->name.data, &fi) - == NGX_FILE_ERROR) - { + if (ngx_file_info(path[i]->name.data, &fi) == NGX_FILE_ERROR) { ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno, ngx_file_info_n " \"%s\" failed", path[i]->name.data); return NGX_ERROR; Renamed: vendor/nginx-1.13.2/src/core/ngx_file.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_hash.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_hash.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_inet.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_inet.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_list.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_list.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_log.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_log.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_md5.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_md5.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_murmurhash.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_murmurhash.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_open_file_cache.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_open_file_cache.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_output_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_palloc.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_palloc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_parse.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_parse.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_parse_time.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_parse_time.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_proxy_protocol.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_proxy_protocol.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_queue.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_queue.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_radix_tree.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_radix_tree.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_rbtree.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_rbtree.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_regex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_regex.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_resolver.c (+8 -1) 99% =================================================================== --- vendor/nginx-1.13.1/src/core/ngx_resolver.c 2017-06-30 22:31:23 +0900 (e140ab6) +++ vendor/nginx-1.13.2/src/core/ngx_resolver.c 2017-06-30 22:53:57 +0900 (91f8a5e) @@ -443,7 +443,7 @@ ngx_resolve_name(ngx_resolver_ctx_t *ctx) name.data = ngx_resolver_alloc(r, name.len); if (name.data == NULL) { - return NGX_ERROR; + goto failed; } if (slen == ctx->service.len) { @@ -481,6 +481,8 @@ ngx_resolve_name(ngx_resolver_ctx_t *ctx) ngx_resolver_free(r, ctx->event); } +failed: + ngx_resolver_free(r, ctx); return NGX_ERROR; @@ -744,6 +746,7 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx, last->next = rn->waiting; rn->waiting = ctx; ctx->state = NGX_AGAIN; + ctx->async = 1; do { ctx->node = rn; @@ -890,6 +893,7 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx, rn->waiting = ctx; ctx->state = NGX_AGAIN; + ctx->async = 1; do { ctx->node = rn; @@ -1021,6 +1025,7 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx) ctx->next = rn->waiting; rn->waiting = ctx; ctx->state = NGX_AGAIN; + ctx->async = 1; ctx->node = rn; /* unlock addr mutex */ @@ -1117,6 +1122,7 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx) /* unlock addr mutex */ ctx->state = NGX_AGAIN; + ctx->async = 1; ctx->node = rn; return NGX_OK; @@ -3017,6 +3023,7 @@ ngx_resolver_srv_names_handler(ngx_resolver_ctx_t *cctx) srv = cctx->srvs; ctx->count--; + ctx->async |= cctx->async; srv->ctx = NULL; srv->state = cctx->state; Renamed: vendor/nginx-1.13.2/src/core/ngx_resolver.h (+2 -1) 98% =================================================================== --- vendor/nginx-1.13.1/src/core/ngx_resolver.h 2017-06-30 22:31:23 +0900 (a0d6fc3) +++ vendor/nginx-1.13.2/src/core/ngx_resolver.h 2017-06-30 22:53:57 +0900 (6f099b7) @@ -218,7 +218,8 @@ struct ngx_resolver_ctx_s { void *data; ngx_msec_t timeout; - ngx_uint_t quick; /* unsigned quick:1; */ + unsigned quick:1; + unsigned async:1; ngx_uint_t recursion; ngx_event_t *event; }; Renamed: vendor/nginx-1.13.2/src/core/ngx_rwlock.c (+10 -1) 91% =================================================================== --- vendor/nginx-1.13.1/src/core/ngx_rwlock.c 2017-06-30 22:31:23 +0900 (905de78) +++ vendor/nginx-1.13.2/src/core/ngx_rwlock.c 2017-06-30 22:53:57 +0900 (ed2b0f8) @@ -94,7 +94,7 @@ ngx_rwlock_unlock(ngx_atomic_t *lock) readers = *lock; if (readers == NGX_RWLOCK_WLOCK) { - *lock = 0; + (void) ngx_atomic_cmp_set(lock, NGX_RWLOCK_WLOCK, 0); return; } @@ -109,6 +109,15 @@ ngx_rwlock_unlock(ngx_atomic_t *lock) } +void +ngx_rwlock_downgrade(ngx_atomic_t *lock) +{ + if (*lock == NGX_RWLOCK_WLOCK) { + *lock = 1; + } +} + + #else #if (NGX_HTTP_UPSTREAM_ZONE || NGX_STREAM_UPSTREAM_ZONE) Renamed: vendor/nginx-1.13.2/src/core/ngx_rwlock.h (+1 -0) 88% =================================================================== --- vendor/nginx-1.13.1/src/core/ngx_rwlock.h 2017-06-30 22:31:23 +0900 (8b16eca) +++ vendor/nginx-1.13.2/src/core/ngx_rwlock.h 2017-06-30 22:53:57 +0900 (41b42aa) @@ -16,6 +16,7 @@ void ngx_rwlock_wlock(ngx_atomic_t *lock); void ngx_rwlock_rlock(ngx_atomic_t *lock); void ngx_rwlock_unlock(ngx_atomic_t *lock); +void ngx_rwlock_downgrade(ngx_atomic_t *lock); #endif /* _NGX_RWLOCK_H_INCLUDED_ */ Renamed: vendor/nginx-1.13.2/src/core/ngx_sha1.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_sha1.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_shmtx.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_shmtx.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_slab.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_slab.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_spinlock.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_string.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_string.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_syslog.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_syslog.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_thread_pool.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_thread_pool.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_times.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/core/ngx_times.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/event/modules/ngx_devpoll_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/event/modules/ngx_epoll_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/event/modules/ngx_eventport_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/event/modules/ngx_iocp_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/event/modules/ngx_iocp_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/event/modules/ngx_kqueue_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/event/modules/ngx_poll_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/event/modules/ngx_select_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/event/modules/ngx_win32_select_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/event/ngx_event.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/event/ngx_event.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/event/ngx_event_accept.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/event/ngx_event_acceptex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/event/ngx_event_connect.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/event/ngx_event_connect.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/event/ngx_event_connectex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/event/ngx_event_openssl.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/event/ngx_event_openssl.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/event/ngx_event_openssl_stapling.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/event/ngx_event_pipe.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/event/ngx_event_pipe.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/event/ngx_event_posted.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/event/ngx_event_posted.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/event/ngx_event_timer.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/event/ngx_event_timer.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_access_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_addition_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_auth_basic_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_auth_request_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_autoindex_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_browser_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_charset_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_chunked_filter_module.c (+125 -27) 64% =================================================================== --- vendor/nginx-1.13.1/src/http/modules/ngx_http_chunked_filter_module.c 2017-06-30 22:31:23 +0900 (ac2e3e8) +++ vendor/nginx-1.13.2/src/http/modules/ngx_http_chunked_filter_module.c 2017-06-30 22:53:57 +0900 (4d6fd3e) @@ -17,6 +17,8 @@ typedef struct { static ngx_int_t ngx_http_chunked_filter_init(ngx_conf_t *cf); +static ngx_chain_t *ngx_http_chunked_create_trailers(ngx_http_request_t *r, + ngx_http_chunked_filter_ctx_t *ctx); static ngx_http_module_t ngx_http_chunked_filter_module_ctx = { @@ -69,27 +71,29 @@ ngx_http_chunked_header_filter(ngx_http_request_t *r) return ngx_http_next_header_filter(r); } - if (r->headers_out.content_length_n == -1) { - if (r->http_version < NGX_HTTP_VERSION_11) { - r->keepalive = 0; + if (r->headers_out.content_length_n == -1 + || r->expect_trailers) + { + clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); - } else { - clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); + if (r->http_version >= NGX_HTTP_VERSION_11 + && clcf->chunked_transfer_encoding) + { + if (r->expect_trailers) { + ngx_http_clear_content_length(r); + } - if (clcf->chunked_transfer_encoding) { - r->chunked = 1; + r->chunked = 1; - ctx = ngx_pcalloc(r->pool, - sizeof(ngx_http_chunked_filter_ctx_t)); - if (ctx == NULL) { - return NGX_ERROR; - } + ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_chunked_filter_ctx_t)); + if (ctx == NULL) { + return NGX_ERROR; + } - ngx_http_set_ctx(r, ctx, ngx_http_chunked_filter_module); + ngx_http_set_ctx(r, ctx, ngx_http_chunked_filter_module); - } else { - r->keepalive = 0; - } + } else if (r->headers_out.content_length_n == -1) { + r->keepalive = 0; } } @@ -179,26 +183,17 @@ ngx_http_chunked_body_filter(ngx_http_request_t *r, ngx_chain_t *in) } if (cl->buf->last_buf) { - tl = ngx_chain_get_free_buf(r->pool, &ctx->free); + tl = ngx_http_chunked_create_trailers(r, ctx); if (tl == NULL) { return NGX_ERROR; } - b = tl->buf; - - b->tag = (ngx_buf_tag_t) &ngx_http_chunked_filter_module; - b->temporary = 0; - b->memory = 1; - b->last_buf = 1; - b->pos = (u_char *) CRLF "0" CRLF CRLF; - b->last = b->pos + 7; - cl->buf->last_buf = 0; *ll = tl; if (size == 0) { - b->pos += 2; + tl->buf->pos += 2; } } else if (size > 0) { @@ -230,6 +225,109 @@ ngx_http_chunked_body_filter(ngx_http_request_t *r, ngx_chain_t *in) } +static ngx_chain_t * +ngx_http_chunked_create_trailers(ngx_http_request_t *r, + ngx_http_chunked_filter_ctx_t *ctx) +{ + size_t len; + ngx_buf_t *b; + ngx_uint_t i; + ngx_chain_t *cl; + ngx_list_part_t *part; + ngx_table_elt_t *header; + + len = 0; + + part = &r->headers_out.trailers.part; + header = part->elts; + + for (i = 0; /* void */; i++) { + + if (i >= part->nelts) { + if (part->next == NULL) { + break; + } + + part = part->next; + header = part->elts; + i = 0; + } + + if (header[i].hash == 0) { + continue; + } + + len += header[i].key.len + sizeof(": ") - 1 + + header[i].value.len + sizeof(CRLF) - 1; + } + + cl = ngx_chain_get_free_buf(r->pool, &ctx->free); + if (cl == NULL) { + return NULL; + } + + b = cl->buf; + + b->tag = (ngx_buf_tag_t) &ngx_http_chunked_filter_module; + b->temporary = 0; + b->memory = 1; + b->last_buf = 1; + + if (len == 0) { + b->pos = (u_char *) CRLF "0" CRLF CRLF; + b->last = b->pos + sizeof(CRLF "0" CRLF CRLF) - 1; + return cl; + } + + len += sizeof(CRLF "0" CRLF CRLF) - 1; + + b->pos = ngx_palloc(r->pool, len); + if (b->pos == NULL) { + return NULL; + } + + b->last = b->pos; + + *b->last++ = CR; *b->last++ = LF; + *b->last++ = '0'; + *b->last++ = CR; *b->last++ = LF; + + part = &r->headers_out.trailers.part; + header = part->elts; + + for (i = 0; /* void */; i++) { + + if (i >= part->nelts) { + if (part->next == NULL) { + break; + } + + part = part->next; + header = part->elts; + i = 0; + } + + if (header[i].hash == 0) { + continue; + } + + ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, + "http trailer: \"%V: %V\"", + &header[i].key, &header[i].value); + + b->last = ngx_copy(b->last, header[i].key.data, header[i].key.len); + *b->last++ = ':'; *b->last++ = ' '; + + b->last = ngx_copy(b->last, header[i].value.data, header[i].value.len); + *b->last++ = CR; *b->last++ = LF; + } + + *b->last++ = CR; *b->last++ = LF; + + return cl; +} + + static ngx_int_t ngx_http_chunked_filter_init(ngx_conf_t *cf) { Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_dav_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_degradation_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_empty_gif_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_fastcgi_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_flv_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_geo_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_geoip_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_gunzip_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_gzip_filter_module.c (+4 -4) 100% =================================================================== @@ -1084,10 +1084,6 @@ ngx_http_gzip_ratio_variable(ngx_http_request_t *r, ngx_uint_t zint, zfrac; ngx_http_gzip_ctx_t *ctx; - v->valid = 1; - v->no_cacheable = 0; - v->not_found = 0; - ctx = ngx_http_get_module_ctx(r, ngx_http_gzip_filter_module); if (ctx == NULL || ctx->zout == 0) { @@ -1095,6 +1091,10 @@ ngx_http_gzip_ratio_variable(ngx_http_request_t *r, return NGX_OK; } + v->valid = 1; + v->no_cacheable = 0; + v->not_found = 0; + v->data = ngx_pnalloc(r->pool, NGX_INT32_LEN + 3); if (v->data == NULL) { return NGX_ERROR; Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_gzip_static_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_headers_filter_module.c (+144 -24) 82% =================================================================== --- vendor/nginx-1.13.1/src/http/modules/ngx_http_headers_filter_module.c 2017-06-30 22:31:23 +0900 (94dc51e) +++ vendor/nginx-1.13.2/src/http/modules/ngx_http_headers_filter_module.c 2017-06-30 22:53:57 +0900 (e5f1eb5) @@ -48,6 +48,7 @@ typedef struct { time_t expires_time; ngx_http_complex_value_t *expires_value; ngx_array_t *headers; + ngx_array_t *trailers; } ngx_http_headers_conf_t; @@ -98,15 +99,23 @@ static ngx_command_t ngx_http_headers_filter_commands[] = { ngx_http_headers_expires, NGX_HTTP_LOC_CONF_OFFSET, 0, - NULL}, + NULL }, { ngx_string("add_header"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF |NGX_CONF_TAKE23, ngx_http_headers_add, NGX_HTTP_LOC_CONF_OFFSET, - 0, - NULL}, + offsetof(ngx_http_headers_conf_t, headers), + NULL }, + + { ngx_string("add_trailer"), + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF + |NGX_CONF_TAKE23, + ngx_http_headers_add, + NGX_HTTP_LOC_CONF_OFFSET, + offsetof(ngx_http_headers_conf_t, trailers), + NULL }, ngx_null_command }; @@ -144,6 +153,7 @@ ngx_module_t ngx_http_headers_filter_module = { static ngx_http_output_header_filter_pt ngx_http_next_header_filter; +static ngx_http_output_body_filter_pt ngx_http_next_body_filter; static ngx_int_t @@ -154,10 +164,15 @@ ngx_http_headers_filter(ngx_http_request_t *r) ngx_http_header_val_t *h; ngx_http_headers_conf_t *conf; + if (r != r->main) { + return ngx_http_next_header_filter(r); + } + conf = ngx_http_get_module_loc_conf(r, ngx_http_headers_filter_module); - if ((conf->expires == NGX_HTTP_EXPIRES_OFF && conf->headers == NULL) - || r != r->main) + if (conf->expires == NGX_HTTP_EXPIRES_OFF + && conf->headers == NULL + && conf->trailers == NULL) { return ngx_http_next_header_filter(r); } @@ -206,11 +221,101 @@ ngx_http_headers_filter(ngx_http_request_t *r) } } + if (conf->trailers) { + h = conf->trailers->elts; + for (i = 0; i < conf->trailers->nelts; i++) { + + if (!safe_status && !h[i].always) { + continue; + } + + r->expect_trailers = 1; + break; + } + } + return ngx_http_next_header_filter(r); } static ngx_int_t +ngx_http_trailers_filter(ngx_http_request_t *r, ngx_chain_t *in) +{ + ngx_str_t value; + ngx_uint_t i, safe_status; + ngx_chain_t *cl; + ngx_table_elt_t *t; + ngx_http_header_val_t *h; + ngx_http_headers_conf_t *conf; + + conf = ngx_http_get_module_loc_conf(r, ngx_http_headers_filter_module); + + if (in == NULL + || conf->trailers == NULL + || !r->expect_trailers + || r->header_only) + { + return ngx_http_next_body_filter(r, in); + } + + for (cl = in; cl; cl = cl->next) { + if (cl->buf->last_buf) { + break; + } + } + + if (cl == NULL) { + return ngx_http_next_body_filter(r, in); + } + + switch (r->headers_out.status) { + + case NGX_HTTP_OK: + case NGX_HTTP_CREATED: + case NGX_HTTP_NO_CONTENT: + case NGX_HTTP_PARTIAL_CONTENT: + case NGX_HTTP_MOVED_PERMANENTLY: + case NGX_HTTP_MOVED_TEMPORARILY: + case NGX_HTTP_SEE_OTHER: + case NGX_HTTP_NOT_MODIFIED: + case NGX_HTTP_TEMPORARY_REDIRECT: + case NGX_HTTP_PERMANENT_REDIRECT: + safe_status = 1; + break; + + default: + safe_status = 0; + break; + } + + h = conf->trailers->elts; + for (i = 0; i < conf->trailers->nelts; i++) { + + if (!safe_status && !h[i].always) { + continue; + } + + if (ngx_http_complex_value(r, &h[i].value, &value) != NGX_OK) { + return NGX_ERROR; + } + + if (value.len) { + t = ngx_list_push(&r->headers_out.trailers); + if (t == NULL) { + return NGX_ERROR; + } + + t->key = h[i].key; + t->value = value; + t->hash = 1; + } + } + + return ngx_http_next_body_filter(r, in); +} + + +static ngx_int_t ngx_http_set_expires(ngx_http_request_t *r, ngx_http_headers_conf_t *conf) { char *err; @@ -557,6 +662,7 @@ ngx_http_headers_create_conf(ngx_conf_t *cf) * set by ngx_pcalloc(): * * conf->headers = NULL; + * conf->trailers = NULL; * conf->expires_time = 0; * conf->expires_value = NULL; */ @@ -587,6 +693,10 @@ ngx_http_headers_merge_conf(ngx_conf_t *cf, void *parent, void *child) conf->headers = prev->headers; } + if (conf->trailers == NULL) { + conf->trailers = prev->trailers; + } + return NGX_CONF_OK; } @@ -597,6 +707,9 @@ ngx_http_headers_filter_init(ngx_conf_t *cf) ngx_http_next_header_filter = ngx_http_top_header_filter; ngx_http_top_header_filter = ngx_http_headers_filter; + ngx_http_next_body_filter = ngx_http_top_body_filter; + ngx_http_top_body_filter = ngx_http_trailers_filter; + return NGX_OK; } @@ -674,42 +787,49 @@ ngx_http_headers_add(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) { ngx_http_headers_conf_t *hcf = conf; - ngx_str_t *value; - ngx_uint_t i; - ngx_http_header_val_t *hv; - ngx_http_set_header_t *set; - ngx_http_compile_complex_value_t ccv; + ngx_str_t *value; + ngx_uint_t i; + ngx_array_t **headers; + ngx_http_header_val_t *hv; + ngx_http_set_header_t *set; + ngx_http_compile_complex_value_t ccv; value = cf->args->elts; - if (hcf->headers == NULL) { - hcf->headers = ngx_array_create(cf->pool, 1, - sizeof(ngx_http_header_val_t)); - if (hcf->headers == NULL) { + headers = (ngx_array_t **) ((char *) hcf + cmd->offset); + + if (*headers == NULL) { + *headers = ngx_array_create(cf->pool, 1, + sizeof(ngx_http_header_val_t)); + if (*headers == NULL) { return NGX_CONF_ERROR; } } - hv = ngx_array_push(hcf->headers); + hv = ngx_array_push(*headers); if (hv == NULL) { return NGX_CONF_ERROR; } hv->key = value[1]; - hv->handler = ngx_http_add_header; + hv->handler = NULL; hv->offset = 0; hv->always = 0; - set = ngx_http_set_headers; - for (i = 0; set[i].name.len; i++) { - if (ngx_strcasecmp(value[1].data, set[i].name.data) != 0) { - continue; - } + if (headers == &hcf->headers) { + hv->handler = ngx_http_add_header; - hv->offset = set[i].offset; - hv->handler = set[i].handler; + set = ngx_http_set_headers; + for (i = 0; set[i].name.len; i++) { + if (ngx_strcasecmp(value[1].data, set[i].name.data) != 0) { + continue; + } - break; + hv->offset = set[i].offset; + hv->handler = set[i].handler; + + break; + } } if (value[2].len == 0) { Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_image_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_index_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_limit_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_limit_req_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_log_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_map_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_memcached_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_mp4_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_not_modified_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_proxy_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_random_index_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_range_filter_module.c (+3 -0) 99% =================================================================== --- vendor/nginx-1.13.1/src/http/modules/ngx_http_range_filter_module.c 2017-06-30 22:31:23 +0900 (8ffca82) +++ vendor/nginx-1.13.2/src/http/modules/ngx_http_range_filter_module.c 2017-06-30 22:53:57 +0900 (7ad9db9) @@ -382,6 +382,9 @@ ngx_http_range_parse(ngx_http_request_t *r, ngx_http_range_filter_ctx_t *ctx, if (ranges-- == 0) { return NGX_DECLINED; } + + } else if (start == 0) { + return NGX_DECLINED; } if (*p++ != ',') { Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_realip_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_referer_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_rewrite_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_scgi_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_secure_link_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_slice_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_split_clients_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_ssi_filter_module.c (+1 -1) 99% =================================================================== --- vendor/nginx-1.13.1/src/http/modules/ngx_http_ssi_filter_module.c 2017-06-30 22:31:23 +0900 (6fb1fbe) +++ vendor/nginx-1.13.2/src/http/modules/ngx_http_ssi_filter_module.c 2017-06-30 22:53:57 +0900 (b92ad4c) @@ -2388,7 +2388,7 @@ ngx_http_ssi_config(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx, ctx->timefmt.len = value->len; ctx->timefmt.data = ngx_pnalloc(r->pool, value->len + 1); if (ctx->timefmt.data == NULL) { - return NGX_HTTP_SSI_ERROR; + return NGX_ERROR; } ngx_cpystrn(ctx->timefmt.data, value->data, value->len + 1); Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_ssi_filter_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_ssl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_ssl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_static_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_stub_status_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_sub_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_upstream_hash_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_upstream_ip_hash_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_upstream_keepalive_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_upstream_least_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_upstream_zone_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_userid_filter_module.c (+4 -0) 99% =================================================================== --- vendor/nginx-1.13.1/src/http/modules/ngx_http_userid_filter_module.c 2017-06-30 22:31:23 +0900 (0dbacba) +++ vendor/nginx-1.13.2/src/http/modules/ngx_http_userid_filter_module.c 2017-06-30 22:53:57 +0900 (a1a5493) @@ -472,6 +472,10 @@ ngx_http_userid_create_uid(ngx_http_request_t *r, ngx_http_userid_ctx_t *ctx, vv = ngx_http_get_indexed_variable(r, ngx_http_userid_reset_index); + if (vv == NULL || vv->not_found) { + return NGX_ERROR; + } + if (vv->len == 0 || (vv->len == 1 && vv->data[0] == '0')) { if (conf->mark == '\0' Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_uwsgi_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/ngx_http_xslt_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/perl/Makefile.PL (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/perl/nginx.pm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/perl/nginx.xs (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/perl/ngx_http_perl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/perl/ngx_http_perl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/modules/perl/typemap (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/ngx_http.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/ngx_http.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/ngx_http_cache.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/ngx_http_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/ngx_http_copy_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/ngx_http_core_module.c (+8 -0) 99% =================================================================== --- vendor/nginx-1.13.1/src/http/ngx_http_core_module.c 2017-06-30 22:31:23 +0900 (7e40e78) +++ vendor/nginx-1.13.2/src/http/ngx_http_core_module.c 2017-06-30 22:53:57 +0900 (02059ef) @@ -1353,6 +1353,7 @@ ngx_http_core_try_files_phase(ngx_http_request_t *r, r->uri.len = alias + path.len; r->uri.data = ngx_pnalloc(r->pool, r->uri.len); if (r->uri.data == NULL) { + r->uri.len = 0; ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); return NGX_OK; } @@ -2484,6 +2485,13 @@ ngx_http_subrequest(ngx_http_request_t *r, return NGX_ERROR; } + if (ngx_list_init(&sr->headers_out.trailers, r->pool, 4, + sizeof(ngx_table_elt_t)) + != NGX_OK) + { + return NGX_ERROR; + } + cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module); sr->main_conf = cscf->ctx->main_conf; sr->srv_conf = cscf->ctx->srv_conf; Renamed: vendor/nginx-1.13.2/src/http/ngx_http_core_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/ngx_http_file_cache.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/ngx_http_header_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/ngx_http_parse.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/ngx_http_postpone_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/ngx_http_request.c (+8 -0) 99% =================================================================== --- vendor/nginx-1.13.1/src/http/ngx_http_request.c 2017-06-30 22:31:23 +0900 (cc3722f) +++ vendor/nginx-1.13.2/src/http/ngx_http_request.c 2017-06-30 22:53:57 +0900 (de1b202) @@ -562,6 +562,14 @@ ngx_http_create_request(ngx_connection_t *c) return NULL; } + if (ngx_list_init(&r->headers_out.trailers, r->pool, 4, + sizeof(ngx_table_elt_t)) + != NGX_OK) + { + ngx_destroy_pool(r->pool); + return NULL; + } + r->ctx = ngx_pcalloc(r->pool, sizeof(void *) * ngx_http_max_module); if (r->ctx == NULL) { ngx_destroy_pool(r->pool); Renamed: vendor/nginx-1.13.2/src/http/ngx_http_request.h (+2 -0) 99% =================================================================== --- vendor/nginx-1.13.1/src/http/ngx_http_request.h 2017-06-30 22:31:23 +0900 (283c582) +++ vendor/nginx-1.13.2/src/http/ngx_http_request.h 2017-06-30 22:53:57 +0900 (f7f3e97) @@ -252,6 +252,7 @@ typedef struct { typedef struct { ngx_list_t headers; + ngx_list_t trailers; ngx_uint_t status; ngx_str_t status_line; @@ -514,6 +515,7 @@ struct ngx_http_request_s { unsigned pipeline:1; unsigned chunked:1; unsigned header_only:1; + unsigned expect_trailers:1; unsigned keepalive:1; unsigned lingering_close:1; unsigned discard_body:1; Renamed: vendor/nginx-1.13.2/src/http/ngx_http_request_body.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/ngx_http_script.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/ngx_http_script.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/ngx_http_special_response.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/ngx_http_upstream.c (+31 -16) 99% =================================================================== --- vendor/nginx-1.13.1/src/http/ngx_http_upstream.c 2017-06-30 22:31:23 +0900 (0fc5ab5) +++ vendor/nginx-1.13.2/src/http/ngx_http_upstream.c 2017-06-30 22:53:57 +0900 (c394b29) @@ -182,7 +182,9 @@ static char *ngx_http_upstream_init_main_conf(ngx_conf_t *cf, void *conf); #if (NGX_HTTP_SSL) static void ngx_http_upstream_ssl_init_connection(ngx_http_request_t *, ngx_http_upstream_t *u, ngx_connection_t *c); -static void ngx_http_upstream_ssl_handshake(ngx_connection_t *c); +static void ngx_http_upstream_ssl_handshake_handler(ngx_connection_t *c); +static void ngx_http_upstream_ssl_handshake(ngx_http_request_t *, + ngx_http_upstream_t *u, ngx_connection_t *c); static ngx_int_t ngx_http_upstream_ssl_name(ngx_http_request_t *r, ngx_http_upstream_t *u, ngx_connection_t *c); #endif @@ -1143,11 +1145,14 @@ ngx_http_upstream_cache_check_range(ngx_http_request_t *r, static void ngx_http_upstream_resolve_handler(ngx_resolver_ctx_t *ctx) { + ngx_uint_t run_posted; ngx_connection_t *c; ngx_http_request_t *r; ngx_http_upstream_t *u; ngx_http_upstream_resolved_t *ur; + run_posted = ctx->async; + r = ctx->data; c = r->connection; @@ -1211,7 +1216,9 @@ ngx_http_upstream_resolve_handler(ngx_resolver_ctx_t *ctx) failed: - ngx_http_run_posted_requests(c); + if (run_posted) { + ngx_http_run_posted_requests(c); + } } @@ -1662,26 +1669,43 @@ ngx_http_upstream_ssl_init_connection(ngx_http_request_t *r, ngx_add_timer(c->write, u->conf->connect_timeout); } - c->ssl->handler = ngx_http_upstream_ssl_handshake; + c->ssl->handler = ngx_http_upstream_ssl_handshake_handler; return; } - ngx_http_upstream_ssl_handshake(c); + ngx_http_upstream_ssl_handshake(r, u, c); } static void -ngx_http_upstream_ssl_handshake(ngx_connection_t *c) +ngx_http_upstream_ssl_handshake_handler(ngx_connection_t *c) { - long rc; ngx_http_request_t *r; ngx_http_upstream_t *u; r = c->data; + u = r->upstream; + c = r->connection; ngx_http_set_log_request(c->log, r); + ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, + "http upstream ssl handshake: \"%V?%V\"", + &r->uri, &r->args); + + ngx_http_upstream_ssl_handshake(r, u, u->peer.connection); + + ngx_http_run_posted_requests(c); +} + + +static void +ngx_http_upstream_ssl_handshake(ngx_http_request_t *r, ngx_http_upstream_t *u, + ngx_connection_t *c) +{ + long rc; + if (c->ssl->handshaked) { if (u->conf->ssl_verify) { @@ -1709,28 +1733,19 @@ ngx_http_upstream_ssl_handshake(ngx_connection_t *c) c->write->handler = ngx_http_upstream_handler; c->read->handler = ngx_http_upstream_handler; - c = r->connection; - ngx_http_upstream_send_request(r, u, 1); - ngx_http_run_posted_requests(c); return; } if (c->write->timedout) { - c = r->connection; ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_TIMEOUT); - ngx_http_run_posted_requests(c); return; } failed: - c = r->connection; - ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR); - - ngx_http_run_posted_requests(c); } @@ -2729,7 +2744,7 @@ ngx_http_upstream_process_body_in_memory(ngx_http_request_t *r, rev = c->read; ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, - "http upstream process body on memory"); + "http upstream process body in memory"); if (rev->timedout) { ngx_connection_error(c, NGX_ETIMEDOUT, "upstream timed out"); Renamed: vendor/nginx-1.13.2/src/http/ngx_http_upstream.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/ngx_http_upstream_round_robin.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/ngx_http_upstream_round_robin.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/ngx_http_variables.c (+15 -0) 99% =================================================================== --- vendor/nginx-1.13.1/src/http/ngx_http_variables.c 2017-06-30 22:31:23 +0900 (6138819) +++ vendor/nginx-1.13.2/src/http/ngx_http_variables.c 2017-06-30 22:53:57 +0900 (cfb538a) @@ -38,6 +38,8 @@ static ngx_int_t ngx_http_variable_unknown_header_in(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data); static ngx_int_t ngx_http_variable_unknown_header_out(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data); +static ngx_int_t ngx_http_variable_unknown_trailer_out(ngx_http_request_t *r, + ngx_http_variable_value_t *v, uintptr_t data); static ngx_int_t ngx_http_variable_request_line(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data); static ngx_int_t ngx_http_variable_cookie(ngx_http_request_t *r, @@ -365,6 +367,9 @@ static ngx_http_variable_t ngx_http_core_variables[] = { { ngx_string("sent_http_"), NULL, ngx_http_variable_unknown_header_out, 0, NGX_HTTP_VAR_PREFIX, 0 }, + { ngx_string("sent_trailer_"), NULL, ngx_http_variable_unknown_trailer_out, + 0, NGX_HTTP_VAR_PREFIX, 0 }, + { ngx_string("cookie_"), NULL, ngx_http_variable_cookie, 0, NGX_HTTP_VAR_PREFIX, 0 }, @@ -934,6 +939,16 @@ ngx_http_variable_unknown_header_out(ngx_http_request_t *r, } +static ngx_int_t +ngx_http_variable_unknown_trailer_out(ngx_http_request_t *r, + ngx_http_variable_value_t *v, uintptr_t data) +{ + return ngx_http_variable_unknown_header(v, (ngx_str_t *) data, + &r->headers_out.trailers.part, + sizeof("sent_trailer_") - 1); +} + + ngx_int_t ngx_http_variable_unknown_header(ngx_http_variable_value_t *v, ngx_str_t *var, ngx_list_part_t *part, size_t prefix) Renamed: vendor/nginx-1.13.2/src/http/ngx_http_variables.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/ngx_http_write_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/v2/ngx_http_v2.c (+71 -51) 97% =================================================================== --- vendor/nginx-1.13.1/src/http/v2/ngx_http_v2.c 2017-06-30 22:31:23 +0900 (ed78638) +++ vendor/nginx-1.13.2/src/http/v2/ngx_http_v2.c 2017-06-30 22:53:57 +0900 (7725616) @@ -28,6 +28,7 @@ #define NGX_HTTP_V2_HTTP_1_1_REQUIRED 0xd /* frame sizes */ +#define NGX_HTTP_V2_SETTINGS_ACK_SIZE 0 #define NGX_HTTP_V2_RST_STREAM_SIZE 4 #define NGX_HTTP_V2_PRIORITY_SIZE 5 #define NGX_HTTP_V2_PING_SIZE 8 @@ -128,8 +129,7 @@ static ngx_http_v2_node_t *ngx_http_v2_get_closed_node( #define ngx_http_v2_index_size(h2scf) (h2scf->streams_index_mask + 1) #define ngx_http_v2_index(h2scf, sid) ((sid >> 1) & h2scf->streams_index_mask) -static ngx_int_t ngx_http_v2_send_settings(ngx_http_v2_connection_t *h2c, - ngx_uint_t ack); +static ngx_int_t ngx_http_v2_send_settings(ngx_http_v2_connection_t *h2c); static ngx_int_t ngx_http_v2_settings_frame_handler( ngx_http_v2_connection_t *h2c, ngx_http_v2_out_frame_t *frame); static ngx_int_t ngx_http_v2_send_window_update(ngx_http_v2_connection_t *h2c, @@ -269,7 +269,7 @@ ngx_http_v2_init(ngx_event_t *rev) return; } - if (ngx_http_v2_send_settings(h2c, 0) == NGX_ERROR) { + if (ngx_http_v2_send_settings(h2c) == NGX_ERROR) { ngx_http_close_connection(c); return; } @@ -1568,6 +1568,10 @@ ngx_http_v2_state_process_header(ngx_http_v2_connection_t *h2c, u_char *pos, rc = ngx_http_v2_pseudo_header(r, header); if (rc == NGX_OK) { + ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, + "http2 pseudo-header: \":%V: %V\"", + &header->name, &header->value); + return ngx_http_v2_state_header_complete(h2c, pos, end); } @@ -1609,36 +1613,40 @@ ngx_http_v2_state_process_header(ngx_http_v2_connection_t *h2c, u_char *pos, NGX_HTTP_V2_INTERNAL_ERROR); } - return ngx_http_v2_state_header_complete(h2c, pos, end); - } - - h = ngx_list_push(&r->headers_in.headers); - if (h == NULL) { - return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR); - } + } else { + h = ngx_list_push(&r->headers_in.headers); + if (h == NULL) { + return ngx_http_v2_connection_error(h2c, + NGX_HTTP_V2_INTERNAL_ERROR); + } - h->key.len = header->name.len; - h->key.data = header->name.data; + h->key.len = header->name.len; + h->key.data = header->name.data; - /* TODO Optimization: precalculate hash and handler for indexed headers. */ - h->hash = ngx_hash_key(h->key.data, h->key.len); + /* + * TODO Optimization: precalculate hash + * and handler for indexed headers. + */ + h->hash = ngx_hash_key(h->key.data, h->key.len); - h->value.len = header->value.len; - h->value.data = header->value.data; + h->value.len = header->value.len; + h->value.data = header->value.data; - h->lowcase_key = h->key.data; + h->lowcase_key = h->key.data; - cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module); + cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module); - hh = ngx_hash_find(&cmcf->headers_in_hash, h->hash, - h->lowcase_key, h->key.len); + hh = ngx_hash_find(&cmcf->headers_in_hash, h->hash, + h->lowcase_key, h->key.len); - if (hh && hh->handler(r, h, hh->offset) != NGX_OK) { - goto error; + if (hh && hh->handler(r, h, hh->offset) != NGX_OK) { + goto error; + } } ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, - "http2 http header: \"%V: %V\"", &h->key, &h->value); + "http2 http header: \"%V: %V\"", + &header->name, &header->value); return ngx_http_v2_state_header_complete(h2c, pos, end); @@ -1951,8 +1959,6 @@ ngx_http_v2_state_settings(ngx_http_v2_connection_t *h2c, u_char *pos, return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR); } - ngx_http_v2_send_settings(h2c, 1); - return ngx_http_v2_state_settings_params(h2c, pos, end); } @@ -1961,7 +1967,11 @@ static u_char * ngx_http_v2_state_settings_params(ngx_http_v2_connection_t *h2c, u_char *pos, u_char *end) { - ngx_uint_t id, value; + ssize_t window_delta; + ngx_uint_t id, value; + ngx_http_v2_out_frame_t *frame; + + window_delta = 0; while (h2c->state.length) { if (end - pos < NGX_HTTP_V2_SETTINGS_PARAM_SIZE) { @@ -1987,12 +1997,7 @@ ngx_http_v2_state_settings_params(ngx_http_v2_connection_t *h2c, u_char *pos, NGX_HTTP_V2_FLOW_CTRL_ERROR); } - if (ngx_http_v2_adjust_windows(h2c, value - h2c->init_window) - != NGX_OK) - { - return ngx_http_v2_connection_error(h2c, - NGX_HTTP_V2_INTERNAL_ERROR); - } + window_delta = value - h2c->init_window; h2c->init_window = value; break; @@ -2020,6 +2025,22 @@ ngx_http_v2_state_settings_params(ngx_http_v2_connection_t *h2c, u_char *pos, pos += NGX_HTTP_V2_SETTINGS_PARAM_SIZE; } + frame = ngx_http_v2_get_frame(h2c, NGX_HTTP_V2_SETTINGS_ACK_SIZE, + NGX_HTTP_V2_SETTINGS_FRAME, + NGX_HTTP_V2_ACK_FLAG, 0); + if (frame == NULL) { + return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR); + } + + ngx_http_v2_queue_ordered_frame(h2c, frame); + + if (window_delta) { + if (ngx_http_v2_adjust_windows(h2c, window_delta) != NGX_OK) { + return ngx_http_v2_connection_error(h2c, + NGX_HTTP_V2_INTERNAL_ERROR); + } + } + return ngx_http_v2_state_complete(h2c, pos, end); } @@ -2463,7 +2484,7 @@ ngx_http_v2_parse_int(ngx_http_v2_connection_t *h2c, u_char **pos, u_char *end, static ngx_int_t -ngx_http_v2_send_settings(ngx_http_v2_connection_t *h2c, ngx_uint_t ack) +ngx_http_v2_send_settings(ngx_http_v2_connection_t *h2c) { size_t len; ngx_buf_t *buf; @@ -2471,8 +2492,8 @@ ngx_http_v2_send_settings(ngx_http_v2_connection_t *h2c, ngx_uint_t ack) ngx_http_v2_srv_conf_t *h2scf; ngx_http_v2_out_frame_t *frame; - ngx_log_debug1(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0, - "http2 send SETTINGS frame ack:%ui", ack); + ngx_log_debug0(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0, + "http2 send SETTINGS frame"); frame = ngx_palloc(h2c->pool, sizeof(ngx_http_v2_out_frame_t)); if (frame == NULL) { @@ -2484,7 +2505,7 @@ ngx_http_v2_send_settings(ngx_http_v2_connection_t *h2c, ngx_uint_t ack) return NGX_ERROR; } - len = ack ? 0 : (sizeof(uint16_t) + sizeof(uint32_t)) * 3; + len = NGX_HTTP_V2_SETTINGS_PARAM_SIZE * 3; buf = ngx_create_temp_buf(h2c->pool, NGX_HTTP_V2_FRAME_HEADER_SIZE + len); if (buf == NULL) { @@ -2508,28 +2529,26 @@ ngx_http_v2_send_settings(ngx_http_v2_connection_t *h2c, ngx_uint_t ack) buf->last = ngx_http_v2_write_len_and_type(buf->last, len, NGX_HTTP_V2_SETTINGS_FRAME); - *buf->last++ = ack ? NGX_HTTP_V2_ACK_FLAG : NGX_HTTP_V2_NO_FLAG; + *buf->last++ = NGX_HTTP_V2_NO_FLAG; buf->last = ngx_http_v2_write_sid(buf->last, 0); - if (!ack) { - h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx, - ngx_http_v2_module); + h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx, + ngx_http_v2_module); - buf->last = ngx_http_v2_write_uint16(buf->last, - NGX_HTTP_V2_MAX_STREAMS_SETTING); - buf->last = ngx_http_v2_write_uint32(buf->last, - h2scf->concurrent_streams); + buf->last = ngx_http_v2_write_uint16(buf->last, + NGX_HTTP_V2_MAX_STREAMS_SETTING); + buf->last = ngx_http_v2_write_uint32(buf->last, + h2scf->concurrent_streams); - buf->last = ngx_http_v2_write_uint16(buf->last, + buf->last = ngx_http_v2_write_uint16(buf->last, NGX_HTTP_V2_INIT_WINDOW_SIZE_SETTING); - buf->last = ngx_http_v2_write_uint32(buf->last, h2scf->preread_size); + buf->last = ngx_http_v2_write_uint32(buf->last, h2scf->preread_size); - buf->last = ngx_http_v2_write_uint16(buf->last, - NGX_HTTP_V2_MAX_FRAME_SIZE_SETTING); - buf->last = ngx_http_v2_write_uint32(buf->last, - NGX_HTTP_V2_MAX_FRAME_SIZE); - } + buf->last = ngx_http_v2_write_uint16(buf->last, + NGX_HTTP_V2_MAX_FRAME_SIZE_SETTING); + buf->last = ngx_http_v2_write_uint32(buf->last, + NGX_HTTP_V2_MAX_FRAME_SIZE); ngx_http_v2_queue_blocked_frame(h2c, frame); @@ -3313,6 +3332,7 @@ ngx_http_v2_construct_request_line(ngx_http_request_t *r) static const u_char ending[] = " HTTP/2.0"; if (r->method_name.len == 0 + || r->schema_start == NULL || r->unparsed_uri.len == 0) { ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST); Renamed: vendor/nginx-1.13.2/src/http/v2/ngx_http_v2.h (+9 -0) 98% =================================================================== --- vendor/nginx-1.13.1/src/http/v2/ngx_http_v2.h 2017-06-30 22:31:23 +0900 (be34a09) +++ vendor/nginx-1.13.2/src/http/v2/ngx_http_v2.h 2017-06-30 22:53:57 +0900 (4804658) @@ -261,6 +261,15 @@ ngx_http_v2_queue_blocked_frame(ngx_http_v2_connection_t *h2c, } +static ngx_inline void +ngx_http_v2_queue_ordered_frame(ngx_http_v2_connection_t *h2c, + ngx_http_v2_out_frame_t *frame) +{ + frame->next = h2c->last_out; + h2c->last_out = frame; +} + + void ngx_http_v2_init(ngx_event_t *rev); void ngx_http_v2_request_headers_init(void); Renamed: vendor/nginx-1.13.2/src/http/v2/ngx_http_v2_filter_module.c (+152 -14) 89% =================================================================== --- vendor/nginx-1.13.1/src/http/v2/ngx_http_v2_filter_module.c 2017-06-30 22:31:23 +0900 (7276531) +++ vendor/nginx-1.13.2/src/http/v2/ngx_http_v2_filter_module.c 2017-06-30 22:53:57 +0900 (8621e7a) @@ -50,13 +50,17 @@ #define NGX_HTTP_V2_SERVER_INDEX 54 #define NGX_HTTP_V2_VARY_INDEX 59 +#define NGX_HTTP_V2_NO_TRAILERS (ngx_http_v2_out_frame_t *) -1 + static u_char *ngx_http_v2_string_encode(u_char *dst, u_char *src, size_t len, u_char *tmp, ngx_uint_t lower); static u_char *ngx_http_v2_write_int(u_char *pos, ngx_uint_t prefix, ngx_uint_t value); static ngx_http_v2_out_frame_t *ngx_http_v2_create_headers_frame( - ngx_http_request_t *r, u_char *pos, u_char *end); + ngx_http_request_t *r, u_char *pos, u_char *end, ngx_uint_t fin); +static ngx_http_v2_out_frame_t *ngx_http_v2_create_trailers_frame( + ngx_http_request_t *r); static ngx_chain_t *ngx_http_v2_send_chain(ngx_connection_t *fc, ngx_chain_t *in, off_t limit); @@ -612,7 +616,7 @@ ngx_http_v2_header_filter(ngx_http_request_t *r) header[i].value.len, tmp); } - frame = ngx_http_v2_create_headers_frame(r, start, pos); + frame = ngx_http_v2_create_headers_frame(r, start, pos, r->header_only); if (frame == NULL) { return NGX_ERROR; } @@ -636,6 +640,118 @@ ngx_http_v2_header_filter(ngx_http_request_t *r) } +static ngx_http_v2_out_frame_t * +ngx_http_v2_create_trailers_frame(ngx_http_request_t *r) +{ + u_char *pos, *start, *tmp; + size_t len, tmp_len; + ngx_uint_t i; + ngx_list_part_t *part; + ngx_table_elt_t *header; + + len = 0; + tmp_len = 0; + + part = &r->headers_out.trailers.part; + header = part->elts; + + for (i = 0; /* void */; i++) { + + if (i >= part->nelts) { + if (part->next == NULL) { + break; + } + + part = part->next; + header = part->elts; + i = 0; + } + + if (header[i].hash == 0) { + continue; + } + + if (header[i].key.len > NGX_HTTP_V2_MAX_FIELD) { + ngx_log_error(NGX_LOG_CRIT, r->connection->log, 0, + "too long response trailer name: \"%V\"", + &header[i].key); + return NULL; + } + + if (header[i].value.len > NGX_HTTP_V2_MAX_FIELD) { + ngx_log_error(NGX_LOG_CRIT, r->connection->log, 0, + "too long response trailer value: \"%V: %V\"", + &header[i].key, &header[i].value); + return NULL; + } + + len += 1 + NGX_HTTP_V2_INT_OCTETS + header[i].key.len + + NGX_HTTP_V2_INT_OCTETS + header[i].value.len; + + if (header[i].key.len > tmp_len) { + tmp_len = header[i].key.len; + } + + if (header[i].value.len > tmp_len) { + tmp_len = header[i].value.len; + } + } + + if (len == 0) { + return NGX_HTTP_V2_NO_TRAILERS; + } + + tmp = ngx_palloc(r->pool, tmp_len); + pos = ngx_pnalloc(r->pool, len); + + if (pos == NULL || tmp == NULL) { + return NULL; + } + + start = pos; + + part = &r->headers_out.trailers.part; + header = part->elts; + + for (i = 0; /* void */; i++) { + + if (i >= part->nelts) { + if (part->next == NULL) { + break; + } + + part = part->next; + header = part->elts; + i = 0; + } + + if (header[i].hash == 0) { + continue; + } + +#if (NGX_DEBUG) + if (r->connection->log->log_level & NGX_LOG_DEBUG_HTTP) { + ngx_strlow(tmp, header[i].key.data, header[i].key.len); + + ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, + "http2 output trailer: \"%*s: %V\"", + header[i].key.len, tmp, &header[i].value); + } +#endif + + *pos++ = 0; + + pos = ngx_http_v2_write_name(pos, header[i].key.data, + header[i].key.len, tmp); + + pos = ngx_http_v2_write_value(pos, header[i].value.data, + header[i].value.len, tmp); + } + + return ngx_http_v2_create_headers_frame(r, start, pos, 1); +} + + static u_char * ngx_http_v2_string_encode(u_char *dst, u_char *src, size_t len, u_char *tmp, ngx_uint_t lower) @@ -686,7 +802,7 @@ ngx_http_v2_write_int(u_char *pos, ngx_uint_t prefix, ngx_uint_t value) static ngx_http_v2_out_frame_t * ngx_http_v2_create_headers_frame(ngx_http_request_t *r, u_char *pos, - u_char *end) + u_char *end, ngx_uint_t fin) { u_char type, flags; size_t rest, frame_size; @@ -707,12 +823,12 @@ ngx_http_v2_create_headers_frame(ngx_http_request_t *r, u_char *pos, frame->stream = stream; frame->length = rest; frame->blocked = 1; - frame->fin = r->header_only; + frame->fin = fin; ll = &frame->first; type = NGX_HTTP_V2_HEADERS_FRAME; - flags = r->header_only ? NGX_HTTP_V2_END_STREAM_FLAG : NGX_HTTP_V2_NO_FLAG; + flags = fin ? NGX_HTTP_V2_END_STREAM_FLAG : NGX_HTTP_V2_NO_FLAG; frame_size = stream->connection->frame_size; for ( ;; ) { @@ -776,7 +892,7 @@ ngx_http_v2_create_headers_frame(ngx_http_request_t *r, u_char *pos, continue; } - b->last_buf = r->header_only; + b->last_buf = fin; cl->next = NULL; frame->last = cl; @@ -798,7 +914,7 @@ ngx_http_v2_send_chain(ngx_connection_t *fc, ngx_chain_t *in, off_t limit) ngx_http_request_t *r; ngx_http_v2_stream_t *stream; ngx_http_v2_loc_conf_t *h2lcf; - ngx_http_v2_out_frame_t *frame; + ngx_http_v2_out_frame_t *frame, *trailers; ngx_http_v2_connection_t *h2c; r = fc->data; @@ -872,6 +988,8 @@ ngx_http_v2_send_chain(ngx_connection_t *fc, ngx_chain_t *in, off_t limit) frame_size = (h2lcf->chunk_size < h2c->frame_size) ? h2lcf->chunk_size : h2c->frame_size; + trailers = NGX_HTTP_V2_NO_TRAILERS; + #if (NGX_SUPPRESS_WARN) cl = NULL; #endif @@ -934,19 +1052,39 @@ ngx_http_v2_send_chain(ngx_connection_t *fc, ngx_chain_t *in, off_t limit) size -= rest; } - frame = ngx_http_v2_filter_get_data_frame(stream, frame_size, out, cl); - if (frame == NULL) { - return NGX_CHAIN_ERROR; + if (cl->buf->last_buf) { + trailers = ngx_http_v2_create_trailers_frame(r); + if (trailers == NULL) { + return NGX_CHAIN_ERROR; + } + + if (trailers != NGX_HTTP_V2_NO_TRAILERS) { + cl->buf->last_buf = 0; + } } - ngx_http_v2_queue_frame(h2c, frame); + if (frame_size || cl->buf->last_buf) { + frame = ngx_http_v2_filter_get_data_frame(stream, frame_size, + out, cl); + if (frame == NULL) { + return NGX_CHAIN_ERROR; + } + + ngx_http_v2_queue_frame(h2c, frame); - h2c->send_window -= frame_size; + h2c->send_window -= frame_size; - stream->send_window -= frame_size; - stream->queued++; + stream->send_window -= frame_size; + stream->queued++; + } if (in == NULL) { + + if (trailers != NGX_HTTP_V2_NO_TRAILERS) { + ngx_http_v2_queue_frame(h2c, trailers); + stream->queued++; + } + break; } Renamed: vendor/nginx-1.13.2/src/http/v2/ngx_http_v2_huff_decode.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/v2/ngx_http_v2_huff_encode.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/v2/ngx_http_v2_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/v2/ngx_http_v2_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/http/v2/ngx_http_v2_table.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/mail/ngx_mail.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/mail/ngx_mail.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/mail/ngx_mail_auth_http_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/mail/ngx_mail_core_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/mail/ngx_mail_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/mail/ngx_mail_imap_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/mail/ngx_mail_imap_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/mail/ngx_mail_imap_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/mail/ngx_mail_parse.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/mail/ngx_mail_pop3_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/mail/ngx_mail_pop3_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/mail/ngx_mail_pop3_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/mail/ngx_mail_proxy_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/mail/ngx_mail_smtp_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/mail/ngx_mail_smtp_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/mail/ngx_mail_smtp_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/mail/ngx_mail_ssl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/mail/ngx_mail_ssl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/misc/ngx_cpp_test_module.cpp (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/misc/ngx_google_perftools_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_alloc.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_alloc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_atomic.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_channel.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_channel.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_daemon.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_darwin.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_darwin_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_darwin_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_darwin_sendfile_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_dlopen.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_dlopen.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_errno.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_errno.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_file_aio_read.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_files.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_files.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_freebsd.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_freebsd_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_freebsd_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_freebsd_sendfile_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_gcc_atomic_amd64.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_gcc_atomic_ppc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_gcc_atomic_sparc64.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_gcc_atomic_x86.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_linux.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_linux_aio_read.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_linux_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_linux_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_linux_sendfile_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_os.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_posix_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_posix_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_process.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_process.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_process_cycle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_process_cycle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_readv_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_recv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_send.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_setaffinity.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_setaffinity.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_setproctitle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_setproctitle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_shmem.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_shmem.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_socket.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_socket.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_solaris.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_solaris_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_solaris_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_solaris_sendfilev_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_sunpro_amd64.il (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_sunpro_atomic_sparc64.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_sunpro_sparc64.il (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_sunpro_x86.il (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_thread.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_thread_cond.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_thread_id.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_thread_mutex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_time.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_time.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_udp_recv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_udp_send.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_udp_sendmsg_chain.c (+3 -3) 97% =================================================================== --- vendor/nginx-1.13.1/src/os/unix/ngx_udp_sendmsg_chain.c 2017-06-30 22:31:23 +0900 (5f1cfa5) +++ vendor/nginx-1.13.2/src/os/unix/ngx_udp_sendmsg_chain.c 2017-06-30 22:53:57 +0900 (5399c79) @@ -206,13 +206,13 @@ ngx_sendmsg(ngx_connection_t *c, ngx_iovec_t *vec) #if (NGX_HAVE_MSGHDR_MSG_CONTROL) #if (NGX_HAVE_IP_SENDSRCADDR) - u_char msg_control[CMSG_SPACE(sizeof(struct in_addr))]; + u_char msg_control[CMSG_SPACE(sizeof(struct in_addr))]; #elif (NGX_HAVE_IP_PKTINFO) - u_char msg_control[CMSG_SPACE(sizeof(struct in_pktinfo))]; + u_char msg_control[CMSG_SPACE(sizeof(struct in_pktinfo))]; #endif #if (NGX_HAVE_INET6 && NGX_HAVE_IPV6_RECVPKTINFO) - u_char msg_control6[CMSG_SPACE(sizeof(struct in6_pktinfo))]; + u_char msg_control6[CMSG_SPACE(sizeof(struct in6_pktinfo))]; #endif #endif Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_user.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_user.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/unix/ngx_writev_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/nginx.ico (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/nginx.rc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/nginx_icon16.xpm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/nginx_icon32.xpm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/nginx_icon48.xpm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/ngx_alloc.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/ngx_alloc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/ngx_atomic.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/ngx_dlopen.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/ngx_dlopen.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/ngx_errno.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/ngx_errno.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/ngx_event_log.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/ngx_files.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/ngx_files.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/ngx_os.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/ngx_process.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/ngx_process.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/ngx_process_cycle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/ngx_process_cycle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/ngx_service.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/ngx_shmem.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/ngx_shmem.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/ngx_socket.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/ngx_socket.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/ngx_stat.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/ngx_thread.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/ngx_thread.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/ngx_time.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/ngx_time.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/ngx_udp_wsarecv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/ngx_user.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/ngx_user.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/ngx_win32_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/ngx_win32_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/ngx_wsarecv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/ngx_wsarecv_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/ngx_wsasend.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/os/win32/ngx_wsasend_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/stream/ngx_stream.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/stream/ngx_stream.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/stream/ngx_stream_access_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/stream/ngx_stream_core_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/stream/ngx_stream_geo_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/stream/ngx_stream_geoip_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/stream/ngx_stream_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/stream/ngx_stream_limit_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/stream/ngx_stream_log_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/stream/ngx_stream_map_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/stream/ngx_stream_proxy_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/stream/ngx_stream_realip_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/stream/ngx_stream_return_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/stream/ngx_stream_script.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/stream/ngx_stream_script.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/stream/ngx_stream_split_clients_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/stream/ngx_stream_ssl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/stream/ngx_stream_ssl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/stream/ngx_stream_ssl_preread_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/stream/ngx_stream_upstream.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/stream/ngx_stream_upstream.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/stream/ngx_stream_upstream_hash_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/stream/ngx_stream_upstream_least_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/stream/ngx_stream_upstream_round_robin.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/stream/ngx_stream_upstream_round_robin.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/stream/ngx_stream_upstream_zone_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/stream/ngx_stream_variables.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/stream/ngx_stream_variables.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.13.2/src/stream/ngx_stream_write_filter_module.c (+0 -0) 100% ===================================================================
