Kentaro Hayashi
null+****@clear*****
Thu Apr 6 14:58:34 JST 2017
Kentaro Hayashi 2017-04-06 14:58:34 +0900 (Thu, 06 Apr 2017) New Revision: dbefb40010e270f446ac5b3c64577427d2f43190 https://github.com/groonga/groonga/commit/dbefb40010e270f446ac5b3c64577427d2f43190 Message: nginx: update latest release $ ./update_nginx.sh 1.11.13 Modified files: nginx_version Renamed files: vendor/nginx-1.11.13/auto/cc/acc (from vendor/nginx-1.11.12/auto/cc/acc) vendor/nginx-1.11.13/auto/cc/bcc (from vendor/nginx-1.11.12/auto/cc/bcc) vendor/nginx-1.11.13/auto/cc/ccc (from vendor/nginx-1.11.12/auto/cc/ccc) vendor/nginx-1.11.13/auto/cc/clang (from vendor/nginx-1.11.12/auto/cc/clang) vendor/nginx-1.11.13/auto/cc/conf (from vendor/nginx-1.11.12/auto/cc/conf) vendor/nginx-1.11.13/auto/cc/gcc (from vendor/nginx-1.11.12/auto/cc/gcc) vendor/nginx-1.11.13/auto/cc/icc (from vendor/nginx-1.11.12/auto/cc/icc) vendor/nginx-1.11.13/auto/cc/msvc (from vendor/nginx-1.11.12/auto/cc/msvc) vendor/nginx-1.11.13/auto/cc/name (from vendor/nginx-1.11.12/auto/cc/name) vendor/nginx-1.11.13/auto/cc/owc (from vendor/nginx-1.11.12/auto/cc/owc) vendor/nginx-1.11.13/auto/cc/sunc (from vendor/nginx-1.11.12/auto/cc/sunc) vendor/nginx-1.11.13/auto/configure (from vendor/nginx-1.11.12/auto/configure) vendor/nginx-1.11.13/auto/define (from vendor/nginx-1.11.12/auto/define) vendor/nginx-1.11.13/auto/endianness (from vendor/nginx-1.11.12/auto/endianness) vendor/nginx-1.11.13/auto/feature (from vendor/nginx-1.11.12/auto/feature) vendor/nginx-1.11.13/auto/have (from vendor/nginx-1.11.12/auto/have) vendor/nginx-1.11.13/auto/have_headers (from vendor/nginx-1.11.12/auto/have_headers) vendor/nginx-1.11.13/auto/headers (from vendor/nginx-1.11.12/auto/headers) vendor/nginx-1.11.13/auto/include (from vendor/nginx-1.11.12/auto/include) vendor/nginx-1.11.13/auto/init (from vendor/nginx-1.11.12/auto/init) vendor/nginx-1.11.13/auto/install (from vendor/nginx-1.11.12/auto/install) vendor/nginx-1.11.13/auto/lib/conf (from vendor/nginx-1.11.12/auto/lib/conf) vendor/nginx-1.11.13/auto/lib/geoip/conf (from vendor/nginx-1.11.12/auto/lib/geoip/conf) vendor/nginx-1.11.13/auto/lib/google-perftools/conf (from vendor/nginx-1.11.12/auto/lib/google-perftools/conf) vendor/nginx-1.11.13/auto/lib/libatomic/conf (from vendor/nginx-1.11.12/auto/lib/libatomic/conf) vendor/nginx-1.11.13/auto/lib/libatomic/make (from vendor/nginx-1.11.12/auto/lib/libatomic/make) vendor/nginx-1.11.13/auto/lib/libgd/conf (from vendor/nginx-1.11.12/auto/lib/libgd/conf) vendor/nginx-1.11.13/auto/lib/libxslt/conf (from vendor/nginx-1.11.12/auto/lib/libxslt/conf) vendor/nginx-1.11.13/auto/lib/make (from vendor/nginx-1.11.12/auto/lib/make) vendor/nginx-1.11.13/auto/lib/openssl/conf (from vendor/nginx-1.11.12/auto/lib/openssl/conf) vendor/nginx-1.11.13/auto/lib/openssl/make (from vendor/nginx-1.11.12/auto/lib/openssl/make) vendor/nginx-1.11.13/auto/lib/openssl/makefile.bcc (from vendor/nginx-1.11.12/auto/lib/openssl/makefile.bcc) vendor/nginx-1.11.13/auto/lib/openssl/makefile.msvc (from vendor/nginx-1.11.12/auto/lib/openssl/makefile.msvc) vendor/nginx-1.11.13/auto/lib/pcre/conf (from vendor/nginx-1.11.12/auto/lib/pcre/conf) vendor/nginx-1.11.13/auto/lib/pcre/make (from vendor/nginx-1.11.12/auto/lib/pcre/make) vendor/nginx-1.11.13/auto/lib/pcre/makefile.bcc (from vendor/nginx-1.11.12/auto/lib/pcre/makefile.bcc) vendor/nginx-1.11.13/auto/lib/pcre/makefile.msvc (from vendor/nginx-1.11.12/auto/lib/pcre/makefile.msvc) vendor/nginx-1.11.13/auto/lib/pcre/makefile.owc (from vendor/nginx-1.11.12/auto/lib/pcre/makefile.owc) vendor/nginx-1.11.13/auto/lib/perl/conf (from vendor/nginx-1.11.12/auto/lib/perl/conf) vendor/nginx-1.11.13/auto/lib/perl/make (from vendor/nginx-1.11.12/auto/lib/perl/make) vendor/nginx-1.11.13/auto/lib/zlib/conf (from vendor/nginx-1.11.12/auto/lib/zlib/conf) vendor/nginx-1.11.13/auto/lib/zlib/make (from vendor/nginx-1.11.12/auto/lib/zlib/make) vendor/nginx-1.11.13/auto/lib/zlib/makefile.bcc (from vendor/nginx-1.11.12/auto/lib/zlib/makefile.bcc) vendor/nginx-1.11.13/auto/lib/zlib/makefile.msvc (from vendor/nginx-1.11.12/auto/lib/zlib/makefile.msvc) vendor/nginx-1.11.13/auto/lib/zlib/makefile.owc (from vendor/nginx-1.11.12/auto/lib/zlib/makefile.owc) vendor/nginx-1.11.13/auto/make (from vendor/nginx-1.11.12/auto/make) vendor/nginx-1.11.13/auto/module (from vendor/nginx-1.11.12/auto/module) vendor/nginx-1.11.13/auto/modules (from vendor/nginx-1.11.12/auto/modules) vendor/nginx-1.11.13/auto/nohave (from vendor/nginx-1.11.12/auto/nohave) vendor/nginx-1.11.13/auto/options (from vendor/nginx-1.11.12/auto/options) vendor/nginx-1.11.13/auto/os/conf (from vendor/nginx-1.11.12/auto/os/conf) vendor/nginx-1.11.13/auto/os/darwin (from vendor/nginx-1.11.12/auto/os/darwin) vendor/nginx-1.11.13/auto/os/freebsd (from vendor/nginx-1.11.12/auto/os/freebsd) vendor/nginx-1.11.13/auto/os/linux (from vendor/nginx-1.11.12/auto/os/linux) vendor/nginx-1.11.13/auto/os/solaris (from vendor/nginx-1.11.12/auto/os/solaris) vendor/nginx-1.11.13/auto/os/win32 (from vendor/nginx-1.11.12/auto/os/win32) vendor/nginx-1.11.13/auto/sources (from vendor/nginx-1.11.12/auto/sources) vendor/nginx-1.11.13/auto/stubs (from vendor/nginx-1.11.12/auto/stubs) vendor/nginx-1.11.13/auto/summary (from vendor/nginx-1.11.12/auto/summary) vendor/nginx-1.11.13/auto/threads (from vendor/nginx-1.11.12/auto/threads) vendor/nginx-1.11.13/auto/types/sizeof (from vendor/nginx-1.11.12/auto/types/sizeof) vendor/nginx-1.11.13/auto/types/typedef (from vendor/nginx-1.11.12/auto/types/typedef) vendor/nginx-1.11.13/auto/types/uintptr_t (from vendor/nginx-1.11.12/auto/types/uintptr_t) vendor/nginx-1.11.13/auto/types/value (from vendor/nginx-1.11.12/auto/types/value) vendor/nginx-1.11.13/auto/unix (from vendor/nginx-1.11.12/auto/unix) vendor/nginx-1.11.13/conf/fastcgi.conf (from vendor/nginx-1.11.12/conf/fastcgi.conf) vendor/nginx-1.11.13/conf/fastcgi_params (from vendor/nginx-1.11.12/conf/fastcgi_params) vendor/nginx-1.11.13/conf/koi-utf (from vendor/nginx-1.11.12/conf/koi-utf) vendor/nginx-1.11.13/conf/koi-win (from vendor/nginx-1.11.12/conf/koi-win) vendor/nginx-1.11.13/conf/mime.types (from vendor/nginx-1.11.12/conf/mime.types) vendor/nginx-1.11.13/conf/nginx.conf (from vendor/nginx-1.11.12/conf/nginx.conf) vendor/nginx-1.11.13/conf/scgi_params (from vendor/nginx-1.11.12/conf/scgi_params) vendor/nginx-1.11.13/conf/uwsgi_params (from vendor/nginx-1.11.12/conf/uwsgi_params) vendor/nginx-1.11.13/conf/win-utf (from vendor/nginx-1.11.12/conf/win-utf) vendor/nginx-1.11.13/contrib/README (from vendor/nginx-1.11.12/contrib/README) vendor/nginx-1.11.13/contrib/geo2nginx.pl (from vendor/nginx-1.11.12/contrib/geo2nginx.pl) vendor/nginx-1.11.13/contrib/unicode2nginx/koi-utf (from vendor/nginx-1.11.12/contrib/unicode2nginx/koi-utf) vendor/nginx-1.11.13/contrib/unicode2nginx/unicode-to-nginx.pl (from vendor/nginx-1.11.12/contrib/unicode2nginx/unicode-to-nginx.pl) vendor/nginx-1.11.13/contrib/unicode2nginx/win-utf (from vendor/nginx-1.11.12/contrib/unicode2nginx/win-utf) vendor/nginx-1.11.13/contrib/vim/ftdetect/nginx.vim (from vendor/nginx-1.11.12/contrib/vim/ftdetect/nginx.vim) vendor/nginx-1.11.13/contrib/vim/ftplugin/nginx.vim (from vendor/nginx-1.11.12/contrib/vim/ftplugin/nginx.vim) vendor/nginx-1.11.13/contrib/vim/indent/nginx.vim (from vendor/nginx-1.11.12/contrib/vim/indent/nginx.vim) vendor/nginx-1.11.13/contrib/vim/syntax/nginx.vim (from vendor/nginx-1.11.12/contrib/vim/syntax/nginx.vim) vendor/nginx-1.11.13/docs/GNUmakefile (from vendor/nginx-1.11.12/docs/GNUmakefile) vendor/nginx-1.11.13/docs/dtd/change_log_conf.dtd (from vendor/nginx-1.11.12/docs/dtd/change_log_conf.dtd) vendor/nginx-1.11.13/docs/dtd/changes.dtd (from vendor/nginx-1.11.12/docs/dtd/changes.dtd) vendor/nginx-1.11.13/docs/html/50x.html (from vendor/nginx-1.11.12/docs/html/50x.html) vendor/nginx-1.11.13/docs/html/index.html (from vendor/nginx-1.11.12/docs/html/index.html) vendor/nginx-1.11.13/docs/man/nginx.8 (from vendor/nginx-1.11.12/docs/man/nginx.8) vendor/nginx-1.11.13/docs/text/LICENSE (from vendor/nginx-1.11.12/docs/text/LICENSE) vendor/nginx-1.11.13/docs/text/README (from vendor/nginx-1.11.12/docs/text/README) vendor/nginx-1.11.13/docs/xml/change_log_conf.xml (from vendor/nginx-1.11.12/docs/xml/change_log_conf.xml) vendor/nginx-1.11.13/docs/xml/nginx/changes.xml (from vendor/nginx-1.11.12/docs/xml/nginx/changes.xml) vendor/nginx-1.11.13/docs/xsls/changes.xsls (from vendor/nginx-1.11.12/docs/xsls/changes.xsls) vendor/nginx-1.11.13/docs/xslt/changes.xslt (from vendor/nginx-1.11.12/docs/xslt/changes.xslt) vendor/nginx-1.11.13/misc/GNUmakefile (from vendor/nginx-1.11.12/misc/GNUmakefile) vendor/nginx-1.11.13/misc/README (from vendor/nginx-1.11.12/misc/README) vendor/nginx-1.11.13/src/core/nginx.c (from vendor/nginx-1.11.12/src/core/nginx.c) vendor/nginx-1.11.13/src/core/nginx.h (from vendor/nginx-1.11.12/src/core/nginx.h) vendor/nginx-1.11.13/src/core/ngx_array.c (from vendor/nginx-1.11.12/src/core/ngx_array.c) vendor/nginx-1.11.13/src/core/ngx_array.h (from vendor/nginx-1.11.12/src/core/ngx_array.h) vendor/nginx-1.11.13/src/core/ngx_buf.c (from vendor/nginx-1.11.12/src/core/ngx_buf.c) vendor/nginx-1.11.13/src/core/ngx_buf.h (from vendor/nginx-1.11.12/src/core/ngx_buf.h) vendor/nginx-1.11.13/src/core/ngx_conf_file.c (from vendor/nginx-1.11.12/src/core/ngx_conf_file.c) vendor/nginx-1.11.13/src/core/ngx_conf_file.h (from vendor/nginx-1.11.12/src/core/ngx_conf_file.h) vendor/nginx-1.11.13/src/core/ngx_config.h (from vendor/nginx-1.11.12/src/core/ngx_config.h) vendor/nginx-1.11.13/src/core/ngx_connection.c (from vendor/nginx-1.11.12/src/core/ngx_connection.c) vendor/nginx-1.11.13/src/core/ngx_connection.h (from vendor/nginx-1.11.12/src/core/ngx_connection.h) vendor/nginx-1.11.13/src/core/ngx_core.h (from vendor/nginx-1.11.12/src/core/ngx_core.h) vendor/nginx-1.11.13/src/core/ngx_cpuinfo.c (from vendor/nginx-1.11.12/src/core/ngx_cpuinfo.c) vendor/nginx-1.11.13/src/core/ngx_crc.h (from vendor/nginx-1.11.12/src/core/ngx_crc.h) vendor/nginx-1.11.13/src/core/ngx_crc32.c (from vendor/nginx-1.11.12/src/core/ngx_crc32.c) vendor/nginx-1.11.13/src/core/ngx_crc32.h (from vendor/nginx-1.11.12/src/core/ngx_crc32.h) vendor/nginx-1.11.13/src/core/ngx_crypt.c (from vendor/nginx-1.11.12/src/core/ngx_crypt.c) vendor/nginx-1.11.13/src/core/ngx_crypt.h (from vendor/nginx-1.11.12/src/core/ngx_crypt.h) vendor/nginx-1.11.13/src/core/ngx_cycle.c (from vendor/nginx-1.11.12/src/core/ngx_cycle.c) vendor/nginx-1.11.13/src/core/ngx_cycle.h (from vendor/nginx-1.11.12/src/core/ngx_cycle.h) vendor/nginx-1.11.13/src/core/ngx_file.c (from vendor/nginx-1.11.12/src/core/ngx_file.c) vendor/nginx-1.11.13/src/core/ngx_file.h (from vendor/nginx-1.11.12/src/core/ngx_file.h) vendor/nginx-1.11.13/src/core/ngx_hash.c (from vendor/nginx-1.11.12/src/core/ngx_hash.c) vendor/nginx-1.11.13/src/core/ngx_hash.h (from vendor/nginx-1.11.12/src/core/ngx_hash.h) vendor/nginx-1.11.13/src/core/ngx_inet.c (from vendor/nginx-1.11.12/src/core/ngx_inet.c) vendor/nginx-1.11.13/src/core/ngx_inet.h (from vendor/nginx-1.11.12/src/core/ngx_inet.h) vendor/nginx-1.11.13/src/core/ngx_list.c (from vendor/nginx-1.11.12/src/core/ngx_list.c) vendor/nginx-1.11.13/src/core/ngx_list.h (from vendor/nginx-1.11.12/src/core/ngx_list.h) vendor/nginx-1.11.13/src/core/ngx_log.c (from vendor/nginx-1.11.12/src/core/ngx_log.c) vendor/nginx-1.11.13/src/core/ngx_log.h (from vendor/nginx-1.11.12/src/core/ngx_log.h) vendor/nginx-1.11.13/src/core/ngx_md5.c (from vendor/nginx-1.11.12/src/core/ngx_md5.c) vendor/nginx-1.11.13/src/core/ngx_md5.h (from vendor/nginx-1.11.12/src/core/ngx_md5.h) vendor/nginx-1.11.13/src/core/ngx_module.c (from vendor/nginx-1.11.12/src/core/ngx_module.c) vendor/nginx-1.11.13/src/core/ngx_module.h (from vendor/nginx-1.11.12/src/core/ngx_module.h) vendor/nginx-1.11.13/src/core/ngx_murmurhash.c (from vendor/nginx-1.11.12/src/core/ngx_murmurhash.c) vendor/nginx-1.11.13/src/core/ngx_murmurhash.h (from vendor/nginx-1.11.12/src/core/ngx_murmurhash.h) vendor/nginx-1.11.13/src/core/ngx_open_file_cache.c (from vendor/nginx-1.11.12/src/core/ngx_open_file_cache.c) vendor/nginx-1.11.13/src/core/ngx_open_file_cache.h (from vendor/nginx-1.11.12/src/core/ngx_open_file_cache.h) vendor/nginx-1.11.13/src/core/ngx_output_chain.c (from vendor/nginx-1.11.12/src/core/ngx_output_chain.c) vendor/nginx-1.11.13/src/core/ngx_palloc.c (from vendor/nginx-1.11.12/src/core/ngx_palloc.c) vendor/nginx-1.11.13/src/core/ngx_palloc.h (from vendor/nginx-1.11.12/src/core/ngx_palloc.h) vendor/nginx-1.11.13/src/core/ngx_parse.c (from vendor/nginx-1.11.12/src/core/ngx_parse.c) vendor/nginx-1.11.13/src/core/ngx_parse.h (from vendor/nginx-1.11.12/src/core/ngx_parse.h) vendor/nginx-1.11.13/src/core/ngx_parse_time.c (from vendor/nginx-1.11.12/src/core/ngx_parse_time.c) vendor/nginx-1.11.13/src/core/ngx_parse_time.h (from vendor/nginx-1.11.12/src/core/ngx_parse_time.h) vendor/nginx-1.11.13/src/core/ngx_proxy_protocol.c (from vendor/nginx-1.11.12/src/core/ngx_proxy_protocol.c) vendor/nginx-1.11.13/src/core/ngx_proxy_protocol.h (from vendor/nginx-1.11.12/src/core/ngx_proxy_protocol.h) vendor/nginx-1.11.13/src/core/ngx_queue.c (from vendor/nginx-1.11.12/src/core/ngx_queue.c) vendor/nginx-1.11.13/src/core/ngx_queue.h (from vendor/nginx-1.11.12/src/core/ngx_queue.h) vendor/nginx-1.11.13/src/core/ngx_radix_tree.c (from vendor/nginx-1.11.12/src/core/ngx_radix_tree.c) vendor/nginx-1.11.13/src/core/ngx_radix_tree.h (from vendor/nginx-1.11.12/src/core/ngx_radix_tree.h) vendor/nginx-1.11.13/src/core/ngx_rbtree.c (from vendor/nginx-1.11.12/src/core/ngx_rbtree.c) vendor/nginx-1.11.13/src/core/ngx_rbtree.h (from vendor/nginx-1.11.12/src/core/ngx_rbtree.h) vendor/nginx-1.11.13/src/core/ngx_regex.c (from vendor/nginx-1.11.12/src/core/ngx_regex.c) vendor/nginx-1.11.13/src/core/ngx_regex.h (from vendor/nginx-1.11.12/src/core/ngx_regex.h) vendor/nginx-1.11.13/src/core/ngx_resolver.c (from vendor/nginx-1.11.12/src/core/ngx_resolver.c) vendor/nginx-1.11.13/src/core/ngx_resolver.h (from vendor/nginx-1.11.12/src/core/ngx_resolver.h) vendor/nginx-1.11.13/src/core/ngx_rwlock.c (from vendor/nginx-1.11.12/src/core/ngx_rwlock.c) vendor/nginx-1.11.13/src/core/ngx_rwlock.h (from vendor/nginx-1.11.12/src/core/ngx_rwlock.h) vendor/nginx-1.11.13/src/core/ngx_sha1.c (from vendor/nginx-1.11.12/src/core/ngx_sha1.c) vendor/nginx-1.11.13/src/core/ngx_sha1.h (from vendor/nginx-1.11.12/src/core/ngx_sha1.h) vendor/nginx-1.11.13/src/core/ngx_shmtx.c (from vendor/nginx-1.11.12/src/core/ngx_shmtx.c) vendor/nginx-1.11.13/src/core/ngx_shmtx.h (from vendor/nginx-1.11.12/src/core/ngx_shmtx.h) vendor/nginx-1.11.13/src/core/ngx_slab.c (from vendor/nginx-1.11.12/src/core/ngx_slab.c) vendor/nginx-1.11.13/src/core/ngx_slab.h (from vendor/nginx-1.11.12/src/core/ngx_slab.h) vendor/nginx-1.11.13/src/core/ngx_spinlock.c (from vendor/nginx-1.11.12/src/core/ngx_spinlock.c) vendor/nginx-1.11.13/src/core/ngx_string.c (from vendor/nginx-1.11.12/src/core/ngx_string.c) vendor/nginx-1.11.13/src/core/ngx_string.h (from vendor/nginx-1.11.12/src/core/ngx_string.h) vendor/nginx-1.11.13/src/core/ngx_syslog.c (from vendor/nginx-1.11.12/src/core/ngx_syslog.c) vendor/nginx-1.11.13/src/core/ngx_syslog.h (from vendor/nginx-1.11.12/src/core/ngx_syslog.h) vendor/nginx-1.11.13/src/core/ngx_thread_pool.c (from vendor/nginx-1.11.12/src/core/ngx_thread_pool.c) vendor/nginx-1.11.13/src/core/ngx_thread_pool.h (from vendor/nginx-1.11.12/src/core/ngx_thread_pool.h) vendor/nginx-1.11.13/src/core/ngx_times.c (from vendor/nginx-1.11.12/src/core/ngx_times.c) vendor/nginx-1.11.13/src/core/ngx_times.h (from vendor/nginx-1.11.12/src/core/ngx_times.h) vendor/nginx-1.11.13/src/event/modules/ngx_devpoll_module.c (from vendor/nginx-1.11.12/src/event/modules/ngx_devpoll_module.c) vendor/nginx-1.11.13/src/event/modules/ngx_epoll_module.c (from vendor/nginx-1.11.12/src/event/modules/ngx_epoll_module.c) vendor/nginx-1.11.13/src/event/modules/ngx_eventport_module.c (from vendor/nginx-1.11.12/src/event/modules/ngx_eventport_module.c) vendor/nginx-1.11.13/src/event/modules/ngx_iocp_module.c (from vendor/nginx-1.11.12/src/event/modules/ngx_iocp_module.c) vendor/nginx-1.11.13/src/event/modules/ngx_iocp_module.h (from vendor/nginx-1.11.12/src/event/modules/ngx_iocp_module.h) vendor/nginx-1.11.13/src/event/modules/ngx_kqueue_module.c (from vendor/nginx-1.11.12/src/event/modules/ngx_kqueue_module.c) vendor/nginx-1.11.13/src/event/modules/ngx_poll_module.c (from vendor/nginx-1.11.12/src/event/modules/ngx_poll_module.c) vendor/nginx-1.11.13/src/event/modules/ngx_select_module.c (from vendor/nginx-1.11.12/src/event/modules/ngx_select_module.c) vendor/nginx-1.11.13/src/event/modules/ngx_win32_select_module.c (from vendor/nginx-1.11.12/src/event/modules/ngx_win32_select_module.c) vendor/nginx-1.11.13/src/event/ngx_event.c (from vendor/nginx-1.11.12/src/event/ngx_event.c) vendor/nginx-1.11.13/src/event/ngx_event.h (from vendor/nginx-1.11.12/src/event/ngx_event.h) vendor/nginx-1.11.13/src/event/ngx_event_accept.c (from vendor/nginx-1.11.12/src/event/ngx_event_accept.c) vendor/nginx-1.11.13/src/event/ngx_event_acceptex.c (from vendor/nginx-1.11.12/src/event/ngx_event_acceptex.c) vendor/nginx-1.11.13/src/event/ngx_event_connect.c (from vendor/nginx-1.11.12/src/event/ngx_event_connect.c) vendor/nginx-1.11.13/src/event/ngx_event_connect.h (from vendor/nginx-1.11.12/src/event/ngx_event_connect.h) vendor/nginx-1.11.13/src/event/ngx_event_connectex.c (from vendor/nginx-1.11.12/src/event/ngx_event_connectex.c) vendor/nginx-1.11.13/src/event/ngx_event_openssl.c (from vendor/nginx-1.11.12/src/event/ngx_event_openssl.c) vendor/nginx-1.11.13/src/event/ngx_event_openssl.h (from vendor/nginx-1.11.12/src/event/ngx_event_openssl.h) vendor/nginx-1.11.13/src/event/ngx_event_openssl_stapling.c (from vendor/nginx-1.11.12/src/event/ngx_event_openssl_stapling.c) vendor/nginx-1.11.13/src/event/ngx_event_pipe.c (from vendor/nginx-1.11.12/src/event/ngx_event_pipe.c) vendor/nginx-1.11.13/src/event/ngx_event_pipe.h (from vendor/nginx-1.11.12/src/event/ngx_event_pipe.h) vendor/nginx-1.11.13/src/event/ngx_event_posted.c (from vendor/nginx-1.11.12/src/event/ngx_event_posted.c) vendor/nginx-1.11.13/src/event/ngx_event_posted.h (from vendor/nginx-1.11.12/src/event/ngx_event_posted.h) vendor/nginx-1.11.13/src/event/ngx_event_timer.c (from vendor/nginx-1.11.12/src/event/ngx_event_timer.c) vendor/nginx-1.11.13/src/event/ngx_event_timer.h (from vendor/nginx-1.11.12/src/event/ngx_event_timer.h) vendor/nginx-1.11.13/src/http/modules/ngx_http_access_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_access_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_addition_filter_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_addition_filter_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_auth_basic_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_auth_basic_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_auth_request_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_auth_request_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_autoindex_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_autoindex_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_browser_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_browser_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_charset_filter_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_charset_filter_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_chunked_filter_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_chunked_filter_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_dav_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_dav_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_degradation_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_degradation_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_empty_gif_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_empty_gif_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_fastcgi_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_fastcgi_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_flv_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_flv_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_geo_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_geo_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_geoip_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_geoip_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_gunzip_filter_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_gunzip_filter_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_gzip_filter_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_gzip_filter_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_gzip_static_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_gzip_static_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_headers_filter_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_headers_filter_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_image_filter_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_image_filter_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_index_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_index_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_limit_conn_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_limit_conn_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_limit_req_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_limit_req_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_log_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_log_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_map_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_map_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_memcached_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_memcached_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_mp4_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_mp4_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_not_modified_filter_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_not_modified_filter_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_proxy_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_proxy_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_random_index_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_random_index_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_range_filter_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_range_filter_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_realip_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_realip_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_referer_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_referer_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_rewrite_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_rewrite_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_scgi_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_scgi_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_secure_link_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_secure_link_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_slice_filter_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_slice_filter_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_split_clients_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_split_clients_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_ssi_filter_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_ssi_filter_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_ssi_filter_module.h (from vendor/nginx-1.11.12/src/http/modules/ngx_http_ssi_filter_module.h) vendor/nginx-1.11.13/src/http/modules/ngx_http_ssl_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_ssl_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_ssl_module.h (from vendor/nginx-1.11.12/src/http/modules/ngx_http_ssl_module.h) vendor/nginx-1.11.13/src/http/modules/ngx_http_static_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_static_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_stub_status_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_stub_status_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_sub_filter_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_sub_filter_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_upstream_hash_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_upstream_hash_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_upstream_ip_hash_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_upstream_ip_hash_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_upstream_keepalive_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_upstream_keepalive_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_upstream_least_conn_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_upstream_least_conn_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_upstream_zone_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_upstream_zone_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_userid_filter_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_userid_filter_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_uwsgi_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_uwsgi_module.c) vendor/nginx-1.11.13/src/http/modules/ngx_http_xslt_filter_module.c (from vendor/nginx-1.11.12/src/http/modules/ngx_http_xslt_filter_module.c) vendor/nginx-1.11.13/src/http/modules/perl/Makefile.PL (from vendor/nginx-1.11.12/src/http/modules/perl/Makefile.PL) vendor/nginx-1.11.13/src/http/modules/perl/nginx.pm (from vendor/nginx-1.11.12/src/http/modules/perl/nginx.pm) vendor/nginx-1.11.13/src/http/modules/perl/nginx.xs (from vendor/nginx-1.11.12/src/http/modules/perl/nginx.xs) vendor/nginx-1.11.13/src/http/modules/perl/ngx_http_perl_module.c (from vendor/nginx-1.11.12/src/http/modules/perl/ngx_http_perl_module.c) vendor/nginx-1.11.13/src/http/modules/perl/ngx_http_perl_module.h (from vendor/nginx-1.11.12/src/http/modules/perl/ngx_http_perl_module.h) vendor/nginx-1.11.13/src/http/modules/perl/typemap (from vendor/nginx-1.11.12/src/http/modules/perl/typemap) vendor/nginx-1.11.13/src/http/ngx_http.c (from vendor/nginx-1.11.12/src/http/ngx_http.c) vendor/nginx-1.11.13/src/http/ngx_http.h (from vendor/nginx-1.11.12/src/http/ngx_http.h) vendor/nginx-1.11.13/src/http/ngx_http_cache.h (from vendor/nginx-1.11.12/src/http/ngx_http_cache.h) vendor/nginx-1.11.13/src/http/ngx_http_config.h (from vendor/nginx-1.11.12/src/http/ngx_http_config.h) vendor/nginx-1.11.13/src/http/ngx_http_copy_filter_module.c (from vendor/nginx-1.11.12/src/http/ngx_http_copy_filter_module.c) vendor/nginx-1.11.13/src/http/ngx_http_core_module.c (from vendor/nginx-1.11.12/src/http/ngx_http_core_module.c) vendor/nginx-1.11.13/src/http/ngx_http_core_module.h (from vendor/nginx-1.11.12/src/http/ngx_http_core_module.h) vendor/nginx-1.11.13/src/http/ngx_http_file_cache.c (from vendor/nginx-1.11.12/src/http/ngx_http_file_cache.c) vendor/nginx-1.11.13/src/http/ngx_http_header_filter_module.c (from vendor/nginx-1.11.12/src/http/ngx_http_header_filter_module.c) vendor/nginx-1.11.13/src/http/ngx_http_parse.c (from vendor/nginx-1.11.12/src/http/ngx_http_parse.c) vendor/nginx-1.11.13/src/http/ngx_http_postpone_filter_module.c (from vendor/nginx-1.11.12/src/http/ngx_http_postpone_filter_module.c) vendor/nginx-1.11.13/src/http/ngx_http_request.c (from vendor/nginx-1.11.12/src/http/ngx_http_request.c) vendor/nginx-1.11.13/src/http/ngx_http_request.h (from vendor/nginx-1.11.12/src/http/ngx_http_request.h) vendor/nginx-1.11.13/src/http/ngx_http_request_body.c (from vendor/nginx-1.11.12/src/http/ngx_http_request_body.c) vendor/nginx-1.11.13/src/http/ngx_http_script.c (from vendor/nginx-1.11.12/src/http/ngx_http_script.c) vendor/nginx-1.11.13/src/http/ngx_http_script.h (from vendor/nginx-1.11.12/src/http/ngx_http_script.h) vendor/nginx-1.11.13/src/http/ngx_http_special_response.c (from vendor/nginx-1.11.12/src/http/ngx_http_special_response.c) vendor/nginx-1.11.13/src/http/ngx_http_upstream.c (from vendor/nginx-1.11.12/src/http/ngx_http_upstream.c) vendor/nginx-1.11.13/src/http/ngx_http_upstream.h (from vendor/nginx-1.11.12/src/http/ngx_http_upstream.h) vendor/nginx-1.11.13/src/http/ngx_http_upstream_round_robin.c (from vendor/nginx-1.11.12/src/http/ngx_http_upstream_round_robin.c) vendor/nginx-1.11.13/src/http/ngx_http_upstream_round_robin.h (from vendor/nginx-1.11.12/src/http/ngx_http_upstream_round_robin.h) vendor/nginx-1.11.13/src/http/ngx_http_variables.c (from vendor/nginx-1.11.12/src/http/ngx_http_variables.c) vendor/nginx-1.11.13/src/http/ngx_http_variables.h (from vendor/nginx-1.11.12/src/http/ngx_http_variables.h) vendor/nginx-1.11.13/src/http/ngx_http_write_filter_module.c (from vendor/nginx-1.11.12/src/http/ngx_http_write_filter_module.c) vendor/nginx-1.11.13/src/http/v2/ngx_http_v2.c (from vendor/nginx-1.11.12/src/http/v2/ngx_http_v2.c) vendor/nginx-1.11.13/src/http/v2/ngx_http_v2.h (from vendor/nginx-1.11.12/src/http/v2/ngx_http_v2.h) vendor/nginx-1.11.13/src/http/v2/ngx_http_v2_filter_module.c (from vendor/nginx-1.11.12/src/http/v2/ngx_http_v2_filter_module.c) vendor/nginx-1.11.13/src/http/v2/ngx_http_v2_huff_decode.c (from vendor/nginx-1.11.12/src/http/v2/ngx_http_v2_huff_decode.c) vendor/nginx-1.11.13/src/http/v2/ngx_http_v2_huff_encode.c (from vendor/nginx-1.11.12/src/http/v2/ngx_http_v2_huff_encode.c) vendor/nginx-1.11.13/src/http/v2/ngx_http_v2_module.c (from vendor/nginx-1.11.12/src/http/v2/ngx_http_v2_module.c) vendor/nginx-1.11.13/src/http/v2/ngx_http_v2_module.h (from vendor/nginx-1.11.12/src/http/v2/ngx_http_v2_module.h) vendor/nginx-1.11.13/src/http/v2/ngx_http_v2_table.c (from vendor/nginx-1.11.12/src/http/v2/ngx_http_v2_table.c) vendor/nginx-1.11.13/src/mail/ngx_mail.c (from vendor/nginx-1.11.12/src/mail/ngx_mail.c) vendor/nginx-1.11.13/src/mail/ngx_mail.h (from vendor/nginx-1.11.12/src/mail/ngx_mail.h) vendor/nginx-1.11.13/src/mail/ngx_mail_auth_http_module.c (from vendor/nginx-1.11.12/src/mail/ngx_mail_auth_http_module.c) vendor/nginx-1.11.13/src/mail/ngx_mail_core_module.c (from vendor/nginx-1.11.12/src/mail/ngx_mail_core_module.c) vendor/nginx-1.11.13/src/mail/ngx_mail_handler.c (from vendor/nginx-1.11.12/src/mail/ngx_mail_handler.c) vendor/nginx-1.11.13/src/mail/ngx_mail_imap_handler.c (from vendor/nginx-1.11.12/src/mail/ngx_mail_imap_handler.c) vendor/nginx-1.11.13/src/mail/ngx_mail_imap_module.c (from vendor/nginx-1.11.12/src/mail/ngx_mail_imap_module.c) vendor/nginx-1.11.13/src/mail/ngx_mail_imap_module.h (from vendor/nginx-1.11.12/src/mail/ngx_mail_imap_module.h) vendor/nginx-1.11.13/src/mail/ngx_mail_parse.c (from vendor/nginx-1.11.12/src/mail/ngx_mail_parse.c) vendor/nginx-1.11.13/src/mail/ngx_mail_pop3_handler.c (from vendor/nginx-1.11.12/src/mail/ngx_mail_pop3_handler.c) vendor/nginx-1.11.13/src/mail/ngx_mail_pop3_module.c (from vendor/nginx-1.11.12/src/mail/ngx_mail_pop3_module.c) vendor/nginx-1.11.13/src/mail/ngx_mail_pop3_module.h (from vendor/nginx-1.11.12/src/mail/ngx_mail_pop3_module.h) vendor/nginx-1.11.13/src/mail/ngx_mail_proxy_module.c (from vendor/nginx-1.11.12/src/mail/ngx_mail_proxy_module.c) vendor/nginx-1.11.13/src/mail/ngx_mail_smtp_handler.c (from vendor/nginx-1.11.12/src/mail/ngx_mail_smtp_handler.c) vendor/nginx-1.11.13/src/mail/ngx_mail_smtp_module.c (from vendor/nginx-1.11.12/src/mail/ngx_mail_smtp_module.c) vendor/nginx-1.11.13/src/mail/ngx_mail_smtp_module.h (from vendor/nginx-1.11.12/src/mail/ngx_mail_smtp_module.h) vendor/nginx-1.11.13/src/mail/ngx_mail_ssl_module.c (from vendor/nginx-1.11.12/src/mail/ngx_mail_ssl_module.c) vendor/nginx-1.11.13/src/mail/ngx_mail_ssl_module.h (from vendor/nginx-1.11.12/src/mail/ngx_mail_ssl_module.h) vendor/nginx-1.11.13/src/misc/ngx_cpp_test_module.cpp (from vendor/nginx-1.11.12/src/misc/ngx_cpp_test_module.cpp) vendor/nginx-1.11.13/src/misc/ngx_google_perftools_module.c (from vendor/nginx-1.11.12/src/misc/ngx_google_perftools_module.c) vendor/nginx-1.11.13/src/os/unix/ngx_alloc.c (from vendor/nginx-1.11.12/src/os/unix/ngx_alloc.c) vendor/nginx-1.11.13/src/os/unix/ngx_alloc.h (from vendor/nginx-1.11.12/src/os/unix/ngx_alloc.h) vendor/nginx-1.11.13/src/os/unix/ngx_atomic.h (from vendor/nginx-1.11.12/src/os/unix/ngx_atomic.h) vendor/nginx-1.11.13/src/os/unix/ngx_channel.c (from vendor/nginx-1.11.12/src/os/unix/ngx_channel.c) vendor/nginx-1.11.13/src/os/unix/ngx_channel.h (from vendor/nginx-1.11.12/src/os/unix/ngx_channel.h) vendor/nginx-1.11.13/src/os/unix/ngx_daemon.c (from vendor/nginx-1.11.12/src/os/unix/ngx_daemon.c) vendor/nginx-1.11.13/src/os/unix/ngx_darwin.h (from vendor/nginx-1.11.12/src/os/unix/ngx_darwin.h) vendor/nginx-1.11.13/src/os/unix/ngx_darwin_config.h (from vendor/nginx-1.11.12/src/os/unix/ngx_darwin_config.h) vendor/nginx-1.11.13/src/os/unix/ngx_darwin_init.c (from vendor/nginx-1.11.12/src/os/unix/ngx_darwin_init.c) vendor/nginx-1.11.13/src/os/unix/ngx_darwin_sendfile_chain.c (from vendor/nginx-1.11.12/src/os/unix/ngx_darwin_sendfile_chain.c) vendor/nginx-1.11.13/src/os/unix/ngx_dlopen.c (from vendor/nginx-1.11.12/src/os/unix/ngx_dlopen.c) vendor/nginx-1.11.13/src/os/unix/ngx_dlopen.h (from vendor/nginx-1.11.12/src/os/unix/ngx_dlopen.h) vendor/nginx-1.11.13/src/os/unix/ngx_errno.c (from vendor/nginx-1.11.12/src/os/unix/ngx_errno.c) vendor/nginx-1.11.13/src/os/unix/ngx_errno.h (from vendor/nginx-1.11.12/src/os/unix/ngx_errno.h) vendor/nginx-1.11.13/src/os/unix/ngx_file_aio_read.c (from vendor/nginx-1.11.12/src/os/unix/ngx_file_aio_read.c) vendor/nginx-1.11.13/src/os/unix/ngx_files.c (from vendor/nginx-1.11.12/src/os/unix/ngx_files.c) vendor/nginx-1.11.13/src/os/unix/ngx_files.h (from vendor/nginx-1.11.12/src/os/unix/ngx_files.h) vendor/nginx-1.11.13/src/os/unix/ngx_freebsd.h (from vendor/nginx-1.11.12/src/os/unix/ngx_freebsd.h) vendor/nginx-1.11.13/src/os/unix/ngx_freebsd_config.h (from vendor/nginx-1.11.12/src/os/unix/ngx_freebsd_config.h) vendor/nginx-1.11.13/src/os/unix/ngx_freebsd_init.c (from vendor/nginx-1.11.12/src/os/unix/ngx_freebsd_init.c) vendor/nginx-1.11.13/src/os/unix/ngx_freebsd_sendfile_chain.c (from vendor/nginx-1.11.12/src/os/unix/ngx_freebsd_sendfile_chain.c) vendor/nginx-1.11.13/src/os/unix/ngx_gcc_atomic_amd64.h (from vendor/nginx-1.11.12/src/os/unix/ngx_gcc_atomic_amd64.h) vendor/nginx-1.11.13/src/os/unix/ngx_gcc_atomic_ppc.h (from vendor/nginx-1.11.12/src/os/unix/ngx_gcc_atomic_ppc.h) vendor/nginx-1.11.13/src/os/unix/ngx_gcc_atomic_sparc64.h (from vendor/nginx-1.11.12/src/os/unix/ngx_gcc_atomic_sparc64.h) vendor/nginx-1.11.13/src/os/unix/ngx_gcc_atomic_x86.h (from vendor/nginx-1.11.12/src/os/unix/ngx_gcc_atomic_x86.h) vendor/nginx-1.11.13/src/os/unix/ngx_linux.h (from vendor/nginx-1.11.12/src/os/unix/ngx_linux.h) vendor/nginx-1.11.13/src/os/unix/ngx_linux_aio_read.c (from vendor/nginx-1.11.12/src/os/unix/ngx_linux_aio_read.c) vendor/nginx-1.11.13/src/os/unix/ngx_linux_config.h (from vendor/nginx-1.11.12/src/os/unix/ngx_linux_config.h) vendor/nginx-1.11.13/src/os/unix/ngx_linux_init.c (from vendor/nginx-1.11.12/src/os/unix/ngx_linux_init.c) vendor/nginx-1.11.13/src/os/unix/ngx_linux_sendfile_chain.c (from vendor/nginx-1.11.12/src/os/unix/ngx_linux_sendfile_chain.c) vendor/nginx-1.11.13/src/os/unix/ngx_os.h (from vendor/nginx-1.11.12/src/os/unix/ngx_os.h) vendor/nginx-1.11.13/src/os/unix/ngx_posix_config.h (from vendor/nginx-1.11.12/src/os/unix/ngx_posix_config.h) vendor/nginx-1.11.13/src/os/unix/ngx_posix_init.c (from vendor/nginx-1.11.12/src/os/unix/ngx_posix_init.c) vendor/nginx-1.11.13/src/os/unix/ngx_process.c (from vendor/nginx-1.11.12/src/os/unix/ngx_process.c) vendor/nginx-1.11.13/src/os/unix/ngx_process.h (from vendor/nginx-1.11.12/src/os/unix/ngx_process.h) vendor/nginx-1.11.13/src/os/unix/ngx_process_cycle.c (from vendor/nginx-1.11.12/src/os/unix/ngx_process_cycle.c) vendor/nginx-1.11.13/src/os/unix/ngx_process_cycle.h (from vendor/nginx-1.11.12/src/os/unix/ngx_process_cycle.h) vendor/nginx-1.11.13/src/os/unix/ngx_readv_chain.c (from vendor/nginx-1.11.12/src/os/unix/ngx_readv_chain.c) vendor/nginx-1.11.13/src/os/unix/ngx_recv.c (from vendor/nginx-1.11.12/src/os/unix/ngx_recv.c) vendor/nginx-1.11.13/src/os/unix/ngx_send.c (from vendor/nginx-1.11.12/src/os/unix/ngx_send.c) vendor/nginx-1.11.13/src/os/unix/ngx_setaffinity.c (from vendor/nginx-1.11.12/src/os/unix/ngx_setaffinity.c) vendor/nginx-1.11.13/src/os/unix/ngx_setaffinity.h (from vendor/nginx-1.11.12/src/os/unix/ngx_setaffinity.h) vendor/nginx-1.11.13/src/os/unix/ngx_setproctitle.c (from vendor/nginx-1.11.12/src/os/unix/ngx_setproctitle.c) vendor/nginx-1.11.13/src/os/unix/ngx_setproctitle.h (from vendor/nginx-1.11.12/src/os/unix/ngx_setproctitle.h) vendor/nginx-1.11.13/src/os/unix/ngx_shmem.c (from vendor/nginx-1.11.12/src/os/unix/ngx_shmem.c) vendor/nginx-1.11.13/src/os/unix/ngx_shmem.h (from vendor/nginx-1.11.12/src/os/unix/ngx_shmem.h) vendor/nginx-1.11.13/src/os/unix/ngx_socket.c (from vendor/nginx-1.11.12/src/os/unix/ngx_socket.c) vendor/nginx-1.11.13/src/os/unix/ngx_socket.h (from vendor/nginx-1.11.12/src/os/unix/ngx_socket.h) vendor/nginx-1.11.13/src/os/unix/ngx_solaris.h (from vendor/nginx-1.11.12/src/os/unix/ngx_solaris.h) vendor/nginx-1.11.13/src/os/unix/ngx_solaris_config.h (from vendor/nginx-1.11.12/src/os/unix/ngx_solaris_config.h) vendor/nginx-1.11.13/src/os/unix/ngx_solaris_init.c (from vendor/nginx-1.11.12/src/os/unix/ngx_solaris_init.c) vendor/nginx-1.11.13/src/os/unix/ngx_solaris_sendfilev_chain.c (from vendor/nginx-1.11.12/src/os/unix/ngx_solaris_sendfilev_chain.c) vendor/nginx-1.11.13/src/os/unix/ngx_sunpro_amd64.il (from vendor/nginx-1.11.12/src/os/unix/ngx_sunpro_amd64.il) vendor/nginx-1.11.13/src/os/unix/ngx_sunpro_atomic_sparc64.h (from vendor/nginx-1.11.12/src/os/unix/ngx_sunpro_atomic_sparc64.h) vendor/nginx-1.11.13/src/os/unix/ngx_sunpro_sparc64.il (from vendor/nginx-1.11.12/src/os/unix/ngx_sunpro_sparc64.il) vendor/nginx-1.11.13/src/os/unix/ngx_sunpro_x86.il (from vendor/nginx-1.11.12/src/os/unix/ngx_sunpro_x86.il) vendor/nginx-1.11.13/src/os/unix/ngx_thread.h (from vendor/nginx-1.11.12/src/os/unix/ngx_thread.h) vendor/nginx-1.11.13/src/os/unix/ngx_thread_cond.c (from vendor/nginx-1.11.12/src/os/unix/ngx_thread_cond.c) vendor/nginx-1.11.13/src/os/unix/ngx_thread_id.c (from vendor/nginx-1.11.12/src/os/unix/ngx_thread_id.c) vendor/nginx-1.11.13/src/os/unix/ngx_thread_mutex.c (from vendor/nginx-1.11.12/src/os/unix/ngx_thread_mutex.c) vendor/nginx-1.11.13/src/os/unix/ngx_time.c (from vendor/nginx-1.11.12/src/os/unix/ngx_time.c) vendor/nginx-1.11.13/src/os/unix/ngx_time.h (from vendor/nginx-1.11.12/src/os/unix/ngx_time.h) vendor/nginx-1.11.13/src/os/unix/ngx_udp_recv.c (from vendor/nginx-1.11.12/src/os/unix/ngx_udp_recv.c) vendor/nginx-1.11.13/src/os/unix/ngx_udp_send.c (from vendor/nginx-1.11.12/src/os/unix/ngx_udp_send.c) vendor/nginx-1.11.13/src/os/unix/ngx_udp_sendmsg_chain.c (from vendor/nginx-1.11.12/src/os/unix/ngx_udp_sendmsg_chain.c) vendor/nginx-1.11.13/src/os/unix/ngx_user.c (from vendor/nginx-1.11.12/src/os/unix/ngx_user.c) vendor/nginx-1.11.13/src/os/unix/ngx_user.h (from vendor/nginx-1.11.12/src/os/unix/ngx_user.h) vendor/nginx-1.11.13/src/os/unix/ngx_writev_chain.c (from vendor/nginx-1.11.12/src/os/unix/ngx_writev_chain.c) vendor/nginx-1.11.13/src/os/win32/nginx.ico (from vendor/nginx-1.11.12/src/os/win32/nginx.ico) vendor/nginx-1.11.13/src/os/win32/nginx.rc (from vendor/nginx-1.11.12/src/os/win32/nginx.rc) vendor/nginx-1.11.13/src/os/win32/nginx_icon16.xpm (from vendor/nginx-1.11.12/src/os/win32/nginx_icon16.xpm) vendor/nginx-1.11.13/src/os/win32/nginx_icon32.xpm (from vendor/nginx-1.11.12/src/os/win32/nginx_icon32.xpm) vendor/nginx-1.11.13/src/os/win32/nginx_icon48.xpm (from vendor/nginx-1.11.12/src/os/win32/nginx_icon48.xpm) vendor/nginx-1.11.13/src/os/win32/ngx_alloc.c (from vendor/nginx-1.11.12/src/os/win32/ngx_alloc.c) vendor/nginx-1.11.13/src/os/win32/ngx_alloc.h (from vendor/nginx-1.11.12/src/os/win32/ngx_alloc.h) vendor/nginx-1.11.13/src/os/win32/ngx_atomic.h (from vendor/nginx-1.11.12/src/os/win32/ngx_atomic.h) vendor/nginx-1.11.13/src/os/win32/ngx_dlopen.c (from vendor/nginx-1.11.12/src/os/win32/ngx_dlopen.c) vendor/nginx-1.11.13/src/os/win32/ngx_dlopen.h (from vendor/nginx-1.11.12/src/os/win32/ngx_dlopen.h) vendor/nginx-1.11.13/src/os/win32/ngx_errno.c (from vendor/nginx-1.11.12/src/os/win32/ngx_errno.c) vendor/nginx-1.11.13/src/os/win32/ngx_errno.h (from vendor/nginx-1.11.12/src/os/win32/ngx_errno.h) vendor/nginx-1.11.13/src/os/win32/ngx_event_log.c (from vendor/nginx-1.11.12/src/os/win32/ngx_event_log.c) vendor/nginx-1.11.13/src/os/win32/ngx_files.c (from vendor/nginx-1.11.12/src/os/win32/ngx_files.c) vendor/nginx-1.11.13/src/os/win32/ngx_files.h (from vendor/nginx-1.11.12/src/os/win32/ngx_files.h) vendor/nginx-1.11.13/src/os/win32/ngx_os.h (from vendor/nginx-1.11.12/src/os/win32/ngx_os.h) vendor/nginx-1.11.13/src/os/win32/ngx_process.c (from vendor/nginx-1.11.12/src/os/win32/ngx_process.c) vendor/nginx-1.11.13/src/os/win32/ngx_process.h (from vendor/nginx-1.11.12/src/os/win32/ngx_process.h) vendor/nginx-1.11.13/src/os/win32/ngx_process_cycle.c (from vendor/nginx-1.11.12/src/os/win32/ngx_process_cycle.c) vendor/nginx-1.11.13/src/os/win32/ngx_process_cycle.h (from vendor/nginx-1.11.12/src/os/win32/ngx_process_cycle.h) vendor/nginx-1.11.13/src/os/win32/ngx_service.c (from vendor/nginx-1.11.12/src/os/win32/ngx_service.c) vendor/nginx-1.11.13/src/os/win32/ngx_shmem.c (from vendor/nginx-1.11.12/src/os/win32/ngx_shmem.c) vendor/nginx-1.11.13/src/os/win32/ngx_shmem.h (from vendor/nginx-1.11.12/src/os/win32/ngx_shmem.h) vendor/nginx-1.11.13/src/os/win32/ngx_socket.c (from vendor/nginx-1.11.12/src/os/win32/ngx_socket.c) vendor/nginx-1.11.13/src/os/win32/ngx_socket.h (from vendor/nginx-1.11.12/src/os/win32/ngx_socket.h) vendor/nginx-1.11.13/src/os/win32/ngx_stat.c (from vendor/nginx-1.11.12/src/os/win32/ngx_stat.c) vendor/nginx-1.11.13/src/os/win32/ngx_thread.c (from vendor/nginx-1.11.12/src/os/win32/ngx_thread.c) vendor/nginx-1.11.13/src/os/win32/ngx_thread.h (from vendor/nginx-1.11.12/src/os/win32/ngx_thread.h) vendor/nginx-1.11.13/src/os/win32/ngx_time.c (from vendor/nginx-1.11.12/src/os/win32/ngx_time.c) vendor/nginx-1.11.13/src/os/win32/ngx_time.h (from vendor/nginx-1.11.12/src/os/win32/ngx_time.h) vendor/nginx-1.11.13/src/os/win32/ngx_udp_wsarecv.c (from vendor/nginx-1.11.12/src/os/win32/ngx_udp_wsarecv.c) vendor/nginx-1.11.13/src/os/win32/ngx_user.c (from vendor/nginx-1.11.12/src/os/win32/ngx_user.c) vendor/nginx-1.11.13/src/os/win32/ngx_user.h (from vendor/nginx-1.11.12/src/os/win32/ngx_user.h) vendor/nginx-1.11.13/src/os/win32/ngx_win32_config.h (from vendor/nginx-1.11.12/src/os/win32/ngx_win32_config.h) vendor/nginx-1.11.13/src/os/win32/ngx_win32_init.c (from vendor/nginx-1.11.12/src/os/win32/ngx_win32_init.c) vendor/nginx-1.11.13/src/os/win32/ngx_wsarecv.c (from vendor/nginx-1.11.12/src/os/win32/ngx_wsarecv.c) vendor/nginx-1.11.13/src/os/win32/ngx_wsarecv_chain.c (from vendor/nginx-1.11.12/src/os/win32/ngx_wsarecv_chain.c) vendor/nginx-1.11.13/src/os/win32/ngx_wsasend.c (from vendor/nginx-1.11.12/src/os/win32/ngx_wsasend.c) vendor/nginx-1.11.13/src/os/win32/ngx_wsasend_chain.c (from vendor/nginx-1.11.12/src/os/win32/ngx_wsasend_chain.c) vendor/nginx-1.11.13/src/stream/ngx_stream.c (from vendor/nginx-1.11.12/src/stream/ngx_stream.c) vendor/nginx-1.11.13/src/stream/ngx_stream.h (from vendor/nginx-1.11.12/src/stream/ngx_stream.h) vendor/nginx-1.11.13/src/stream/ngx_stream_access_module.c (from vendor/nginx-1.11.12/src/stream/ngx_stream_access_module.c) vendor/nginx-1.11.13/src/stream/ngx_stream_core_module.c (from vendor/nginx-1.11.12/src/stream/ngx_stream_core_module.c) vendor/nginx-1.11.13/src/stream/ngx_stream_geo_module.c (from vendor/nginx-1.11.12/src/stream/ngx_stream_geo_module.c) vendor/nginx-1.11.13/src/stream/ngx_stream_geoip_module.c (from vendor/nginx-1.11.12/src/stream/ngx_stream_geoip_module.c) vendor/nginx-1.11.13/src/stream/ngx_stream_handler.c (from vendor/nginx-1.11.12/src/stream/ngx_stream_handler.c) vendor/nginx-1.11.13/src/stream/ngx_stream_limit_conn_module.c (from vendor/nginx-1.11.12/src/stream/ngx_stream_limit_conn_module.c) vendor/nginx-1.11.13/src/stream/ngx_stream_log_module.c (from vendor/nginx-1.11.12/src/stream/ngx_stream_log_module.c) vendor/nginx-1.11.13/src/stream/ngx_stream_map_module.c (from vendor/nginx-1.11.12/src/stream/ngx_stream_map_module.c) vendor/nginx-1.11.13/src/stream/ngx_stream_proxy_module.c (from vendor/nginx-1.11.12/src/stream/ngx_stream_proxy_module.c) vendor/nginx-1.11.13/src/stream/ngx_stream_realip_module.c (from vendor/nginx-1.11.12/src/stream/ngx_stream_realip_module.c) vendor/nginx-1.11.13/src/stream/ngx_stream_return_module.c (from vendor/nginx-1.11.12/src/stream/ngx_stream_return_module.c) vendor/nginx-1.11.13/src/stream/ngx_stream_script.c (from vendor/nginx-1.11.12/src/stream/ngx_stream_script.c) vendor/nginx-1.11.13/src/stream/ngx_stream_script.h (from vendor/nginx-1.11.12/src/stream/ngx_stream_script.h) vendor/nginx-1.11.13/src/stream/ngx_stream_split_clients_module.c (from vendor/nginx-1.11.12/src/stream/ngx_stream_split_clients_module.c) vendor/nginx-1.11.13/src/stream/ngx_stream_ssl_module.c (from vendor/nginx-1.11.12/src/stream/ngx_stream_ssl_module.c) vendor/nginx-1.11.13/src/stream/ngx_stream_ssl_module.h (from vendor/nginx-1.11.12/src/stream/ngx_stream_ssl_module.h) vendor/nginx-1.11.13/src/stream/ngx_stream_ssl_preread_module.c (from vendor/nginx-1.11.12/src/stream/ngx_stream_ssl_preread_module.c) vendor/nginx-1.11.13/src/stream/ngx_stream_upstream.c (from vendor/nginx-1.11.12/src/stream/ngx_stream_upstream.c) vendor/nginx-1.11.13/src/stream/ngx_stream_upstream.h (from vendor/nginx-1.11.12/src/stream/ngx_stream_upstream.h) vendor/nginx-1.11.13/src/stream/ngx_stream_upstream_hash_module.c (from vendor/nginx-1.11.12/src/stream/ngx_stream_upstream_hash_module.c) vendor/nginx-1.11.13/src/stream/ngx_stream_upstream_least_conn_module.c (from vendor/nginx-1.11.12/src/stream/ngx_stream_upstream_least_conn_module.c) vendor/nginx-1.11.13/src/stream/ngx_stream_upstream_round_robin.c (from vendor/nginx-1.11.12/src/stream/ngx_stream_upstream_round_robin.c) vendor/nginx-1.11.13/src/stream/ngx_stream_upstream_round_robin.h (from vendor/nginx-1.11.12/src/stream/ngx_stream_upstream_round_robin.h) vendor/nginx-1.11.13/src/stream/ngx_stream_upstream_zone_module.c (from vendor/nginx-1.11.12/src/stream/ngx_stream_upstream_zone_module.c) vendor/nginx-1.11.13/src/stream/ngx_stream_variables.c (from vendor/nginx-1.11.12/src/stream/ngx_stream_variables.c) vendor/nginx-1.11.13/src/stream/ngx_stream_variables.h (from vendor/nginx-1.11.12/src/stream/ngx_stream_variables.h) vendor/nginx-1.11.13/src/stream/ngx_stream_write_filter_module.c (from vendor/nginx-1.11.12/src/stream/ngx_stream_write_filter_module.c) Modified: nginx_version (+1 -1) =================================================================== --- nginx_version 2017-04-06 13:46:08 +0900 (5b958a1) +++ nginx_version 2017-04-06 14:58:34 +0900 (dbb2469) @@ -1 +1 @@ -1.11.12 +1.11.13 Renamed: vendor/nginx-1.11.13/auto/cc/acc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/cc/bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/cc/ccc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/cc/clang (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/cc/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/cc/gcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/cc/icc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/cc/msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/cc/name (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/cc/owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/cc/sunc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/configure (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/define (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/endianness (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/feature (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/have (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/have_headers (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/headers (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/include (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/init (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/install (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/lib/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/lib/geoip/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/lib/google-perftools/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/lib/libatomic/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/lib/libatomic/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/lib/libgd/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/lib/libxslt/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/lib/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/lib/openssl/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/lib/openssl/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/lib/openssl/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/lib/openssl/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/lib/pcre/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/lib/pcre/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/lib/pcre/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/lib/pcre/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/lib/pcre/makefile.owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/lib/perl/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/lib/perl/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/lib/zlib/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/lib/zlib/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/lib/zlib/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/lib/zlib/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/lib/zlib/makefile.owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/module (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/modules (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/nohave (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/options (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/os/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/os/darwin (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/os/freebsd (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/os/linux (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/os/solaris (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/os/win32 (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/sources (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/stubs (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/summary (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/threads (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/types/sizeof (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/types/typedef (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/types/uintptr_t (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/types/value (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/auto/unix (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/conf/fastcgi.conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/conf/fastcgi_params (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/conf/koi-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/conf/koi-win (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/conf/mime.types (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/conf/nginx.conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/conf/scgi_params (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/conf/uwsgi_params (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/conf/win-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/contrib/README (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/contrib/geo2nginx.pl (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/contrib/unicode2nginx/koi-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/contrib/unicode2nginx/unicode-to-nginx.pl (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/contrib/unicode2nginx/win-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/contrib/vim/ftdetect/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/contrib/vim/ftplugin/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/contrib/vim/indent/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/contrib/vim/syntax/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/docs/GNUmakefile (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/docs/dtd/change_log_conf.dtd (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/docs/dtd/changes.dtd (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/docs/html/50x.html (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/docs/html/index.html (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/docs/man/nginx.8 (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/docs/text/LICENSE (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/docs/text/README (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/docs/xml/change_log_conf.xml (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/docs/xml/nginx/changes.xml (+91 -0) 99% =================================================================== --- vendor/nginx-1.11.12/docs/xml/nginx/changes.xml 2017-04-06 13:46:08 +0900 (6106043) +++ vendor/nginx-1.11.13/docs/xml/nginx/changes.xml 2017-04-06 14:58:34 +0900 (ea39ab2) @@ -5,6 +5,97 @@ <change_log title="nginx"> +<changes ver="1.11.13" date="2017-04-04"> + +<change type="feature"> +<para lang="ru"> +параметр http_429 в директивах proxy_next_upstream, fastcgi_next_upstream, +scgi_next_upstream и uwsgi_next_upstream.<br/> +Спасибо Piotr Sikora. +</para> +<para lang="en"> +the "http_429" parameter of the "proxy_next_upstream", "fastcgi_next_upstream", +"scgi_next_upstream", and "uwsgi_next_upstream" directives.<br/> +Thanks to Piotr Sikora. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +в обработке ошибок выделения памяти. +</para> +<para lang="en"> +in memory allocation error handling. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +при использовании директив sendfile и timer_resolution на Linux +запросы могли зависать. +</para> +<para lang="en"> +requests might hang +when using the "sendfile" and "timer_resolution" directives on Linux. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +при использовании с подзапросами директив sendfile и aio_write +запросы могли зависать. +</para> +<para lang="en"> +requests might hang +when using the "sendfile" and "aio_write" directives with subrequests. +</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> + +<change type="bugfix"> +<para lang="ru"> +при использовании HTTP/2 в рабочем процессе мог произойти segmentation fault. +</para> +<para lang="en"> +a segmentation fault might occur in a worker process when using HTTP/2. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +запросы могли зависать +при использовании с подзапросами директив limit_rate, sendfile_max_chunk, +limit_req или метода $r->sleep() встроенного перла. +</para> +<para lang="en"> +requests might hang +when using the "limit_rate", "sendfile_max_chunk", "limit_req" directives, +or the $r->sleep() embedded perl method with subrequests. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +в модуле ngx_http_slice_module. +</para> +<para lang="en"> +in the ngx_http_slice_module. +</para> +</change> + +</changes> + + <changes ver="1.11.12" date="2017-03-24"> <change type="bugfix"> Renamed: vendor/nginx-1.11.13/docs/xsls/changes.xsls (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/docs/xslt/changes.xslt (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/misc/GNUmakefile (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/misc/README (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/nginx.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/nginx.h (+2 -2) 84% =================================================================== --- vendor/nginx-1.11.12/src/core/nginx.h 2017-04-06 13:46:08 +0900 (a5581a9) +++ vendor/nginx-1.11.13/src/core/nginx.h 2017-04-06 14:58:34 +0900 (5d3112f) @@ -9,8 +9,8 @@ #define _NGINX_H_INCLUDED_ -#define nginx_version 1011012 -#define NGINX_VERSION "1.11.12" +#define nginx_version 1011013 +#define NGINX_VERSION "1.11.13" #define NGINX_VER "nginx/" NGINX_VERSION #ifdef NGX_BUILD Renamed: vendor/nginx-1.11.13/src/core/ngx_array.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_array.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_buf.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_buf.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_conf_file.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_conf_file.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_connection.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_connection.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_core.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_cpuinfo.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_crc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_crc32.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_crc32.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_crypt.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_crypt.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_cycle.c (+15 -19) 97% =================================================================== --- vendor/nginx-1.11.12/src/core/ngx_cycle.c 2017-04-06 13:46:08 +0900 (3dfdf2e) +++ vendor/nginx-1.11.13/src/core/ngx_cycle.c 2017-04-06 14:58:34 +0900 (aee7a58) @@ -115,16 +115,14 @@ ngx_init_cycle(ngx_cycle_t *old_cycle) n = old_cycle->paths.nelts ? old_cycle->paths.nelts : 10; - cycle->paths.elts = ngx_pcalloc(pool, n * sizeof(ngx_path_t *)); - if (cycle->paths.elts == NULL) { + if (ngx_array_init(&cycle->paths, pool, n, sizeof(ngx_path_t *)) + != NGX_OK) + { ngx_destroy_pool(pool); return NULL; } - cycle->paths.nelts = 0; - cycle->paths.size = sizeof(ngx_path_t *); - cycle->paths.nalloc = n; - cycle->paths.pool = pool; + ngx_memzero(cycle->paths.elts, n * sizeof(ngx_path_t *)); if (ngx_array_init(&cycle->config_dump, pool, 1, sizeof(ngx_conf_dump_t)) @@ -175,16 +173,14 @@ ngx_init_cycle(ngx_cycle_t *old_cycle) n = old_cycle->listening.nelts ? old_cycle->listening.nelts : 10; - cycle->listening.elts = ngx_pcalloc(pool, n * sizeof(ngx_listening_t)); - if (cycle->listening.elts == NULL) { + if (ngx_array_init(&cycle->listening, pool, n, sizeof(ngx_listening_t)) + != NGX_OK) + { ngx_destroy_pool(pool); return NULL; } - cycle->listening.nelts = 0; - cycle->listening.size = sizeof(ngx_listening_t); - cycle->listening.nalloc = n; - cycle->listening.pool = pool; + ngx_memzero(cycle->listening.elts, n * sizeof(ngx_listening_t)); ngx_queue_init(&cycle->reusable_connections_queue); @@ -768,15 +764,15 @@ old_shm_zone_done: } n = 10; - ngx_old_cycles.elts = ngx_pcalloc(ngx_temp_pool, - n * sizeof(ngx_cycle_t *)); - if (ngx_old_cycles.elts == NULL) { + + if (ngx_array_init(&ngx_old_cycles, ngx_temp_pool, n, + sizeof(ngx_cycle_t *)) + != NGX_OK) + { exit(1); } - ngx_old_cycles.nelts = 0; - ngx_old_cycles.size = sizeof(ngx_cycle_t *); - ngx_old_cycles.nalloc = n; - ngx_old_cycles.pool = ngx_temp_pool; + + ngx_memzero(ngx_old_cycles.elts, n * sizeof(ngx_cycle_t *)); ngx_cleaner_event.handler = ngx_clean_old_cycles; ngx_cleaner_event.log = cycle->log; Renamed: vendor/nginx-1.11.13/src/core/ngx_cycle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_file.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_file.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_hash.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_hash.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_inet.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_inet.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_list.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_list.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_log.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_log.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_md5.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_md5.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_murmurhash.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_murmurhash.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_open_file_cache.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_open_file_cache.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_output_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_palloc.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_palloc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_parse.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_parse.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_parse_time.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_parse_time.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_proxy_protocol.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_proxy_protocol.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_queue.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_queue.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_radix_tree.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_radix_tree.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_rbtree.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_rbtree.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_regex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_regex.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_resolver.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_resolver.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_rwlock.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_rwlock.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_sha1.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_sha1.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_shmtx.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_shmtx.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_slab.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_slab.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_spinlock.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_string.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_string.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_syslog.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_syslog.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_thread_pool.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_thread_pool.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_times.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/core/ngx_times.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/event/modules/ngx_devpoll_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/event/modules/ngx_epoll_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/event/modules/ngx_eventport_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/event/modules/ngx_iocp_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/event/modules/ngx_iocp_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/event/modules/ngx_kqueue_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/event/modules/ngx_poll_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/event/modules/ngx_select_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/event/modules/ngx_win32_select_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/event/ngx_event.c (+1 -2) 99% =================================================================== --- vendor/nginx-1.11.12/src/event/ngx_event.c 2017-04-06 13:46:08 +0900 (dca41ee) +++ vendor/nginx-1.11.13/src/event/ngx_event.c 2017-04-06 14:58:34 +0900 (57af813) @@ -500,8 +500,7 @@ ngx_event_module_init(ngx_cycle_t *cycle) #endif shm.size = size; - shm.name.len = sizeof("nginx_shared_zone") - 1; - shm.name.data = (u_char *) "nginx_shared_zone"; + ngx_str_set(&shm.name, "nginx_shared_zone"); shm.log = cycle->log; if (ngx_shm_alloc(&shm) != NGX_OK) { Renamed: vendor/nginx-1.11.13/src/event/ngx_event.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/event/ngx_event_accept.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/event/ngx_event_acceptex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/event/ngx_event_connect.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/event/ngx_event_connect.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/event/ngx_event_connectex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/event/ngx_event_openssl.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/event/ngx_event_openssl.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/event/ngx_event_openssl_stapling.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/event/ngx_event_pipe.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/event/ngx_event_pipe.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/event/ngx_event_posted.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/event/ngx_event_posted.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/event/ngx_event_timer.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/event/ngx_event_timer.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_access_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_addition_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_auth_basic_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_auth_request_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_autoindex_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_browser_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_charset_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_chunked_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_dav_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_degradation_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_empty_gif_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_fastcgi_module.c (+1 -0) 99% =================================================================== --- vendor/nginx-1.11.12/src/http/modules/ngx_http_fastcgi_module.c 2017-04-06 13:46:08 +0900 (afdea2d) +++ vendor/nginx-1.11.13/src/http/modules/ngx_http_fastcgi_module.c 2017-04-06 14:58:34 +0900 (06c1973) @@ -211,6 +211,7 @@ static ngx_conf_bitmask_t ngx_http_fastcgi_next_upstream_masks[] = { { ngx_string("http_503"), NGX_HTTP_UPSTREAM_FT_HTTP_503 }, { ngx_string("http_403"), NGX_HTTP_UPSTREAM_FT_HTTP_403 }, { ngx_string("http_404"), NGX_HTTP_UPSTREAM_FT_HTTP_404 }, + { ngx_string("http_429"), NGX_HTTP_UPSTREAM_FT_HTTP_429 }, { ngx_string("updating"), NGX_HTTP_UPSTREAM_FT_UPDATING }, { ngx_string("off"), NGX_HTTP_UPSTREAM_FT_OFF }, { ngx_null_string, 0 } Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_flv_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_geo_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_geoip_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_gunzip_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_gzip_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_gzip_static_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_headers_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_image_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_index_module.c (+3 -3) 100% =================================================================== @@ -217,13 +217,13 @@ ngx_http_index_handler(ngx_http_request_t *r) if (ngx_open_cached_file(clcf->open_file_cache, &path, &of, r->pool) != NGX_OK) { - ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, of.err, - "%s \"%s\" failed", of.failed, path.data); - if (of.err == 0) { return NGX_HTTP_INTERNAL_SERVER_ERROR; } + ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, of.err, + "%s \"%s\" failed", of.failed, path.data); + #if (NGX_HAVE_OPENAT) if (of.err == NGX_EMLINK || of.err == NGX_ELOOP) Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_limit_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_limit_req_module.c (+3 -3) 99% =================================================================== --- vendor/nginx-1.11.12/src/http/modules/ngx_http_limit_req_module.c 2017-04-06 13:46:08 +0900 (2f695f2) +++ vendor/nginx-1.11.13/src/http/modules/ngx_http_limit_req_module.c 2017-04-06 14:58:34 +0900 (579b13c) @@ -276,6 +276,8 @@ ngx_http_limit_req_handler(ngx_http_request_t *r) r->read_event_handler = ngx_http_test_reading; r->write_event_handler = ngx_http_limit_req_delay; + + r->connection->write->delayed = 1; ngx_add_timer(r->connection->write, delay); return NGX_AGAIN; @@ -292,7 +294,7 @@ ngx_http_limit_req_delay(ngx_http_request_t *r) wev = r->connection->write; - if (!wev->timedout) { + if (wev->delayed) { if (ngx_handle_write_event(wev, 0) != NGX_OK) { ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); @@ -301,8 +303,6 @@ ngx_http_limit_req_delay(ngx_http_request_t *r) return; } - wev->timedout = 0; - if (ngx_handle_read_event(r->connection->read, 0) != NGX_OK) { ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); return; Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_log_module.c (+5 -0) 99% =================================================================== --- vendor/nginx-1.11.12/src/http/modules/ngx_http_log_module.c 2017-04-06 13:46:08 +0900 (330dc7e) +++ vendor/nginx-1.11.13/src/http/modules/ngx_http_log_module.c 2017-04-06 14:58:34 +0900 (917ed55) @@ -552,6 +552,11 @@ ngx_http_log_script_write(ngx_http_request_t *r, ngx_http_log_script_t *script, if (ngx_open_cached_file(llcf->open_file_cache, &log, &of, r->pool) != NGX_OK) { + if (of.err == 0) { + /* simulate successful logging */ + return len; + } + ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno, "%s \"%s\" failed", of.failed, log.data); /* simulate successful logging */ Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_map_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_memcached_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_mp4_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_not_modified_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_proxy_module.c (+1 -0) 99% =================================================================== --- vendor/nginx-1.11.12/src/http/modules/ngx_http_proxy_module.c 2017-04-06 13:46:08 +0900 (1a84d78) +++ vendor/nginx-1.11.13/src/http/modules/ngx_http_proxy_module.c 2017-04-06 14:58:34 +0900 (e594d06) @@ -220,6 +220,7 @@ static ngx_conf_bitmask_t ngx_http_proxy_next_upstream_masks[] = { { ngx_string("http_504"), NGX_HTTP_UPSTREAM_FT_HTTP_504 }, { ngx_string("http_403"), NGX_HTTP_UPSTREAM_FT_HTTP_403 }, { ngx_string("http_404"), NGX_HTTP_UPSTREAM_FT_HTTP_404 }, + { ngx_string("http_429"), NGX_HTTP_UPSTREAM_FT_HTTP_429 }, { ngx_string("updating"), NGX_HTTP_UPSTREAM_FT_UPDATING }, { ngx_string("off"), NGX_HTTP_UPSTREAM_FT_OFF }, { ngx_null_string, 0 } Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_random_index_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_range_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_realip_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_referer_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_rewrite_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_scgi_module.c (+1 -0) 99% =================================================================== --- vendor/nginx-1.11.12/src/http/modules/ngx_http_scgi_module.c 2017-04-06 13:46:08 +0900 (288ba09) +++ vendor/nginx-1.11.13/src/http/modules/ngx_http_scgi_module.c 2017-04-06 14:58:34 +0900 (d1e37dd) @@ -82,6 +82,7 @@ static ngx_conf_bitmask_t ngx_http_scgi_next_upstream_masks[] = { { ngx_string("http_503"), NGX_HTTP_UPSTREAM_FT_HTTP_503 }, { ngx_string("http_403"), NGX_HTTP_UPSTREAM_FT_HTTP_403 }, { ngx_string("http_404"), NGX_HTTP_UPSTREAM_FT_HTTP_404 }, + { ngx_string("http_429"), NGX_HTTP_UPSTREAM_FT_HTTP_429 }, { ngx_string("updating"), NGX_HTTP_UPSTREAM_FT_UPDATING }, { ngx_string("off"), NGX_HTTP_UPSTREAM_FT_OFF }, { ngx_null_string, 0 } Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_secure_link_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_slice_filter_module.c (+26 -12) 94% =================================================================== --- vendor/nginx-1.11.12/src/http/modules/ngx_http_slice_filter_module.c 2017-04-06 13:46:08 +0900 (2005939) +++ vendor/nginx-1.11.13/src/http/modules/ngx_http_slice_filter_module.c 2017-04-06 14:58:34 +0900 (7758342) @@ -11,23 +11,25 @@ typedef struct { - size_t size; + size_t size; } ngx_http_slice_loc_conf_t; typedef struct { - off_t start; - off_t end; - ngx_str_t range; - ngx_str_t etag; - ngx_uint_t last; /* unsigned last:1; */ + off_t start; + off_t end; + ngx_str_t range; + ngx_str_t etag; + unsigned last:1; + unsigned active:1; + ngx_http_request_t *sr; } ngx_http_slice_ctx_t; typedef struct { - off_t start; - off_t end; - off_t complete_length; + off_t start; + off_t end; + off_t complete_length; } ngx_http_slice_content_range_t; @@ -169,6 +171,7 @@ ngx_http_slice_header_filter(ngx_http_request_t *r) } ctx->start = end; + ctx->active = 1; r->headers_out.status = NGX_HTTP_OK; r->headers_out.status_line.len = 0; @@ -209,7 +212,6 @@ ngx_http_slice_body_filter(ngx_http_request_t *r, ngx_chain_t *in) { ngx_int_t rc; ngx_chain_t *cl; - ngx_http_request_t *sr; ngx_http_slice_ctx_t *ctx; ngx_http_slice_loc_conf_t *slcf; @@ -234,6 +236,16 @@ ngx_http_slice_body_filter(ngx_http_request_t *r, ngx_chain_t *in) return rc; } + if (ctx->sr && !ctx->sr->done) { + return rc; + } + + if (!ctx->active) { + ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, + "missing slice response"); + return NGX_ERROR; + } + if (ctx->start >= ctx->end) { ngx_http_set_ctx(r, NULL, ngx_http_slice_filter_module); ngx_http_send_special(r, NGX_HTTP_LAST); @@ -244,14 +256,14 @@ ngx_http_slice_body_filter(ngx_http_request_t *r, ngx_chain_t *in) return rc; } - if (ngx_http_subrequest(r, &r->uri, &r->args, &sr, NULL, + if (ngx_http_subrequest(r, &r->uri, &r->args, &ctx->sr, NULL, NGX_HTTP_SUBREQUEST_CLONE) != NGX_OK) { return NGX_ERROR; } - ngx_http_set_ctx(sr, ctx, ngx_http_slice_filter_module); + ngx_http_set_ctx(ctx->sr, ctx, ngx_http_slice_filter_module); slcf = ngx_http_get_module_loc_conf(r, ngx_http_slice_filter_module); @@ -259,6 +271,8 @@ ngx_http_slice_body_filter(ngx_http_request_t *r, ngx_chain_t *in) ctx->start + (off_t) slcf->size - 1) - ctx->range.data; + ctx->active = 0; + ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "http slice subrequest: \"%V\"", &ctx->range); Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_split_clients_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_ssi_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_ssi_filter_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_ssl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_ssl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_static_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_stub_status_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_sub_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_upstream_hash_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_upstream_ip_hash_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_upstream_keepalive_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_upstream_least_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_upstream_zone_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_userid_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_uwsgi_module.c (+1 -0) 99% =================================================================== --- vendor/nginx-1.11.12/src/http/modules/ngx_http_uwsgi_module.c 2017-04-06 13:46:08 +0900 (2ba64af) +++ vendor/nginx-1.11.13/src/http/modules/ngx_http_uwsgi_module.c 2017-04-06 14:58:34 +0900 (b7e7c12) @@ -114,6 +114,7 @@ static ngx_conf_bitmask_t ngx_http_uwsgi_next_upstream_masks[] = { { ngx_string("http_503"), NGX_HTTP_UPSTREAM_FT_HTTP_503 }, { ngx_string("http_403"), NGX_HTTP_UPSTREAM_FT_HTTP_403 }, { ngx_string("http_404"), NGX_HTTP_UPSTREAM_FT_HTTP_404 }, + { ngx_string("http_429"), NGX_HTTP_UPSTREAM_FT_HTTP_429 }, { ngx_string("updating"), NGX_HTTP_UPSTREAM_FT_UPDATING }, { ngx_string("off"), NGX_HTTP_UPSTREAM_FT_OFF }, { ngx_null_string, 0 } Renamed: vendor/nginx-1.11.13/src/http/modules/ngx_http_xslt_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/perl/Makefile.PL (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/perl/nginx.pm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/perl/nginx.xs (+1 -0) 99% =================================================================== --- vendor/nginx-1.11.12/src/http/modules/perl/nginx.xs 2017-04-06 13:46:08 +0900 (6716620) +++ vendor/nginx-1.11.13/src/http/modules/perl/nginx.xs 2017-04-06 14:58:34 +0900 (cca64da) @@ -1001,6 +1001,7 @@ sleep(r, sleep, next) ctx->next = SvRV(ST(2)); + r->connection->write->delayed = 1; ngx_add_timer(r->connection->write, sleep); r->write_event_handler = ngx_http_perl_sleep_handler; Renamed: vendor/nginx-1.11.13/src/http/modules/perl/ngx_http_perl_module.c (+7 -6) 99% =================================================================== --- vendor/nginx-1.11.12/src/http/modules/perl/ngx_http_perl_module.c 2017-04-06 13:46:08 +0900 (2796319) +++ vendor/nginx-1.11.13/src/http/modules/perl/ngx_http_perl_module.c 2017-04-06 14:58:34 +0900 (6d3be91) @@ -278,15 +278,16 @@ ngx_http_perl_sleep_handler(ngx_http_request_t *r) wev = r->connection->write; - if (wev->timedout) { - wev->timedout = 0; - ngx_http_perl_handle_request(r); + if (wev->delayed) { + + if (ngx_handle_write_event(wev, 0) != NGX_OK) { + ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); + } + return; } - if (ngx_handle_write_event(wev, 0) != NGX_OK) { - ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); - } + ngx_http_perl_handle_request(r); } Renamed: vendor/nginx-1.11.13/src/http/modules/perl/ngx_http_perl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/modules/perl/typemap (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/ngx_http.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/ngx_http.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/ngx_http_cache.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/ngx_http_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/ngx_http_copy_filter_module.c (+30 -2) 91% =================================================================== --- vendor/nginx-1.11.12/src/http/ngx_http_copy_filter_module.c 2017-04-06 13:46:08 +0900 (c696fb6) +++ vendor/nginx-1.11.13/src/http/ngx_http_copy_filter_module.c 2017-04-06 14:58:34 +0900 (c8ad5da) @@ -187,15 +187,24 @@ static void ngx_http_copy_aio_event_handler(ngx_event_t *ev) { ngx_event_aio_t *aio; + ngx_connection_t *c; ngx_http_request_t *r; aio = ev->data; r = aio->data; + c = r->connection; + + ngx_http_set_log_request(c->log, r); + + ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, + "http aio: \"%V?%V\"", &r->uri, &r->args); r->main->blocked--; r->aio = 0; - r->connection->write->handler(r->connection->write); + r->write_event_handler(r); + + ngx_http_run_posted_requests(c); } @@ -300,14 +309,33 @@ ngx_http_copy_thread_handler(ngx_thread_task_t *task, ngx_file_t *file) static void ngx_http_copy_thread_event_handler(ngx_event_t *ev) { + ngx_connection_t *c; ngx_http_request_t *r; r = ev->data; + c = r->connection; + + ngx_http_set_log_request(c->log, r); + + ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, + "http thread: \"%V?%V\"", &r->uri, &r->args); r->main->blocked--; r->aio = 0; - r->connection->write->handler(r->connection->write); + if (r->done) { + /* + * trigger connection event handler if the subrequest was + * already finalized; this can happen if the handler is used + * for sendfile() in threads + */ + + c->write->handler(c->write); + + } else { + r->write_event_handler(r); + ngx_http_run_posted_requests(c); + } } #endif Renamed: vendor/nginx-1.11.13/src/http/ngx_http_core_module.c (+5 -0) 99% =================================================================== --- vendor/nginx-1.11.12/src/http/ngx_http_core_module.c 2017-04-06 13:46:08 +0900 (c3957ba) +++ vendor/nginx-1.11.13/src/http/ngx_http_core_module.c 2017-04-06 14:58:34 +0900 (292671d) @@ -1314,6 +1314,11 @@ ngx_http_core_try_files_phase(ngx_http_request_t *r, if (ngx_open_cached_file(clcf->open_file_cache, &path, &of, r->pool) != NGX_OK) { + if (of.err == 0) { + ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); + return NGX_OK; + } + if (of.err != NGX_ENOENT && of.err != NGX_ENOTDIR && of.err != NGX_ENAMETOOLONG) Renamed: vendor/nginx-1.11.13/src/http/ngx_http_core_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/ngx_http_file_cache.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/ngx_http_header_filter_module.c (+10 -6) 97% =================================================================== --- vendor/nginx-1.11.12/src/http/ngx_http_header_filter_module.c 2017-04-06 13:46:08 +0900 (ddae613) +++ vendor/nginx-1.11.13/src/http/ngx_http_header_filter_module.c 2017-04-06 14:58:34 +0900 (c09c519) @@ -101,12 +101,16 @@ static ngx_str_t ngx_http_status_lines[] = { ngx_null_string, /* "419 unused" */ ngx_null_string, /* "420 unused" */ ngx_string("421 Misdirected Request"), - - /* ngx_null_string, */ /* "422 Unprocessable Entity" */ - /* ngx_null_string, */ /* "423 Locked" */ - /* ngx_null_string, */ /* "424 Failed Dependency" */ - -#define NGX_HTTP_LAST_4XX 422 + ngx_null_string, /* "422 Unprocessable Entity" */ + ngx_null_string, /* "423 Locked" */ + ngx_null_string, /* "424 Failed Dependency" */ + ngx_null_string, /* "425 unused" */ + ngx_null_string, /* "426 Upgrade Required" */ + ngx_null_string, /* "427 unused" */ + ngx_null_string, /* "428 Precondition Required" */ + ngx_string("429 Too Many Requests"), + +#define NGX_HTTP_LAST_4XX 430 #define NGX_HTTP_OFF_5XX (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX) ngx_string("500 Internal Server Error"), Renamed: vendor/nginx-1.11.13/src/http/ngx_http_parse.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/ngx_http_postpone_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/ngx_http_request.c (+16 -23) 99% =================================================================== --- vendor/nginx-1.11.12/src/http/ngx_http_request.c 2017-04-06 13:46:08 +0900 (dd54910) +++ vendor/nginx-1.11.13/src/http/ngx_http_request.c 2017-04-06 14:58:34 +0900 (476f039) @@ -2198,6 +2198,11 @@ ngx_http_request_handler(ngx_event_t *ev) ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, "http run request: \"%V?%V\"", &r->uri, &r->args); + if (ev->delayed && ev->timedout) { + ev->delayed = 0; + ev->timedout = 0; + } + if (ev->write) { r->write_event_handler(r); @@ -2607,7 +2612,7 @@ ngx_http_set_write_handler(ngx_http_request_t *r) static void ngx_http_writer(ngx_http_request_t *r) { - int rc; + ngx_int_t rc; ngx_event_t *wev; ngx_connection_t *c; ngx_http_core_loc_conf_t *clcf; @@ -2621,34 +2626,22 @@ ngx_http_writer(ngx_http_request_t *r) clcf = ngx_http_get_module_loc_conf(r->main, ngx_http_core_module); if (wev->timedout) { - if (!wev->delayed) { - ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, - "client timed out"); - c->timedout = 1; - - ngx_http_finalize_request(r, NGX_HTTP_REQUEST_TIME_OUT); - return; - } - - wev->timedout = 0; - wev->delayed = 0; - - if (!wev->ready) { - ngx_add_timer(wev, clcf->send_timeout); - - if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) { - ngx_http_close_request(r, 0); - } - - return; - } + ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, + "client timed out"); + c->timedout = 1; + ngx_http_finalize_request(r, NGX_HTTP_REQUEST_TIME_OUT); + return; } if (wev->delayed || r->aio) { ngx_log_debug0(NGX_LOG_DEBUG_HTTP, wev->log, 0, "http writer delayed"); + if (!wev->delayed) { + ngx_add_timer(wev, clcf->send_timeout); + } + if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) { ngx_http_close_request(r, 0); } @@ -2659,7 +2652,7 @@ ngx_http_writer(ngx_http_request_t *r) rc = ngx_http_output_filter(r, NULL); ngx_log_debug3(NGX_LOG_DEBUG_HTTP, c->log, 0, - "http writer output filter: %d, \"%V?%V\"", + "http writer output filter: %i, \"%V?%V\"", rc, &r->uri, &r->args); if (rc == NGX_ERROR) { Renamed: vendor/nginx-1.11.13/src/http/ngx_http_request.h (+1 -0) 99% =================================================================== --- vendor/nginx-1.11.12/src/http/ngx_http_request.h 2017-04-06 13:46:08 +0900 (780a99f) +++ vendor/nginx-1.11.13/src/http/ngx_http_request.h 2017-04-06 14:58:34 +0900 (a68b906) @@ -98,6 +98,7 @@ #define NGX_HTTP_UNSUPPORTED_MEDIA_TYPE 415 #define NGX_HTTP_RANGE_NOT_SATISFIABLE 416 #define NGX_HTTP_MISDIRECTED_REQUEST 421 +#define NGX_HTTP_TOO_MANY_REQUESTS 429 /* Our own HTTP codes */ Renamed: vendor/nginx-1.11.13/src/http/ngx_http_request_body.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/ngx_http_script.c (+6 -0) 99% =================================================================== --- vendor/nginx-1.11.12/src/http/ngx_http_script.c 2017-04-06 13:46:08 +0900 (cc4d679) +++ vendor/nginx-1.11.13/src/http/ngx_http_script.c 2017-04-06 14:58:34 +0900 (96f3ec6) @@ -1513,6 +1513,12 @@ ngx_http_script_file_code(ngx_http_script_engine_t *e) if (ngx_open_cached_file(clcf->open_file_cache, &path, &of, r->pool) != NGX_OK) { + if (of.err == 0) { + e->ip = ngx_http_script_exit; + e->status = NGX_HTTP_INTERNAL_SERVER_ERROR; + return; + } + if (of.err != NGX_ENOENT && of.err != NGX_ENOTDIR && of.err != NGX_ENAMETOOLONG) Renamed: vendor/nginx-1.11.13/src/http/ngx_http_script.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/ngx_http_special_response.c (+18 -2) 97% =================================================================== --- vendor/nginx-1.11.12/src/http/ngx_http_special_response.c 2017-04-06 13:46:08 +0900 (9de0d15) +++ vendor/nginx-1.11.13/src/http/ngx_http_special_response.c 2017-04-06 14:58:34 +0900 (c9b1017) @@ -225,6 +225,14 @@ static char ngx_http_error_421_page[] = ; +static char ngx_http_error_429_page[] = +"<html>" CRLF +"<head><title>429 Too Many Requests</title></head>" CRLF +"<body bgcolor=\"white\">" CRLF +"<center><h1>429 Too Many Requests</h1></center>" CRLF +; + + static char ngx_http_error_494_page[] = "<html>" CRLF "<head><title>400 Request Header Or Cookie Too Large</title></head>" @@ -354,8 +362,16 @@ static ngx_str_t ngx_http_error_pages[] = { ngx_null_string, /* 419 */ ngx_null_string, /* 420 */ ngx_string(ngx_http_error_421_page), - -#define NGX_HTTP_LAST_4XX 422 + ngx_null_string, /* 422 */ + ngx_null_string, /* 423 */ + ngx_null_string, /* 424 */ + ngx_null_string, /* 425 */ + ngx_null_string, /* 426 */ + ngx_null_string, /* 427 */ + ngx_null_string, /* 428 */ + ngx_string(ngx_http_error_429_page), + +#define NGX_HTTP_LAST_4XX 430 #define NGX_HTTP_OFF_5XX (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX) ngx_string(ngx_http_error_494_page), /* 494, request header too large */ Renamed: vendor/nginx-1.11.13/src/http/ngx_http_upstream.c (+27 -51) 99% =================================================================== --- vendor/nginx-1.11.12/src/http/ngx_http_upstream.c 2017-04-06 13:46:08 +0900 (1404693) +++ vendor/nginx-1.11.13/src/http/ngx_http_upstream.c 2017-04-06 14:58:34 +0900 (3695286) @@ -436,6 +436,7 @@ static ngx_http_upstream_next_t ngx_http_upstream_next_errors[] = { { 504, NGX_HTTP_UPSTREAM_FT_HTTP_504 }, { 403, NGX_HTTP_UPSTREAM_FT_HTTP_403 }, { 404, NGX_HTTP_UPSTREAM_FT_HTTP_404 }, + { 429, NGX_HTTP_UPSTREAM_FT_HTTP_429 }, { 0, 0 } }; @@ -1232,6 +1233,11 @@ ngx_http_upstream_handler(ngx_event_t *ev) ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, "http upstream request: \"%V?%V\"", &r->uri, &r->args); + if (ev->delayed && ev->timedout) { + ev->delayed = 0; + ev->timedout = 0; + } + if (ev->write) { u->write_event_handler(r, u); @@ -3736,9 +3742,19 @@ ngx_http_upstream_thread_event_handler(ngx_event_t *ev) r->main->blocked--; r->aio = 0; - r->write_event_handler(r); + if (r->done) { + /* + * trigger connection event handler if the subrequest was + * already finalized; this can happen if the handler is used + * for sendfile() in threads + */ + + c->write->handler(c->write); - ngx_http_run_posted_requests(c); + } else { + r->write_event_handler(r); + ngx_http_run_posted_requests(c); + } } #endif @@ -3786,31 +3802,9 @@ ngx_http_upstream_process_downstream(ngx_http_request_t *r) if (wev->timedout) { - if (wev->delayed) { - - wev->timedout = 0; - wev->delayed = 0; - - if (!wev->ready) { - ngx_add_timer(wev, p->send_timeout); - - if (ngx_handle_write_event(wev, p->send_lowat) != NGX_OK) { - ngx_http_upstream_finalize_request(r, u, NGX_ERROR); - } - - return; - } - - if (ngx_event_pipe(p, wev->write) == NGX_ABORT) { - ngx_http_upstream_finalize_request(r, u, NGX_ERROR); - return; - } - - } else { - p->downstream_error = 1; - c->timedout = 1; - ngx_connection_error(c, NGX_ETIMEDOUT, "client timed out"); - } + p->downstream_error = 1; + c->timedout = 1; + ngx_connection_error(c, NGX_ETIMEDOUT, "client timed out"); } else { @@ -3855,30 +3849,8 @@ ngx_http_upstream_process_upstream(ngx_http_request_t *r, if (rev->timedout) { - if (rev->delayed) { - - rev->timedout = 0; - rev->delayed = 0; - - if (!rev->ready) { - ngx_add_timer(rev, p->read_timeout); - - if (ngx_handle_read_event(rev, 0) != NGX_OK) { - ngx_http_upstream_finalize_request(r, u, NGX_ERROR); - } - - return; - } - - if (ngx_event_pipe(p, 0) == NGX_ABORT) { - ngx_http_upstream_finalize_request(r, u, NGX_ERROR); - return; - } - - } else { - p->upstream_error = 1; - ngx_connection_error(c, NGX_ETIMEDOUT, "upstream timed out"); - } + p->upstream_error = 1; + ngx_connection_error(c, NGX_ETIMEDOUT, "upstream timed out"); } else { @@ -4155,6 +4127,10 @@ ngx_http_upstream_next(ngx_http_request_t *r, ngx_http_upstream_t *u, status = NGX_HTTP_NOT_FOUND; break; + case NGX_HTTP_UPSTREAM_FT_HTTP_429: + status = NGX_HTTP_TOO_MANY_REQUESTS; + break; + /* * NGX_HTTP_UPSTREAM_FT_BUSY_LOCK and NGX_HTTP_UPSTREAM_FT_MAX_WAITING * never reach here Renamed: vendor/nginx-1.11.13/src/http/ngx_http_upstream.h (+7 -5) 97% =================================================================== --- vendor/nginx-1.11.12/src/http/ngx_http_upstream.h 2017-04-06 13:46:08 +0900 (625889b) +++ vendor/nginx-1.11.13/src/http/ngx_http_upstream.h 2017-04-06 14:58:34 +0900 (c552ac0) @@ -26,10 +26,11 @@ #define NGX_HTTP_UPSTREAM_FT_HTTP_504 0x00000080 #define NGX_HTTP_UPSTREAM_FT_HTTP_403 0x00000100 #define NGX_HTTP_UPSTREAM_FT_HTTP_404 0x00000200 -#define NGX_HTTP_UPSTREAM_FT_UPDATING 0x00000400 -#define NGX_HTTP_UPSTREAM_FT_BUSY_LOCK 0x00000800 -#define NGX_HTTP_UPSTREAM_FT_MAX_WAITING 0x00001000 -#define NGX_HTTP_UPSTREAM_FT_NON_IDEMPOTENT 0x00002000 +#define NGX_HTTP_UPSTREAM_FT_HTTP_429 0x00000400 +#define NGX_HTTP_UPSTREAM_FT_UPDATING 0x00000800 +#define NGX_HTTP_UPSTREAM_FT_BUSY_LOCK 0x00001000 +#define NGX_HTTP_UPSTREAM_FT_MAX_WAITING 0x00002000 +#define NGX_HTTP_UPSTREAM_FT_NON_IDEMPOTENT 0x00004000 #define NGX_HTTP_UPSTREAM_FT_NOLIVE 0x40000000 #define NGX_HTTP_UPSTREAM_FT_OFF 0x80000000 @@ -38,7 +39,8 @@ |NGX_HTTP_UPSTREAM_FT_HTTP_503 \ |NGX_HTTP_UPSTREAM_FT_HTTP_504 \ |NGX_HTTP_UPSTREAM_FT_HTTP_403 \ - |NGX_HTTP_UPSTREAM_FT_HTTP_404) + |NGX_HTTP_UPSTREAM_FT_HTTP_404 \ + |NGX_HTTP_UPSTREAM_FT_HTTP_429) #define NGX_HTTP_UPSTREAM_INVALID_HEADER 40 Renamed: vendor/nginx-1.11.13/src/http/ngx_http_upstream_round_robin.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/ngx_http_upstream_round_robin.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/ngx_http_variables.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/ngx_http_variables.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/ngx_http_write_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/v2/ngx_http_v2.c (+33 -20) 99% =================================================================== --- vendor/nginx-1.11.12/src/http/v2/ngx_http_v2.c 2017-04-06 13:46:08 +0900 (f3050f1) +++ vendor/nginx-1.11.13/src/http/v2/ngx_http_v2.c 2017-04-06 14:58:34 +0900 (55db58e) @@ -783,9 +783,12 @@ ngx_http_v2_state_head(ngx_http_v2_connection_t *h2c, u_char *pos, u_char *end) static u_char * ngx_http_v2_state_data(ngx_http_v2_connection_t *h2c, u_char *pos, u_char *end) { + size_t size; ngx_http_v2_node_t *node; ngx_http_v2_stream_t *stream; + size = h2c->state.length; + if (h2c->state.flags & NGX_HTTP_V2_PADDED_FLAG) { if (h2c->state.length == 0) { @@ -802,33 +805,33 @@ ngx_http_v2_state_data(ngx_http_v2_connection_t *h2c, u_char *pos, u_char *end) } h2c->state.padding = *pos++; - h2c->state.length--; - if (h2c->state.padding > h2c->state.length) { + if (h2c->state.padding >= size) { ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0, "client sent padded DATA frame " "with incorrect length: %uz, padding: %uz", - h2c->state.length, h2c->state.padding); + size, h2c->state.padding); - return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR); + return ngx_http_v2_connection_error(h2c, + NGX_HTTP_V2_PROTOCOL_ERROR); } - h2c->state.length -= h2c->state.padding; + h2c->state.length -= 1 + h2c->state.padding; } ngx_log_debug0(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0, "http2 DATA frame"); - if (h2c->state.length > h2c->recv_window) { + if (size > h2c->recv_window) { ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0, "client violated connection flow control: " "received DATA frame length %uz, available window %uz", - h2c->state.length, h2c->recv_window); + size, h2c->recv_window); return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_FLOW_CTRL_ERROR); } - h2c->recv_window -= h2c->state.length; + h2c->recv_window -= size; if (h2c->recv_window < NGX_HTTP_V2_MAX_WINDOW / 4) { @@ -854,11 +857,11 @@ ngx_http_v2_state_data(ngx_http_v2_connection_t *h2c, u_char *pos, u_char *end) stream = node->stream; - if (h2c->state.length > stream->recv_window) { + if (size > stream->recv_window) { ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0, "client violated flow control for stream %ui: " "received DATA frame length %uz, available window %uz", - node->id, h2c->state.length, stream->recv_window); + node->id, size, stream->recv_window); if (ngx_http_v2_terminate_stream(h2c, stream, NGX_HTTP_V2_FLOW_CTRL_ERROR) @@ -871,7 +874,7 @@ ngx_http_v2_state_data(ngx_http_v2_connection_t *h2c, u_char *pos, u_char *end) return ngx_http_v2_state_skip_padded(h2c, pos, end); } - stream->recv_window -= h2c->state.length; + stream->recv_window -= size; if (stream->no_flow_control && stream->recv_window < NGX_HTTP_V2_MAX_WINDOW / 4) @@ -938,7 +941,7 @@ ngx_http_v2_state_read_data(ngx_http_v2_connection_t *h2c, u_char *pos, if (size >= h2c->state.length) { size = h2c->state.length; - stream->in_closed = h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG; + stream->in_closed = h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG; } r = stream->request; @@ -1053,7 +1056,8 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos, "with incorrect length: %uz, padding: %uz", h2c->state.length, h2c->state.padding); - return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR); + return ngx_http_v2_connection_error(h2c, + NGX_HTTP_V2_PROTOCOL_ERROR); } h2c->state.length -= h2c->state.padding; @@ -1901,7 +1905,7 @@ ngx_http_v2_state_rst_stream(ngx_http_v2_connection_t *h2c, u_char *pos, if (node == NULL || node->stream == NULL) { ngx_log_debug0(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0, - "unknown http2 stream"); + "unknown http2 stream"); return ngx_http_v2_state_complete(h2c, pos, end); } @@ -2015,6 +2019,7 @@ ngx_http_v2_state_settings_params(ngx_http_v2_connection_t *h2c, u_char *pos, break; case NGX_HTTP_V2_MAX_FRAME_SIZE_SETTING: + if (value > NGX_HTTP_V2_MAX_FRAME_SIZE || value < NGX_HTTP_V2_DEFAULT_FRAME_SIZE) { @@ -3072,7 +3077,7 @@ ngx_http_v2_pseudo_header(ngx_http_request_t *r, ngx_http_v2_header_t *header) } ngx_log_error(NGX_LOG_INFO, r->connection->log, 0, - "client sent unknown pseudo header \"%V\"", + "client sent unknown pseudo-header \":%V\"", &header->name); return NGX_DECLINED; @@ -3219,14 +3224,14 @@ ngx_http_v2_parse_scheme(ngx_http_request_t *r, ngx_http_v2_header_t *header) { if (r->schema_start) { ngx_log_error(NGX_LOG_INFO, r->connection->log, 0, - "client sent duplicate :schema header"); + "client sent duplicate :scheme header"); return NGX_DECLINED; } if (header->value.len == 0) { ngx_log_error(NGX_LOG_INFO, r->connection->log, 0, - "client sent empty :schema header"); + "client sent empty :scheme header"); return NGX_DECLINED; } @@ -4130,6 +4135,14 @@ ngx_http_v2_handle_connection_handler(ngx_event_t *rev) ngx_log_debug0(NGX_LOG_DEBUG_HTTP, rev->log, 0, "http2 handle connection handler"); + c = rev->data; + h2c = c->data; + + if (c->error) { + ngx_http_v2_finalize_connection(h2c, 0); + return; + } + rev->handler = ngx_http_v2_read_handler; if (rev->ready) { @@ -4137,9 +4150,6 @@ ngx_http_v2_handle_connection_handler(ngx_event_t *rev) return; } - c = rev->data; - h2c = c->data; - if (h2c->last_out && ngx_http_v2_send_output_queue(h2c) == NGX_ERROR) { ngx_http_v2_finalize_connection(h2c, 0); return; @@ -4262,7 +4272,10 @@ ngx_http_v2_finalize_connection(ngx_http_v2_connection_t *h2c, if (stream->queued) { stream->queued = 0; + ev = fc->write; + ev->active = 0; + ev->ready = 1; } else { ev = fc->read; Renamed: vendor/nginx-1.11.13/src/http/v2/ngx_http_v2.h (+2 -2) 99% =================================================================== --- vendor/nginx-1.11.12/src/http/v2/ngx_http_v2.h 2017-04-06 13:46:08 +0900 (cddfccd) +++ vendor/nginx-1.11.13/src/http/v2/ngx_http_v2.h 2017-04-06 14:58:34 +0900 (7d2a2ea) @@ -249,8 +249,8 @@ ngx_http_v2_queue_blocked_frame(ngx_http_v2_connection_t *h2c, { ngx_http_v2_out_frame_t **out; - for (out = &h2c->last_out; *out; out = &(*out)->next) - { + for (out = &h2c->last_out; *out; out = &(*out)->next) { + if ((*out)->blocked || (*out)->stream == NULL) { break; } Renamed: vendor/nginx-1.11.13/src/http/v2/ngx_http_v2_filter_module.c (+5 -0) 99% =================================================================== --- vendor/nginx-1.11.12/src/http/v2/ngx_http_v2_filter_module.c 2017-04-06 13:46:08 +0900 (42fa0c5) +++ vendor/nginx-1.11.13/src/http/v2/ngx_http_v2_filter_module.c 2017-04-06 14:58:34 +0900 (dac5046) @@ -769,6 +769,8 @@ ngx_http_v2_create_headers_frame(ngx_http_request_t *r, u_char *pos, rest -= frame_size; if (rest) { + frame->length += NGX_HTTP_V2_FRAME_HEADER_SIZE; + type = NGX_HTTP_V2_CONTINUATION_FRAME; flags = NGX_HTTP_V2_NO_FLAG; continue; @@ -1209,6 +1211,9 @@ ngx_http_v2_headers_frame_handler(ngx_http_v2_connection_t *h2c, "http2:%ui HEADERS frame %p was sent", stream->node->id, frame); + stream->request->header_size += NGX_HTTP_V2_FRAME_HEADER_SIZE + + frame->length; + ngx_http_v2_handle_frame(stream, frame); ngx_http_v2_handle_stream(h2c, stream); Renamed: vendor/nginx-1.11.13/src/http/v2/ngx_http_v2_huff_decode.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/v2/ngx_http_v2_huff_encode.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/v2/ngx_http_v2_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/v2/ngx_http_v2_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/http/v2/ngx_http_v2_table.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/mail/ngx_mail.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/mail/ngx_mail.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/mail/ngx_mail_auth_http_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/mail/ngx_mail_core_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/mail/ngx_mail_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/mail/ngx_mail_imap_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/mail/ngx_mail_imap_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/mail/ngx_mail_imap_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/mail/ngx_mail_parse.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/mail/ngx_mail_pop3_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/mail/ngx_mail_pop3_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/mail/ngx_mail_pop3_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/mail/ngx_mail_proxy_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/mail/ngx_mail_smtp_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/mail/ngx_mail_smtp_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/mail/ngx_mail_smtp_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/mail/ngx_mail_ssl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/mail/ngx_mail_ssl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/misc/ngx_cpp_test_module.cpp (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/misc/ngx_google_perftools_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_alloc.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_alloc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_atomic.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_channel.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_channel.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_daemon.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_darwin.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_darwin_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_darwin_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_darwin_sendfile_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_dlopen.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_dlopen.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_errno.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_errno.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_file_aio_read.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_files.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_files.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_freebsd.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_freebsd_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_freebsd_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_freebsd_sendfile_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_gcc_atomic_amd64.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_gcc_atomic_ppc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_gcc_atomic_sparc64.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_gcc_atomic_x86.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_linux.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_linux_aio_read.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_linux_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_linux_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_linux_sendfile_chain.c (+47 -67) 86% =================================================================== --- vendor/nginx-1.11.12/src/os/unix/ngx_linux_sendfile_chain.c 2017-04-06 13:46:08 +0900 (3c0696a) +++ vendor/nginx-1.11.13/src/os/unix/ngx_linux_sendfile_chain.c 2017-04-06 14:58:34 +0900 (b44724c) @@ -20,8 +20,8 @@ static ssize_t ngx_linux_sendfile(ngx_connection_t *c, ngx_buf_t *file, #error sendfile64() is required! #endif -static ngx_int_t ngx_linux_sendfile_thread(ngx_connection_t *c, ngx_buf_t *file, - size_t size, size_t *sent); +static ssize_t ngx_linux_sendfile_thread(ngx_connection_t *c, ngx_buf_t *file, + size_t size); static void ngx_linux_sendfile_thread_handler(void *data, ngx_log_t *log); #endif @@ -56,10 +56,6 @@ ngx_linux_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) ngx_chain_t *cl; ngx_iovec_t header; struct iovec headers[NGX_IOVS_PREALLOCATE]; -#if (NGX_THREADS) - ngx_int_t rc; - ngx_uint_t thread_handled, thread_complete; -#endif wev = c->write; @@ -82,10 +78,6 @@ ngx_linux_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) for ( ;; ) { prev_send = send; -#if (NGX_THREADS) - thread_handled = 0; - thread_complete = 0; -#endif /* create the iovec and coalesce the neighbouring bufs */ @@ -179,38 +171,19 @@ ngx_linux_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) } #endif -#if (NGX_THREADS) - if (file->file->thread_handler) { - rc = ngx_linux_sendfile_thread(c, file, file_size, &sent); - - switch (rc) { - case NGX_OK: - thread_handled = 1; - break; - - case NGX_DONE: - thread_complete = 1; - break; - - case NGX_AGAIN: - break; - - default: /* NGX_ERROR */ - return NGX_CHAIN_ERROR; - } - - } else -#endif - { - n = ngx_linux_sendfile(c, file, file_size); + n = ngx_linux_sendfile(c, file, file_size); - if (n == NGX_ERROR) { - return NGX_CHAIN_ERROR; - } + if (n == NGX_ERROR) { + return NGX_CHAIN_ERROR; + } - sent = (n == NGX_AGAIN) ? 0 : n; + if (n == NGX_DONE) { + /* thread task posted */ + return in; } + sent = (n == NGX_AGAIN) ? 0 : n; + } else { n = ngx_writev(c, &header); @@ -225,21 +198,27 @@ ngx_linux_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) in = ngx_chain_update_sent(in, sent); - if ((size_t) (send - prev_send) != sent) { -#if (NGX_THREADS) - if (thread_handled) { - return in; - } - - if (thread_complete) { - send = prev_send + sent; - continue; - } -#endif + if (n == NGX_AGAIN) { wev->ready = 0; return in; } + if ((size_t) (send - prev_send) != sent) { + + /* + * sendfile() on Linux 4.3+ might be interrupted at any time, + * and provides no indication if it was interrupted or not, + * so we have to retry till an explicit EAGAIN + * + * sendfile() in threads can also report less bytes written + * than we are prepared to send now, since it was started in + * some point in the past, so we again have to retry + */ + + send = prev_send + sent; + continue; + } + if (send >= limit || in == NULL) { return in; } @@ -258,6 +237,14 @@ ngx_linux_sendfile(ngx_connection_t *c, ngx_buf_t *file, size_t size) ssize_t n; ngx_err_t err; +#if (NGX_THREADS) + + if (file->file->thread_handler) { + return ngx_linux_sendfile_thread(c, file, size); + } + +#endif + #if (NGX_HAVE_SENDFILE64) offset = file->file_pos; #else @@ -324,9 +311,8 @@ typedef struct { } ngx_linux_sendfile_ctx_t; -static ngx_int_t -ngx_linux_sendfile_thread(ngx_connection_t *c, ngx_buf_t *file, size_t size, - size_t *sent) +static ssize_t +ngx_linux_sendfile_thread(ngx_connection_t *c, ngx_buf_t *file, size_t size) { ngx_event_t *wev; ngx_thread_task_t *task; @@ -356,10 +342,14 @@ ngx_linux_sendfile_thread(ngx_connection_t *c, ngx_buf_t *file, size_t size, task->event.complete = 0; if (ctx->err == NGX_EAGAIN) { - *sent = 0; + /* + * if wev->complete is set, this means that a write event + * happened while we were waiting for the thread task, so + * we have to retry sending even on EAGAIN + */ if (wev->complete) { - return NGX_DONE; + return 0; } return NGX_AGAIN; @@ -384,13 +374,7 @@ ngx_linux_sendfile_thread(ngx_connection_t *c, ngx_buf_t *file, size_t size, return NGX_ERROR; } - *sent = ctx->sent; - - if (ctx->sent == ctx->size || wev->complete) { - return NGX_DONE; - } - - return NGX_AGAIN; + return ctx->sent; } if (task->event.active && ctx->file == file) { @@ -399,9 +383,7 @@ ngx_linux_sendfile_thread(ngx_connection_t *c, ngx_buf_t *file, size_t size, * or multiple calls of the next body filter from a filter */ - *sent = 0; - - return NGX_OK; + return NGX_DONE; } ctx->file = file; @@ -414,9 +396,7 @@ ngx_linux_sendfile_thread(ngx_connection_t *c, ngx_buf_t *file, size_t size, return NGX_ERROR; } - *sent = 0; - - return NGX_OK; + return NGX_DONE; } Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_os.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_posix_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_posix_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_process.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_process.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_process_cycle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_process_cycle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_readv_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_recv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_send.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_setaffinity.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_setaffinity.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_setproctitle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_setproctitle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_shmem.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_shmem.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_socket.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_socket.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_solaris.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_solaris_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_solaris_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_solaris_sendfilev_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_sunpro_amd64.il (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_sunpro_atomic_sparc64.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_sunpro_sparc64.il (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_sunpro_x86.il (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_thread.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_thread_cond.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_thread_id.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_thread_mutex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_time.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_time.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_udp_recv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_udp_send.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_udp_sendmsg_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_user.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_user.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/unix/ngx_writev_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/nginx.ico (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/nginx.rc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/nginx_icon16.xpm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/nginx_icon32.xpm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/nginx_icon48.xpm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/ngx_alloc.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/ngx_alloc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/ngx_atomic.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/ngx_dlopen.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/ngx_dlopen.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/ngx_errno.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/ngx_errno.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/ngx_event_log.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/ngx_files.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/ngx_files.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/ngx_os.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/ngx_process.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/ngx_process.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/ngx_process_cycle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/ngx_process_cycle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/ngx_service.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/ngx_shmem.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/ngx_shmem.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/ngx_socket.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/ngx_socket.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/ngx_stat.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/ngx_thread.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/ngx_thread.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/ngx_time.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/ngx_time.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/ngx_udp_wsarecv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/ngx_user.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/ngx_user.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/ngx_win32_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/ngx_win32_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/ngx_wsarecv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/ngx_wsarecv_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/ngx_wsasend.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/os/win32/ngx_wsasend_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/stream/ngx_stream.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/stream/ngx_stream.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/stream/ngx_stream_access_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/stream/ngx_stream_core_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/stream/ngx_stream_geo_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/stream/ngx_stream_geoip_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/stream/ngx_stream_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/stream/ngx_stream_limit_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/stream/ngx_stream_log_module.c (+5 -0) 99% =================================================================== --- vendor/nginx-1.11.12/src/stream/ngx_stream_log_module.c 2017-04-06 13:46:08 +0900 (6b29340) +++ vendor/nginx-1.11.13/src/stream/ngx_stream_log_module.c 2017-04-06 14:58:34 +0900 (466bdda) @@ -443,6 +443,11 @@ ngx_stream_log_script_write(ngx_stream_session_t *s, s->connection->pool) != NGX_OK) { + if (of.err == 0) { + /* simulate successful logging */ + return len; + } + ngx_log_error(NGX_LOG_CRIT, s->connection->log, ngx_errno, "%s \"%s\" failed", of.failed, log.data); /* simulate successful logging */ Renamed: vendor/nginx-1.11.13/src/stream/ngx_stream_map_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/stream/ngx_stream_proxy_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/stream/ngx_stream_realip_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/stream/ngx_stream_return_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/stream/ngx_stream_script.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/stream/ngx_stream_script.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/stream/ngx_stream_split_clients_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/stream/ngx_stream_ssl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/stream/ngx_stream_ssl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/stream/ngx_stream_ssl_preread_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/stream/ngx_stream_upstream.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/stream/ngx_stream_upstream.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/stream/ngx_stream_upstream_hash_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/stream/ngx_stream_upstream_least_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/stream/ngx_stream_upstream_round_robin.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/stream/ngx_stream_upstream_round_robin.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/stream/ngx_stream_upstream_zone_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/stream/ngx_stream_variables.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/stream/ngx_stream_variables.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.11.13/src/stream/ngx_stream_write_filter_module.c (+0 -0) 100% ===================================================================
