Kouhei Sutou
null+****@clear*****
Wed Oct 28 10:46:57 JST 2015
Kouhei Sutou 2015-10-28 10:46:57 +0900 (Wed, 28 Oct 2015) New Revision: 8388c51faf7d5e6daf065377122c820f11919481 https://github.com/groonga/groonga/commit/8388c51faf7d5e6daf065377122c820f11919481 Message: nginx: upgrade to 1.9.6 Removed files: packages/windows/patches/nginx-1.9-5-fix-build-error.diff Modified files: nginx_version packages/windows/Rakefile Renamed files: vendor/nginx-1.9.6/auto/cc/acc (from vendor/nginx-1.9.5/auto/cc/acc) vendor/nginx-1.9.6/auto/cc/bcc (from vendor/nginx-1.9.5/auto/cc/bcc) vendor/nginx-1.9.6/auto/cc/ccc (from vendor/nginx-1.9.5/auto/cc/ccc) vendor/nginx-1.9.6/auto/cc/clang (from vendor/nginx-1.9.5/auto/cc/clang) vendor/nginx-1.9.6/auto/cc/conf (from vendor/nginx-1.9.5/auto/cc/conf) vendor/nginx-1.9.6/auto/cc/gcc (from vendor/nginx-1.9.5/auto/cc/gcc) vendor/nginx-1.9.6/auto/cc/icc (from vendor/nginx-1.9.5/auto/cc/icc) vendor/nginx-1.9.6/auto/cc/msvc (from vendor/nginx-1.9.5/auto/cc/msvc) vendor/nginx-1.9.6/auto/cc/name (from vendor/nginx-1.9.5/auto/cc/name) vendor/nginx-1.9.6/auto/cc/owc (from vendor/nginx-1.9.5/auto/cc/owc) vendor/nginx-1.9.6/auto/cc/sunc (from vendor/nginx-1.9.5/auto/cc/sunc) vendor/nginx-1.9.6/auto/configure (from vendor/nginx-1.9.5/auto/configure) vendor/nginx-1.9.6/auto/define (from vendor/nginx-1.9.5/auto/define) vendor/nginx-1.9.6/auto/endianness (from vendor/nginx-1.9.5/auto/endianness) vendor/nginx-1.9.6/auto/feature (from vendor/nginx-1.9.5/auto/feature) vendor/nginx-1.9.6/auto/have (from vendor/nginx-1.9.5/auto/have) vendor/nginx-1.9.6/auto/have_headers (from vendor/nginx-1.9.5/auto/have_headers) vendor/nginx-1.9.6/auto/headers (from vendor/nginx-1.9.5/auto/headers) vendor/nginx-1.9.6/auto/include (from vendor/nginx-1.9.5/auto/include) vendor/nginx-1.9.6/auto/init (from vendor/nginx-1.9.5/auto/init) vendor/nginx-1.9.6/auto/install (from vendor/nginx-1.9.5/auto/install) vendor/nginx-1.9.6/auto/lib/conf (from vendor/nginx-1.9.5/auto/lib/conf) vendor/nginx-1.9.6/auto/lib/geoip/conf (from vendor/nginx-1.9.5/auto/lib/geoip/conf) vendor/nginx-1.9.6/auto/lib/google-perftools/conf (from vendor/nginx-1.9.5/auto/lib/google-perftools/conf) vendor/nginx-1.9.6/auto/lib/libatomic/conf (from vendor/nginx-1.9.5/auto/lib/libatomic/conf) vendor/nginx-1.9.6/auto/lib/libatomic/make (from vendor/nginx-1.9.5/auto/lib/libatomic/make) vendor/nginx-1.9.6/auto/lib/libgd/conf (from vendor/nginx-1.9.5/auto/lib/libgd/conf) vendor/nginx-1.9.6/auto/lib/libxslt/conf (from vendor/nginx-1.9.5/auto/lib/libxslt/conf) vendor/nginx-1.9.6/auto/lib/make (from vendor/nginx-1.9.5/auto/lib/make) vendor/nginx-1.9.6/auto/lib/md5/conf (from vendor/nginx-1.9.5/auto/lib/md5/conf) vendor/nginx-1.9.6/auto/lib/md5/make (from vendor/nginx-1.9.5/auto/lib/md5/make) vendor/nginx-1.9.6/auto/lib/md5/makefile.bcc (from vendor/nginx-1.9.5/auto/lib/md5/makefile.bcc) vendor/nginx-1.9.6/auto/lib/md5/makefile.msvc (from vendor/nginx-1.9.5/auto/lib/md5/makefile.msvc) vendor/nginx-1.9.6/auto/lib/md5/makefile.owc (from vendor/nginx-1.9.5/auto/lib/md5/makefile.owc) vendor/nginx-1.9.6/auto/lib/openssl/conf (from vendor/nginx-1.9.5/auto/lib/openssl/conf) vendor/nginx-1.9.6/auto/lib/openssl/make (from vendor/nginx-1.9.5/auto/lib/openssl/make) vendor/nginx-1.9.6/auto/lib/openssl/makefile.bcc (from vendor/nginx-1.9.5/auto/lib/openssl/makefile.bcc) vendor/nginx-1.9.6/auto/lib/openssl/makefile.msvc (from vendor/nginx-1.9.5/auto/lib/openssl/makefile.msvc) vendor/nginx-1.9.6/auto/lib/pcre/conf (from vendor/nginx-1.9.5/auto/lib/pcre/conf) vendor/nginx-1.9.6/auto/lib/pcre/make (from vendor/nginx-1.9.5/auto/lib/pcre/make) vendor/nginx-1.9.6/auto/lib/pcre/makefile.bcc (from vendor/nginx-1.9.5/auto/lib/pcre/makefile.bcc) vendor/nginx-1.9.6/auto/lib/pcre/makefile.msvc (from vendor/nginx-1.9.5/auto/lib/pcre/makefile.msvc) vendor/nginx-1.9.6/auto/lib/pcre/makefile.owc (from vendor/nginx-1.9.5/auto/lib/pcre/makefile.owc) vendor/nginx-1.9.6/auto/lib/perl/conf (from vendor/nginx-1.9.5/auto/lib/perl/conf) vendor/nginx-1.9.6/auto/lib/perl/make (from vendor/nginx-1.9.5/auto/lib/perl/make) vendor/nginx-1.9.6/auto/lib/sha1/conf (from vendor/nginx-1.9.5/auto/lib/sha1/conf) vendor/nginx-1.9.6/auto/lib/sha1/make (from vendor/nginx-1.9.5/auto/lib/sha1/make) vendor/nginx-1.9.6/auto/lib/sha1/makefile.bcc (from vendor/nginx-1.9.5/auto/lib/sha1/makefile.bcc) vendor/nginx-1.9.6/auto/lib/sha1/makefile.msvc (from vendor/nginx-1.9.5/auto/lib/sha1/makefile.msvc) vendor/nginx-1.9.6/auto/lib/sha1/makefile.owc (from vendor/nginx-1.9.5/auto/lib/sha1/makefile.owc) vendor/nginx-1.9.6/auto/lib/test (from vendor/nginx-1.9.5/auto/lib/test) vendor/nginx-1.9.6/auto/lib/zlib/conf (from vendor/nginx-1.9.5/auto/lib/zlib/conf) vendor/nginx-1.9.6/auto/lib/zlib/make (from vendor/nginx-1.9.5/auto/lib/zlib/make) vendor/nginx-1.9.6/auto/lib/zlib/makefile.bcc (from vendor/nginx-1.9.5/auto/lib/zlib/makefile.bcc) vendor/nginx-1.9.6/auto/lib/zlib/makefile.msvc (from vendor/nginx-1.9.5/auto/lib/zlib/makefile.msvc) vendor/nginx-1.9.6/auto/lib/zlib/makefile.owc (from vendor/nginx-1.9.5/auto/lib/zlib/makefile.owc) vendor/nginx-1.9.6/auto/make (from vendor/nginx-1.9.5/auto/make) vendor/nginx-1.9.6/auto/modules (from vendor/nginx-1.9.5/auto/modules) vendor/nginx-1.9.6/auto/nohave (from vendor/nginx-1.9.5/auto/nohave) vendor/nginx-1.9.6/auto/options (from vendor/nginx-1.9.5/auto/options) vendor/nginx-1.9.6/auto/os/conf (from vendor/nginx-1.9.5/auto/os/conf) vendor/nginx-1.9.6/auto/os/darwin (from vendor/nginx-1.9.5/auto/os/darwin) vendor/nginx-1.9.6/auto/os/freebsd (from vendor/nginx-1.9.5/auto/os/freebsd) vendor/nginx-1.9.6/auto/os/linux (from vendor/nginx-1.9.5/auto/os/linux) vendor/nginx-1.9.6/auto/os/solaris (from vendor/nginx-1.9.5/auto/os/solaris) vendor/nginx-1.9.6/auto/os/win32 (from vendor/nginx-1.9.5/auto/os/win32) vendor/nginx-1.9.6/auto/sources (from vendor/nginx-1.9.5/auto/sources) vendor/nginx-1.9.6/auto/stubs (from vendor/nginx-1.9.5/auto/stubs) vendor/nginx-1.9.6/auto/summary (from vendor/nginx-1.9.5/auto/summary) vendor/nginx-1.9.6/auto/threads (from vendor/nginx-1.9.5/auto/threads) vendor/nginx-1.9.6/auto/types/sizeof (from vendor/nginx-1.9.5/auto/types/sizeof) vendor/nginx-1.9.6/auto/types/typedef (from vendor/nginx-1.9.5/auto/types/typedef) vendor/nginx-1.9.6/auto/types/uintptr_t (from vendor/nginx-1.9.5/auto/types/uintptr_t) vendor/nginx-1.9.6/auto/types/value (from vendor/nginx-1.9.5/auto/types/value) vendor/nginx-1.9.6/auto/unix (from vendor/nginx-1.9.5/auto/unix) vendor/nginx-1.9.6/conf/fastcgi.conf (from vendor/nginx-1.9.5/conf/fastcgi.conf) vendor/nginx-1.9.6/conf/fastcgi_params (from vendor/nginx-1.9.5/conf/fastcgi_params) vendor/nginx-1.9.6/conf/koi-utf (from vendor/nginx-1.9.5/conf/koi-utf) vendor/nginx-1.9.6/conf/koi-win (from vendor/nginx-1.9.5/conf/koi-win) vendor/nginx-1.9.6/conf/mime.types (from vendor/nginx-1.9.5/conf/mime.types) vendor/nginx-1.9.6/conf/nginx.conf (from vendor/nginx-1.9.5/conf/nginx.conf) vendor/nginx-1.9.6/conf/scgi_params (from vendor/nginx-1.9.5/conf/scgi_params) vendor/nginx-1.9.6/conf/uwsgi_params (from vendor/nginx-1.9.5/conf/uwsgi_params) vendor/nginx-1.9.6/conf/win-utf (from vendor/nginx-1.9.5/conf/win-utf) vendor/nginx-1.9.6/contrib/README (from vendor/nginx-1.9.5/contrib/README) vendor/nginx-1.9.6/contrib/geo2nginx.pl (from vendor/nginx-1.9.5/contrib/geo2nginx.pl) vendor/nginx-1.9.6/contrib/unicode2nginx/koi-utf (from vendor/nginx-1.9.5/contrib/unicode2nginx/koi-utf) vendor/nginx-1.9.6/contrib/unicode2nginx/unicode-to-nginx.pl (from vendor/nginx-1.9.5/contrib/unicode2nginx/unicode-to-nginx.pl) vendor/nginx-1.9.6/contrib/unicode2nginx/win-utf (from vendor/nginx-1.9.5/contrib/unicode2nginx/win-utf) vendor/nginx-1.9.6/contrib/vim/ftdetect/nginx.vim (from vendor/nginx-1.9.5/contrib/vim/ftdetect/nginx.vim) vendor/nginx-1.9.6/contrib/vim/indent/nginx.vim (from vendor/nginx-1.9.5/contrib/vim/indent/nginx.vim) vendor/nginx-1.9.6/contrib/vim/syntax/nginx.vim (from vendor/nginx-1.9.5/contrib/vim/syntax/nginx.vim) vendor/nginx-1.9.6/docs/GNUmakefile (from vendor/nginx-1.9.5/docs/GNUmakefile) vendor/nginx-1.9.6/docs/dtd/change_log_conf.dtd (from vendor/nginx-1.9.5/docs/dtd/change_log_conf.dtd) vendor/nginx-1.9.6/docs/dtd/changes.dtd (from vendor/nginx-1.9.5/docs/dtd/changes.dtd) vendor/nginx-1.9.6/docs/html/50x.html (from vendor/nginx-1.9.5/docs/html/50x.html) vendor/nginx-1.9.6/docs/html/index.html (from vendor/nginx-1.9.5/docs/html/index.html) vendor/nginx-1.9.6/docs/man/nginx.8 (from vendor/nginx-1.9.5/docs/man/nginx.8) vendor/nginx-1.9.6/docs/text/LICENSE (from vendor/nginx-1.9.5/docs/text/LICENSE) vendor/nginx-1.9.6/docs/text/README (from vendor/nginx-1.9.5/docs/text/README) vendor/nginx-1.9.6/docs/xml/change_log_conf.xml (from vendor/nginx-1.9.5/docs/xml/change_log_conf.xml) vendor/nginx-1.9.6/docs/xml/nginx/changes.xml (from vendor/nginx-1.9.5/docs/xml/nginx/changes.xml) vendor/nginx-1.9.6/docs/xsls/changes.xsls (from vendor/nginx-1.9.5/docs/xsls/changes.xsls) vendor/nginx-1.9.6/docs/xslt/changes.xslt (from vendor/nginx-1.9.5/docs/xslt/changes.xslt) vendor/nginx-1.9.6/misc/GNUmakefile (from vendor/nginx-1.9.5/misc/GNUmakefile) vendor/nginx-1.9.6/misc/README (from vendor/nginx-1.9.5/misc/README) vendor/nginx-1.9.6/src/core/nginx.c (from vendor/nginx-1.9.5/src/core/nginx.c) vendor/nginx-1.9.6/src/core/nginx.h (from vendor/nginx-1.9.5/src/core/nginx.h) vendor/nginx-1.9.6/src/core/ngx_array.c (from vendor/nginx-1.9.5/src/core/ngx_array.c) vendor/nginx-1.9.6/src/core/ngx_array.h (from vendor/nginx-1.9.5/src/core/ngx_array.h) vendor/nginx-1.9.6/src/core/ngx_buf.c (from vendor/nginx-1.9.5/src/core/ngx_buf.c) vendor/nginx-1.9.6/src/core/ngx_buf.h (from vendor/nginx-1.9.5/src/core/ngx_buf.h) vendor/nginx-1.9.6/src/core/ngx_conf_file.c (from vendor/nginx-1.9.5/src/core/ngx_conf_file.c) vendor/nginx-1.9.6/src/core/ngx_conf_file.h (from vendor/nginx-1.9.5/src/core/ngx_conf_file.h) vendor/nginx-1.9.6/src/core/ngx_config.h (from vendor/nginx-1.9.5/src/core/ngx_config.h) vendor/nginx-1.9.6/src/core/ngx_connection.c (from vendor/nginx-1.9.5/src/core/ngx_connection.c) vendor/nginx-1.9.6/src/core/ngx_connection.h (from vendor/nginx-1.9.5/src/core/ngx_connection.h) vendor/nginx-1.9.6/src/core/ngx_core.h (from vendor/nginx-1.9.5/src/core/ngx_core.h) vendor/nginx-1.9.6/src/core/ngx_cpuinfo.c (from vendor/nginx-1.9.5/src/core/ngx_cpuinfo.c) vendor/nginx-1.9.6/src/core/ngx_crc.h (from vendor/nginx-1.9.5/src/core/ngx_crc.h) vendor/nginx-1.9.6/src/core/ngx_crc32.c (from vendor/nginx-1.9.5/src/core/ngx_crc32.c) vendor/nginx-1.9.6/src/core/ngx_crc32.h (from vendor/nginx-1.9.5/src/core/ngx_crc32.h) vendor/nginx-1.9.6/src/core/ngx_crypt.c (from vendor/nginx-1.9.5/src/core/ngx_crypt.c) vendor/nginx-1.9.6/src/core/ngx_crypt.h (from vendor/nginx-1.9.5/src/core/ngx_crypt.h) vendor/nginx-1.9.6/src/core/ngx_cycle.c (from vendor/nginx-1.9.5/src/core/ngx_cycle.c) vendor/nginx-1.9.6/src/core/ngx_cycle.h (from vendor/nginx-1.9.5/src/core/ngx_cycle.h) vendor/nginx-1.9.6/src/core/ngx_file.c (from vendor/nginx-1.9.5/src/core/ngx_file.c) vendor/nginx-1.9.6/src/core/ngx_file.h (from vendor/nginx-1.9.5/src/core/ngx_file.h) vendor/nginx-1.9.6/src/core/ngx_hash.c (from vendor/nginx-1.9.5/src/core/ngx_hash.c) vendor/nginx-1.9.6/src/core/ngx_hash.h (from vendor/nginx-1.9.5/src/core/ngx_hash.h) vendor/nginx-1.9.6/src/core/ngx_inet.c (from vendor/nginx-1.9.5/src/core/ngx_inet.c) vendor/nginx-1.9.6/src/core/ngx_inet.h (from vendor/nginx-1.9.5/src/core/ngx_inet.h) vendor/nginx-1.9.6/src/core/ngx_list.c (from vendor/nginx-1.9.5/src/core/ngx_list.c) vendor/nginx-1.9.6/src/core/ngx_list.h (from vendor/nginx-1.9.5/src/core/ngx_list.h) vendor/nginx-1.9.6/src/core/ngx_log.c (from vendor/nginx-1.9.5/src/core/ngx_log.c) vendor/nginx-1.9.6/src/core/ngx_log.h (from vendor/nginx-1.9.5/src/core/ngx_log.h) vendor/nginx-1.9.6/src/core/ngx_md5.c (from vendor/nginx-1.9.5/src/core/ngx_md5.c) vendor/nginx-1.9.6/src/core/ngx_md5.h (from vendor/nginx-1.9.5/src/core/ngx_md5.h) vendor/nginx-1.9.6/src/core/ngx_murmurhash.c (from vendor/nginx-1.9.5/src/core/ngx_murmurhash.c) vendor/nginx-1.9.6/src/core/ngx_murmurhash.h (from vendor/nginx-1.9.5/src/core/ngx_murmurhash.h) vendor/nginx-1.9.6/src/core/ngx_open_file_cache.c (from vendor/nginx-1.9.5/src/core/ngx_open_file_cache.c) vendor/nginx-1.9.6/src/core/ngx_open_file_cache.h (from vendor/nginx-1.9.5/src/core/ngx_open_file_cache.h) vendor/nginx-1.9.6/src/core/ngx_output_chain.c (from vendor/nginx-1.9.5/src/core/ngx_output_chain.c) vendor/nginx-1.9.6/src/core/ngx_palloc.c (from vendor/nginx-1.9.5/src/core/ngx_palloc.c) vendor/nginx-1.9.6/src/core/ngx_palloc.h (from vendor/nginx-1.9.5/src/core/ngx_palloc.h) vendor/nginx-1.9.6/src/core/ngx_parse.c (from vendor/nginx-1.9.5/src/core/ngx_parse.c) vendor/nginx-1.9.6/src/core/ngx_parse.h (from vendor/nginx-1.9.5/src/core/ngx_parse.h) vendor/nginx-1.9.6/src/core/ngx_parse_time.c (from vendor/nginx-1.9.5/src/core/ngx_parse_time.c) vendor/nginx-1.9.6/src/core/ngx_parse_time.h (from vendor/nginx-1.9.5/src/core/ngx_parse_time.h) vendor/nginx-1.9.6/src/core/ngx_proxy_protocol.c (from vendor/nginx-1.9.5/src/core/ngx_proxy_protocol.c) vendor/nginx-1.9.6/src/core/ngx_proxy_protocol.h (from vendor/nginx-1.9.5/src/core/ngx_proxy_protocol.h) vendor/nginx-1.9.6/src/core/ngx_queue.c (from vendor/nginx-1.9.5/src/core/ngx_queue.c) vendor/nginx-1.9.6/src/core/ngx_queue.h (from vendor/nginx-1.9.5/src/core/ngx_queue.h) vendor/nginx-1.9.6/src/core/ngx_radix_tree.c (from vendor/nginx-1.9.5/src/core/ngx_radix_tree.c) vendor/nginx-1.9.6/src/core/ngx_radix_tree.h (from vendor/nginx-1.9.5/src/core/ngx_radix_tree.h) vendor/nginx-1.9.6/src/core/ngx_rbtree.c (from vendor/nginx-1.9.5/src/core/ngx_rbtree.c) vendor/nginx-1.9.6/src/core/ngx_rbtree.h (from vendor/nginx-1.9.5/src/core/ngx_rbtree.h) vendor/nginx-1.9.6/src/core/ngx_regex.c (from vendor/nginx-1.9.5/src/core/ngx_regex.c) vendor/nginx-1.9.6/src/core/ngx_regex.h (from vendor/nginx-1.9.5/src/core/ngx_regex.h) vendor/nginx-1.9.6/src/core/ngx_resolver.c (from vendor/nginx-1.9.5/src/core/ngx_resolver.c) vendor/nginx-1.9.6/src/core/ngx_resolver.h (from vendor/nginx-1.9.5/src/core/ngx_resolver.h) vendor/nginx-1.9.6/src/core/ngx_rwlock.c (from vendor/nginx-1.9.5/src/core/ngx_rwlock.c) vendor/nginx-1.9.6/src/core/ngx_rwlock.h (from vendor/nginx-1.9.5/src/core/ngx_rwlock.h) vendor/nginx-1.9.6/src/core/ngx_sha1.h (from vendor/nginx-1.9.5/src/core/ngx_sha1.h) vendor/nginx-1.9.6/src/core/ngx_shmtx.c (from vendor/nginx-1.9.5/src/core/ngx_shmtx.c) vendor/nginx-1.9.6/src/core/ngx_shmtx.h (from vendor/nginx-1.9.5/src/core/ngx_shmtx.h) vendor/nginx-1.9.6/src/core/ngx_slab.c (from vendor/nginx-1.9.5/src/core/ngx_slab.c) vendor/nginx-1.9.6/src/core/ngx_slab.h (from vendor/nginx-1.9.5/src/core/ngx_slab.h) vendor/nginx-1.9.6/src/core/ngx_spinlock.c (from vendor/nginx-1.9.5/src/core/ngx_spinlock.c) vendor/nginx-1.9.6/src/core/ngx_string.c (from vendor/nginx-1.9.5/src/core/ngx_string.c) vendor/nginx-1.9.6/src/core/ngx_string.h (from vendor/nginx-1.9.5/src/core/ngx_string.h) vendor/nginx-1.9.6/src/core/ngx_syslog.c (from vendor/nginx-1.9.5/src/core/ngx_syslog.c) vendor/nginx-1.9.6/src/core/ngx_syslog.h (from vendor/nginx-1.9.5/src/core/ngx_syslog.h) vendor/nginx-1.9.6/src/core/ngx_thread_pool.c (from vendor/nginx-1.9.5/src/core/ngx_thread_pool.c) vendor/nginx-1.9.6/src/core/ngx_thread_pool.h (from vendor/nginx-1.9.5/src/core/ngx_thread_pool.h) vendor/nginx-1.9.6/src/core/ngx_times.c (from vendor/nginx-1.9.5/src/core/ngx_times.c) vendor/nginx-1.9.6/src/core/ngx_times.h (from vendor/nginx-1.9.5/src/core/ngx_times.h) vendor/nginx-1.9.6/src/event/modules/ngx_devpoll_module.c (from vendor/nginx-1.9.5/src/event/modules/ngx_devpoll_module.c) vendor/nginx-1.9.6/src/event/modules/ngx_epoll_module.c (from vendor/nginx-1.9.5/src/event/modules/ngx_epoll_module.c) vendor/nginx-1.9.6/src/event/modules/ngx_eventport_module.c (from vendor/nginx-1.9.5/src/event/modules/ngx_eventport_module.c) vendor/nginx-1.9.6/src/event/modules/ngx_iocp_module.c (from vendor/nginx-1.9.5/src/event/modules/ngx_iocp_module.c) vendor/nginx-1.9.6/src/event/modules/ngx_iocp_module.h (from vendor/nginx-1.9.5/src/event/modules/ngx_iocp_module.h) vendor/nginx-1.9.6/src/event/modules/ngx_kqueue_module.c (from vendor/nginx-1.9.5/src/event/modules/ngx_kqueue_module.c) vendor/nginx-1.9.6/src/event/modules/ngx_poll_module.c (from vendor/nginx-1.9.5/src/event/modules/ngx_poll_module.c) vendor/nginx-1.9.6/src/event/modules/ngx_select_module.c (from vendor/nginx-1.9.5/src/event/modules/ngx_select_module.c) vendor/nginx-1.9.6/src/event/modules/ngx_win32_select_module.c (from vendor/nginx-1.9.5/src/event/modules/ngx_win32_select_module.c) vendor/nginx-1.9.6/src/event/ngx_event.c (from vendor/nginx-1.9.5/src/event/ngx_event.c) vendor/nginx-1.9.6/src/event/ngx_event.h (from vendor/nginx-1.9.5/src/event/ngx_event.h) vendor/nginx-1.9.6/src/event/ngx_event_accept.c (from vendor/nginx-1.9.5/src/event/ngx_event_accept.c) vendor/nginx-1.9.6/src/event/ngx_event_acceptex.c (from vendor/nginx-1.9.5/src/event/ngx_event_acceptex.c) vendor/nginx-1.9.6/src/event/ngx_event_connect.c (from vendor/nginx-1.9.5/src/event/ngx_event_connect.c) vendor/nginx-1.9.6/src/event/ngx_event_connect.h (from vendor/nginx-1.9.5/src/event/ngx_event_connect.h) vendor/nginx-1.9.6/src/event/ngx_event_connectex.c (from vendor/nginx-1.9.5/src/event/ngx_event_connectex.c) vendor/nginx-1.9.6/src/event/ngx_event_openssl.c (from vendor/nginx-1.9.5/src/event/ngx_event_openssl.c) vendor/nginx-1.9.6/src/event/ngx_event_openssl.h (from vendor/nginx-1.9.5/src/event/ngx_event_openssl.h) vendor/nginx-1.9.6/src/event/ngx_event_openssl_stapling.c (from vendor/nginx-1.9.5/src/event/ngx_event_openssl_stapling.c) vendor/nginx-1.9.6/src/event/ngx_event_pipe.c (from vendor/nginx-1.9.5/src/event/ngx_event_pipe.c) vendor/nginx-1.9.6/src/event/ngx_event_pipe.h (from vendor/nginx-1.9.5/src/event/ngx_event_pipe.h) vendor/nginx-1.9.6/src/event/ngx_event_posted.c (from vendor/nginx-1.9.5/src/event/ngx_event_posted.c) vendor/nginx-1.9.6/src/event/ngx_event_posted.h (from vendor/nginx-1.9.5/src/event/ngx_event_posted.h) vendor/nginx-1.9.6/src/event/ngx_event_timer.c (from vendor/nginx-1.9.5/src/event/ngx_event_timer.c) vendor/nginx-1.9.6/src/event/ngx_event_timer.h (from vendor/nginx-1.9.5/src/event/ngx_event_timer.h) vendor/nginx-1.9.6/src/http/modules/ngx_http_access_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_access_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_addition_filter_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_addition_filter_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_auth_basic_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_auth_basic_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_auth_request_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_auth_request_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_autoindex_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_autoindex_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_browser_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_browser_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_charset_filter_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_charset_filter_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_chunked_filter_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_chunked_filter_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_dav_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_dav_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_degradation_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_degradation_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_empty_gif_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_empty_gif_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_fastcgi_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_fastcgi_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_flv_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_flv_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_geo_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_geo_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_geoip_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_geoip_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_gunzip_filter_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_gunzip_filter_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_gzip_filter_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_gzip_filter_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_gzip_static_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_gzip_static_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_headers_filter_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_headers_filter_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_image_filter_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_image_filter_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_index_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_index_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_limit_conn_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_limit_conn_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_limit_req_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_limit_req_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_log_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_log_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_map_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_map_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_memcached_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_memcached_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_mp4_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_mp4_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_not_modified_filter_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_not_modified_filter_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_proxy_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_proxy_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_random_index_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_random_index_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_range_filter_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_range_filter_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_realip_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_realip_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_referer_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_referer_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_rewrite_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_rewrite_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_scgi_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_scgi_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_secure_link_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_secure_link_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_split_clients_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_split_clients_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_ssi_filter_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_ssi_filter_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_ssi_filter_module.h (from vendor/nginx-1.9.5/src/http/modules/ngx_http_ssi_filter_module.h) vendor/nginx-1.9.6/src/http/modules/ngx_http_ssl_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_ssl_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_ssl_module.h (from vendor/nginx-1.9.5/src/http/modules/ngx_http_ssl_module.h) vendor/nginx-1.9.6/src/http/modules/ngx_http_static_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_static_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_stub_status_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_stub_status_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_sub_filter_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_sub_filter_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_upstream_hash_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_upstream_hash_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_upstream_ip_hash_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_upstream_ip_hash_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_upstream_keepalive_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_upstream_keepalive_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_upstream_least_conn_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_upstream_least_conn_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_upstream_zone_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_upstream_zone_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_userid_filter_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_userid_filter_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_uwsgi_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_uwsgi_module.c) vendor/nginx-1.9.6/src/http/modules/ngx_http_xslt_filter_module.c (from vendor/nginx-1.9.5/src/http/modules/ngx_http_xslt_filter_module.c) vendor/nginx-1.9.6/src/http/modules/perl/Makefile.PL (from vendor/nginx-1.9.5/src/http/modules/perl/Makefile.PL) vendor/nginx-1.9.6/src/http/modules/perl/nginx.pm (from vendor/nginx-1.9.5/src/http/modules/perl/nginx.pm) vendor/nginx-1.9.6/src/http/modules/perl/nginx.xs (from vendor/nginx-1.9.5/src/http/modules/perl/nginx.xs) vendor/nginx-1.9.6/src/http/modules/perl/ngx_http_perl_module.c (from vendor/nginx-1.9.5/src/http/modules/perl/ngx_http_perl_module.c) vendor/nginx-1.9.6/src/http/modules/perl/ngx_http_perl_module.h (from vendor/nginx-1.9.5/src/http/modules/perl/ngx_http_perl_module.h) vendor/nginx-1.9.6/src/http/modules/perl/typemap (from vendor/nginx-1.9.5/src/http/modules/perl/typemap) vendor/nginx-1.9.6/src/http/ngx_http.c (from vendor/nginx-1.9.5/src/http/ngx_http.c) vendor/nginx-1.9.6/src/http/ngx_http.h (from vendor/nginx-1.9.5/src/http/ngx_http.h) vendor/nginx-1.9.6/src/http/ngx_http_cache.h (from vendor/nginx-1.9.5/src/http/ngx_http_cache.h) vendor/nginx-1.9.6/src/http/ngx_http_config.h (from vendor/nginx-1.9.5/src/http/ngx_http_config.h) vendor/nginx-1.9.6/src/http/ngx_http_copy_filter_module.c (from vendor/nginx-1.9.5/src/http/ngx_http_copy_filter_module.c) vendor/nginx-1.9.6/src/http/ngx_http_core_module.c (from vendor/nginx-1.9.5/src/http/ngx_http_core_module.c) vendor/nginx-1.9.6/src/http/ngx_http_core_module.h (from vendor/nginx-1.9.5/src/http/ngx_http_core_module.h) vendor/nginx-1.9.6/src/http/ngx_http_file_cache.c (from vendor/nginx-1.9.5/src/http/ngx_http_file_cache.c) vendor/nginx-1.9.6/src/http/ngx_http_header_filter_module.c (from vendor/nginx-1.9.5/src/http/ngx_http_header_filter_module.c) vendor/nginx-1.9.6/src/http/ngx_http_parse.c (from vendor/nginx-1.9.5/src/http/ngx_http_parse.c) vendor/nginx-1.9.6/src/http/ngx_http_postpone_filter_module.c (from vendor/nginx-1.9.5/src/http/ngx_http_postpone_filter_module.c) vendor/nginx-1.9.6/src/http/ngx_http_request.c (from vendor/nginx-1.9.5/src/http/ngx_http_request.c) vendor/nginx-1.9.6/src/http/ngx_http_request.h (from vendor/nginx-1.9.5/src/http/ngx_http_request.h) vendor/nginx-1.9.6/src/http/ngx_http_request_body.c (from vendor/nginx-1.9.5/src/http/ngx_http_request_body.c) vendor/nginx-1.9.6/src/http/ngx_http_script.c (from vendor/nginx-1.9.5/src/http/ngx_http_script.c) vendor/nginx-1.9.6/src/http/ngx_http_script.h (from vendor/nginx-1.9.5/src/http/ngx_http_script.h) vendor/nginx-1.9.6/src/http/ngx_http_special_response.c (from vendor/nginx-1.9.5/src/http/ngx_http_special_response.c) vendor/nginx-1.9.6/src/http/ngx_http_upstream.c (from vendor/nginx-1.9.5/src/http/ngx_http_upstream.c) vendor/nginx-1.9.6/src/http/ngx_http_upstream.h (from vendor/nginx-1.9.5/src/http/ngx_http_upstream.h) vendor/nginx-1.9.6/src/http/ngx_http_upstream_round_robin.c (from vendor/nginx-1.9.5/src/http/ngx_http_upstream_round_robin.c) vendor/nginx-1.9.6/src/http/ngx_http_upstream_round_robin.h (from vendor/nginx-1.9.5/src/http/ngx_http_upstream_round_robin.h) vendor/nginx-1.9.6/src/http/ngx_http_variables.c (from vendor/nginx-1.9.5/src/http/ngx_http_variables.c) vendor/nginx-1.9.6/src/http/ngx_http_variables.h (from vendor/nginx-1.9.5/src/http/ngx_http_variables.h) vendor/nginx-1.9.6/src/http/ngx_http_write_filter_module.c (from vendor/nginx-1.9.5/src/http/ngx_http_write_filter_module.c) vendor/nginx-1.9.6/src/http/v2/ngx_http_v2.c (from vendor/nginx-1.9.5/src/http/v2/ngx_http_v2.c) vendor/nginx-1.9.6/src/http/v2/ngx_http_v2.h (from vendor/nginx-1.9.5/src/http/v2/ngx_http_v2.h) vendor/nginx-1.9.6/src/http/v2/ngx_http_v2_filter_module.c (from vendor/nginx-1.9.5/src/http/v2/ngx_http_v2_filter_module.c) vendor/nginx-1.9.6/src/http/v2/ngx_http_v2_huff_decode.c (from vendor/nginx-1.9.5/src/http/v2/ngx_http_v2_huff_decode.c) vendor/nginx-1.9.6/src/http/v2/ngx_http_v2_huff_encode.c (from vendor/nginx-1.9.5/src/http/v2/ngx_http_v2_huff_encode.c) vendor/nginx-1.9.6/src/http/v2/ngx_http_v2_module.c (from vendor/nginx-1.9.5/src/http/v2/ngx_http_v2_module.c) vendor/nginx-1.9.6/src/http/v2/ngx_http_v2_module.h (from vendor/nginx-1.9.5/src/http/v2/ngx_http_v2_module.h) vendor/nginx-1.9.6/src/http/v2/ngx_http_v2_table.c (from vendor/nginx-1.9.5/src/http/v2/ngx_http_v2_table.c) vendor/nginx-1.9.6/src/mail/ngx_mail.c (from vendor/nginx-1.9.5/src/mail/ngx_mail.c) vendor/nginx-1.9.6/src/mail/ngx_mail.h (from vendor/nginx-1.9.5/src/mail/ngx_mail.h) vendor/nginx-1.9.6/src/mail/ngx_mail_auth_http_module.c (from vendor/nginx-1.9.5/src/mail/ngx_mail_auth_http_module.c) vendor/nginx-1.9.6/src/mail/ngx_mail_core_module.c (from vendor/nginx-1.9.5/src/mail/ngx_mail_core_module.c) vendor/nginx-1.9.6/src/mail/ngx_mail_handler.c (from vendor/nginx-1.9.5/src/mail/ngx_mail_handler.c) vendor/nginx-1.9.6/src/mail/ngx_mail_imap_handler.c (from vendor/nginx-1.9.5/src/mail/ngx_mail_imap_handler.c) vendor/nginx-1.9.6/src/mail/ngx_mail_imap_module.c (from vendor/nginx-1.9.5/src/mail/ngx_mail_imap_module.c) vendor/nginx-1.9.6/src/mail/ngx_mail_imap_module.h (from vendor/nginx-1.9.5/src/mail/ngx_mail_imap_module.h) vendor/nginx-1.9.6/src/mail/ngx_mail_parse.c (from vendor/nginx-1.9.5/src/mail/ngx_mail_parse.c) vendor/nginx-1.9.6/src/mail/ngx_mail_pop3_handler.c (from vendor/nginx-1.9.5/src/mail/ngx_mail_pop3_handler.c) vendor/nginx-1.9.6/src/mail/ngx_mail_pop3_module.c (from vendor/nginx-1.9.5/src/mail/ngx_mail_pop3_module.c) vendor/nginx-1.9.6/src/mail/ngx_mail_pop3_module.h (from vendor/nginx-1.9.5/src/mail/ngx_mail_pop3_module.h) vendor/nginx-1.9.6/src/mail/ngx_mail_proxy_module.c (from vendor/nginx-1.9.5/src/mail/ngx_mail_proxy_module.c) vendor/nginx-1.9.6/src/mail/ngx_mail_smtp_handler.c (from vendor/nginx-1.9.5/src/mail/ngx_mail_smtp_handler.c) vendor/nginx-1.9.6/src/mail/ngx_mail_smtp_module.c (from vendor/nginx-1.9.5/src/mail/ngx_mail_smtp_module.c) vendor/nginx-1.9.6/src/mail/ngx_mail_smtp_module.h (from vendor/nginx-1.9.5/src/mail/ngx_mail_smtp_module.h) vendor/nginx-1.9.6/src/mail/ngx_mail_ssl_module.c (from vendor/nginx-1.9.5/src/mail/ngx_mail_ssl_module.c) vendor/nginx-1.9.6/src/mail/ngx_mail_ssl_module.h (from vendor/nginx-1.9.5/src/mail/ngx_mail_ssl_module.h) vendor/nginx-1.9.6/src/misc/ngx_cpp_test_module.cpp (from vendor/nginx-1.9.5/src/misc/ngx_cpp_test_module.cpp) vendor/nginx-1.9.6/src/misc/ngx_google_perftools_module.c (from vendor/nginx-1.9.5/src/misc/ngx_google_perftools_module.c) vendor/nginx-1.9.6/src/mysql/config (from vendor/nginx-1.9.5/src/mysql/config) vendor/nginx-1.9.6/src/mysql/ngx_http_mysql_test.c (from vendor/nginx-1.9.5/src/mysql/ngx_http_mysql_test.c) vendor/nginx-1.9.6/src/mysql/ngx_mysql.c (from vendor/nginx-1.9.5/src/mysql/ngx_mysql.c) vendor/nginx-1.9.6/src/mysql/ngx_mysql.h (from vendor/nginx-1.9.5/src/mysql/ngx_mysql.h) vendor/nginx-1.9.6/src/os/unix/ngx_alloc.c (from vendor/nginx-1.9.5/src/os/unix/ngx_alloc.c) vendor/nginx-1.9.6/src/os/unix/ngx_alloc.h (from vendor/nginx-1.9.5/src/os/unix/ngx_alloc.h) vendor/nginx-1.9.6/src/os/unix/ngx_atomic.h (from vendor/nginx-1.9.5/src/os/unix/ngx_atomic.h) vendor/nginx-1.9.6/src/os/unix/ngx_channel.c (from vendor/nginx-1.9.5/src/os/unix/ngx_channel.c) vendor/nginx-1.9.6/src/os/unix/ngx_channel.h (from vendor/nginx-1.9.5/src/os/unix/ngx_channel.h) vendor/nginx-1.9.6/src/os/unix/ngx_daemon.c (from vendor/nginx-1.9.5/src/os/unix/ngx_daemon.c) vendor/nginx-1.9.6/src/os/unix/ngx_darwin.h (from vendor/nginx-1.9.5/src/os/unix/ngx_darwin.h) vendor/nginx-1.9.6/src/os/unix/ngx_darwin_config.h (from vendor/nginx-1.9.5/src/os/unix/ngx_darwin_config.h) vendor/nginx-1.9.6/src/os/unix/ngx_darwin_init.c (from vendor/nginx-1.9.5/src/os/unix/ngx_darwin_init.c) vendor/nginx-1.9.6/src/os/unix/ngx_darwin_sendfile_chain.c (from vendor/nginx-1.9.5/src/os/unix/ngx_darwin_sendfile_chain.c) vendor/nginx-1.9.6/src/os/unix/ngx_errno.c (from vendor/nginx-1.9.5/src/os/unix/ngx_errno.c) vendor/nginx-1.9.6/src/os/unix/ngx_errno.h (from vendor/nginx-1.9.5/src/os/unix/ngx_errno.h) vendor/nginx-1.9.6/src/os/unix/ngx_file_aio_read.c (from vendor/nginx-1.9.5/src/os/unix/ngx_file_aio_read.c) vendor/nginx-1.9.6/src/os/unix/ngx_files.c (from vendor/nginx-1.9.5/src/os/unix/ngx_files.c) vendor/nginx-1.9.6/src/os/unix/ngx_files.h (from vendor/nginx-1.9.5/src/os/unix/ngx_files.h) vendor/nginx-1.9.6/src/os/unix/ngx_freebsd.h (from vendor/nginx-1.9.5/src/os/unix/ngx_freebsd.h) vendor/nginx-1.9.6/src/os/unix/ngx_freebsd_config.h (from vendor/nginx-1.9.5/src/os/unix/ngx_freebsd_config.h) vendor/nginx-1.9.6/src/os/unix/ngx_freebsd_init.c (from vendor/nginx-1.9.5/src/os/unix/ngx_freebsd_init.c) vendor/nginx-1.9.6/src/os/unix/ngx_freebsd_sendfile_chain.c (from vendor/nginx-1.9.5/src/os/unix/ngx_freebsd_sendfile_chain.c) vendor/nginx-1.9.6/src/os/unix/ngx_gcc_atomic_amd64.h (from vendor/nginx-1.9.5/src/os/unix/ngx_gcc_atomic_amd64.h) vendor/nginx-1.9.6/src/os/unix/ngx_gcc_atomic_ppc.h (from vendor/nginx-1.9.5/src/os/unix/ngx_gcc_atomic_ppc.h) vendor/nginx-1.9.6/src/os/unix/ngx_gcc_atomic_sparc64.h (from vendor/nginx-1.9.5/src/os/unix/ngx_gcc_atomic_sparc64.h) vendor/nginx-1.9.6/src/os/unix/ngx_gcc_atomic_x86.h (from vendor/nginx-1.9.5/src/os/unix/ngx_gcc_atomic_x86.h) vendor/nginx-1.9.6/src/os/unix/ngx_linux.h (from vendor/nginx-1.9.5/src/os/unix/ngx_linux.h) vendor/nginx-1.9.6/src/os/unix/ngx_linux_aio_read.c (from vendor/nginx-1.9.5/src/os/unix/ngx_linux_aio_read.c) vendor/nginx-1.9.6/src/os/unix/ngx_linux_config.h (from vendor/nginx-1.9.5/src/os/unix/ngx_linux_config.h) vendor/nginx-1.9.6/src/os/unix/ngx_linux_init.c (from vendor/nginx-1.9.5/src/os/unix/ngx_linux_init.c) vendor/nginx-1.9.6/src/os/unix/ngx_linux_sendfile_chain.c (from vendor/nginx-1.9.5/src/os/unix/ngx_linux_sendfile_chain.c) vendor/nginx-1.9.6/src/os/unix/ngx_os.h (from vendor/nginx-1.9.5/src/os/unix/ngx_os.h) vendor/nginx-1.9.6/src/os/unix/ngx_posix_config.h (from vendor/nginx-1.9.5/src/os/unix/ngx_posix_config.h) vendor/nginx-1.9.6/src/os/unix/ngx_posix_init.c (from vendor/nginx-1.9.5/src/os/unix/ngx_posix_init.c) vendor/nginx-1.9.6/src/os/unix/ngx_process.c (from vendor/nginx-1.9.5/src/os/unix/ngx_process.c) vendor/nginx-1.9.6/src/os/unix/ngx_process.h (from vendor/nginx-1.9.5/src/os/unix/ngx_process.h) vendor/nginx-1.9.6/src/os/unix/ngx_process_cycle.c (from vendor/nginx-1.9.5/src/os/unix/ngx_process_cycle.c) vendor/nginx-1.9.6/src/os/unix/ngx_process_cycle.h (from vendor/nginx-1.9.5/src/os/unix/ngx_process_cycle.h) vendor/nginx-1.9.6/src/os/unix/ngx_readv_chain.c (from vendor/nginx-1.9.5/src/os/unix/ngx_readv_chain.c) vendor/nginx-1.9.6/src/os/unix/ngx_recv.c (from vendor/nginx-1.9.5/src/os/unix/ngx_recv.c) vendor/nginx-1.9.6/src/os/unix/ngx_send.c (from vendor/nginx-1.9.5/src/os/unix/ngx_send.c) vendor/nginx-1.9.6/src/os/unix/ngx_setaffinity.c (from vendor/nginx-1.9.5/src/os/unix/ngx_setaffinity.c) vendor/nginx-1.9.6/src/os/unix/ngx_setaffinity.h (from vendor/nginx-1.9.5/src/os/unix/ngx_setaffinity.h) vendor/nginx-1.9.6/src/os/unix/ngx_setproctitle.c (from vendor/nginx-1.9.5/src/os/unix/ngx_setproctitle.c) vendor/nginx-1.9.6/src/os/unix/ngx_setproctitle.h (from vendor/nginx-1.9.5/src/os/unix/ngx_setproctitle.h) vendor/nginx-1.9.6/src/os/unix/ngx_shmem.c (from vendor/nginx-1.9.5/src/os/unix/ngx_shmem.c) vendor/nginx-1.9.6/src/os/unix/ngx_shmem.h (from vendor/nginx-1.9.5/src/os/unix/ngx_shmem.h) vendor/nginx-1.9.6/src/os/unix/ngx_socket.c (from vendor/nginx-1.9.5/src/os/unix/ngx_socket.c) vendor/nginx-1.9.6/src/os/unix/ngx_socket.h (from vendor/nginx-1.9.5/src/os/unix/ngx_socket.h) vendor/nginx-1.9.6/src/os/unix/ngx_solaris.h (from vendor/nginx-1.9.5/src/os/unix/ngx_solaris.h) vendor/nginx-1.9.6/src/os/unix/ngx_solaris_config.h (from vendor/nginx-1.9.5/src/os/unix/ngx_solaris_config.h) vendor/nginx-1.9.6/src/os/unix/ngx_solaris_init.c (from vendor/nginx-1.9.5/src/os/unix/ngx_solaris_init.c) vendor/nginx-1.9.6/src/os/unix/ngx_solaris_sendfilev_chain.c (from vendor/nginx-1.9.5/src/os/unix/ngx_solaris_sendfilev_chain.c) vendor/nginx-1.9.6/src/os/unix/ngx_sunpro_amd64.il (from vendor/nginx-1.9.5/src/os/unix/ngx_sunpro_amd64.il) vendor/nginx-1.9.6/src/os/unix/ngx_sunpro_atomic_sparc64.h (from vendor/nginx-1.9.5/src/os/unix/ngx_sunpro_atomic_sparc64.h) vendor/nginx-1.9.6/src/os/unix/ngx_sunpro_sparc64.il (from vendor/nginx-1.9.5/src/os/unix/ngx_sunpro_sparc64.il) vendor/nginx-1.9.6/src/os/unix/ngx_sunpro_x86.il (from vendor/nginx-1.9.5/src/os/unix/ngx_sunpro_x86.il) vendor/nginx-1.9.6/src/os/unix/ngx_thread.h (from vendor/nginx-1.9.5/src/os/unix/ngx_thread.h) vendor/nginx-1.9.6/src/os/unix/ngx_thread_cond.c (from vendor/nginx-1.9.5/src/os/unix/ngx_thread_cond.c) vendor/nginx-1.9.6/src/os/unix/ngx_thread_id.c (from vendor/nginx-1.9.5/src/os/unix/ngx_thread_id.c) vendor/nginx-1.9.6/src/os/unix/ngx_thread_mutex.c (from vendor/nginx-1.9.5/src/os/unix/ngx_thread_mutex.c) vendor/nginx-1.9.6/src/os/unix/ngx_time.c (from vendor/nginx-1.9.5/src/os/unix/ngx_time.c) vendor/nginx-1.9.6/src/os/unix/ngx_time.h (from vendor/nginx-1.9.5/src/os/unix/ngx_time.h) vendor/nginx-1.9.6/src/os/unix/ngx_udp_recv.c (from vendor/nginx-1.9.5/src/os/unix/ngx_udp_recv.c) vendor/nginx-1.9.6/src/os/unix/ngx_user.c (from vendor/nginx-1.9.5/src/os/unix/ngx_user.c) vendor/nginx-1.9.6/src/os/unix/ngx_user.h (from vendor/nginx-1.9.5/src/os/unix/ngx_user.h) vendor/nginx-1.9.6/src/os/unix/ngx_writev_chain.c (from vendor/nginx-1.9.5/src/os/unix/ngx_writev_chain.c) vendor/nginx-1.9.6/src/os/win32/nginx.ico (from vendor/nginx-1.9.5/src/os/win32/nginx.ico) vendor/nginx-1.9.6/src/os/win32/nginx.rc (from vendor/nginx-1.9.5/src/os/win32/nginx.rc) vendor/nginx-1.9.6/src/os/win32/nginx_icon16.xpm (from vendor/nginx-1.9.5/src/os/win32/nginx_icon16.xpm) vendor/nginx-1.9.6/src/os/win32/nginx_icon32.xpm (from vendor/nginx-1.9.5/src/os/win32/nginx_icon32.xpm) vendor/nginx-1.9.6/src/os/win32/nginx_icon48.xpm (from vendor/nginx-1.9.5/src/os/win32/nginx_icon48.xpm) vendor/nginx-1.9.6/src/os/win32/ngx_alloc.c (from vendor/nginx-1.9.5/src/os/win32/ngx_alloc.c) vendor/nginx-1.9.6/src/os/win32/ngx_alloc.h (from vendor/nginx-1.9.5/src/os/win32/ngx_alloc.h) vendor/nginx-1.9.6/src/os/win32/ngx_atomic.h (from vendor/nginx-1.9.5/src/os/win32/ngx_atomic.h) vendor/nginx-1.9.6/src/os/win32/ngx_errno.c (from vendor/nginx-1.9.5/src/os/win32/ngx_errno.c) vendor/nginx-1.9.6/src/os/win32/ngx_errno.h (from vendor/nginx-1.9.5/src/os/win32/ngx_errno.h) vendor/nginx-1.9.6/src/os/win32/ngx_event_log.c (from vendor/nginx-1.9.5/src/os/win32/ngx_event_log.c) vendor/nginx-1.9.6/src/os/win32/ngx_files.c (from vendor/nginx-1.9.5/src/os/win32/ngx_files.c) vendor/nginx-1.9.6/src/os/win32/ngx_files.h (from vendor/nginx-1.9.5/src/os/win32/ngx_files.h) vendor/nginx-1.9.6/src/os/win32/ngx_os.h (from vendor/nginx-1.9.5/src/os/win32/ngx_os.h) vendor/nginx-1.9.6/src/os/win32/ngx_process.c (from vendor/nginx-1.9.5/src/os/win32/ngx_process.c) vendor/nginx-1.9.6/src/os/win32/ngx_process.h (from vendor/nginx-1.9.5/src/os/win32/ngx_process.h) vendor/nginx-1.9.6/src/os/win32/ngx_process_cycle.c (from vendor/nginx-1.9.5/src/os/win32/ngx_process_cycle.c) vendor/nginx-1.9.6/src/os/win32/ngx_process_cycle.h (from vendor/nginx-1.9.5/src/os/win32/ngx_process_cycle.h) vendor/nginx-1.9.6/src/os/win32/ngx_service.c (from vendor/nginx-1.9.5/src/os/win32/ngx_service.c) vendor/nginx-1.9.6/src/os/win32/ngx_shmem.c (from vendor/nginx-1.9.5/src/os/win32/ngx_shmem.c) vendor/nginx-1.9.6/src/os/win32/ngx_shmem.h (from vendor/nginx-1.9.5/src/os/win32/ngx_shmem.h) vendor/nginx-1.9.6/src/os/win32/ngx_socket.c (from vendor/nginx-1.9.5/src/os/win32/ngx_socket.c) vendor/nginx-1.9.6/src/os/win32/ngx_socket.h (from vendor/nginx-1.9.5/src/os/win32/ngx_socket.h) vendor/nginx-1.9.6/src/os/win32/ngx_stat.c (from vendor/nginx-1.9.5/src/os/win32/ngx_stat.c) vendor/nginx-1.9.6/src/os/win32/ngx_thread.c (from vendor/nginx-1.9.5/src/os/win32/ngx_thread.c) vendor/nginx-1.9.6/src/os/win32/ngx_thread.h (from vendor/nginx-1.9.5/src/os/win32/ngx_thread.h) vendor/nginx-1.9.6/src/os/win32/ngx_time.c (from vendor/nginx-1.9.5/src/os/win32/ngx_time.c) vendor/nginx-1.9.6/src/os/win32/ngx_time.h (from vendor/nginx-1.9.5/src/os/win32/ngx_time.h) vendor/nginx-1.9.6/src/os/win32/ngx_udp_wsarecv.c (from vendor/nginx-1.9.5/src/os/win32/ngx_udp_wsarecv.c) vendor/nginx-1.9.6/src/os/win32/ngx_user.c (from vendor/nginx-1.9.5/src/os/win32/ngx_user.c) vendor/nginx-1.9.6/src/os/win32/ngx_user.h (from vendor/nginx-1.9.5/src/os/win32/ngx_user.h) vendor/nginx-1.9.6/src/os/win32/ngx_win32_config.h (from vendor/nginx-1.9.5/src/os/win32/ngx_win32_config.h) vendor/nginx-1.9.6/src/os/win32/ngx_win32_init.c (from vendor/nginx-1.9.5/src/os/win32/ngx_win32_init.c) vendor/nginx-1.9.6/src/os/win32/ngx_wsarecv.c (from vendor/nginx-1.9.5/src/os/win32/ngx_wsarecv.c) vendor/nginx-1.9.6/src/os/win32/ngx_wsarecv_chain.c (from vendor/nginx-1.9.5/src/os/win32/ngx_wsarecv_chain.c) vendor/nginx-1.9.6/src/os/win32/ngx_wsasend.c (from vendor/nginx-1.9.5/src/os/win32/ngx_wsasend.c) vendor/nginx-1.9.6/src/os/win32/ngx_wsasend_chain.c (from vendor/nginx-1.9.5/src/os/win32/ngx_wsasend_chain.c) vendor/nginx-1.9.6/src/stream/ngx_stream.c (from vendor/nginx-1.9.5/src/stream/ngx_stream.c) vendor/nginx-1.9.6/src/stream/ngx_stream.h (from vendor/nginx-1.9.5/src/stream/ngx_stream.h) vendor/nginx-1.9.6/src/stream/ngx_stream_access_module.c (from vendor/nginx-1.9.5/src/stream/ngx_stream_access_module.c) vendor/nginx-1.9.6/src/stream/ngx_stream_core_module.c (from vendor/nginx-1.9.5/src/stream/ngx_stream_core_module.c) vendor/nginx-1.9.6/src/stream/ngx_stream_handler.c (from vendor/nginx-1.9.5/src/stream/ngx_stream_handler.c) vendor/nginx-1.9.6/src/stream/ngx_stream_limit_conn_module.c (from vendor/nginx-1.9.5/src/stream/ngx_stream_limit_conn_module.c) vendor/nginx-1.9.6/src/stream/ngx_stream_proxy_module.c (from vendor/nginx-1.9.5/src/stream/ngx_stream_proxy_module.c) vendor/nginx-1.9.6/src/stream/ngx_stream_ssl_module.c (from vendor/nginx-1.9.5/src/stream/ngx_stream_ssl_module.c) vendor/nginx-1.9.6/src/stream/ngx_stream_ssl_module.h (from vendor/nginx-1.9.5/src/stream/ngx_stream_ssl_module.h) vendor/nginx-1.9.6/src/stream/ngx_stream_upstream.c (from vendor/nginx-1.9.5/src/stream/ngx_stream_upstream.c) vendor/nginx-1.9.6/src/stream/ngx_stream_upstream.h (from vendor/nginx-1.9.5/src/stream/ngx_stream_upstream.h) vendor/nginx-1.9.6/src/stream/ngx_stream_upstream_hash_module.c (from vendor/nginx-1.9.5/src/stream/ngx_stream_upstream_hash_module.c) vendor/nginx-1.9.6/src/stream/ngx_stream_upstream_least_conn_module.c (from vendor/nginx-1.9.5/src/stream/ngx_stream_upstream_least_conn_module.c) vendor/nginx-1.9.6/src/stream/ngx_stream_upstream_round_robin.c (from vendor/nginx-1.9.5/src/stream/ngx_stream_upstream_round_robin.c) vendor/nginx-1.9.6/src/stream/ngx_stream_upstream_round_robin.h (from vendor/nginx-1.9.5/src/stream/ngx_stream_upstream_round_robin.h) vendor/nginx-1.9.6/src/stream/ngx_stream_upstream_zone_module.c (from vendor/nginx-1.9.5/src/stream/ngx_stream_upstream_zone_module.c) Modified: nginx_version (+1 -1) =================================================================== --- nginx_version 2015-10-26 23:24:53 +0900 (158c747) +++ nginx_version 2015-10-28 10:46:57 +0900 (7bc1c40) @@ -1 +1 @@ -1.9.5 +1.9.6 Modified: packages/windows/Rakefile (+0 -1) =================================================================== --- packages/windows/Rakefile 2015-10-26 23:24:53 +0900 (9f7de77) +++ packages/windows/Rakefile 2015-10-28 10:46:57 +0900 (e33e4c2) @@ -42,7 +42,6 @@ mecab_patches = [ "mecab-0.98-add-missing-dll-export.diff", ] nginx_patches = [ - "nginx-1.9-5-fix-build-error.diff", ] if groonga_win32_x86_p host = "i686-w64-mingw32" Deleted: packages/windows/patches/nginx-1.9-5-fix-build-error.diff (+0 -12) 100644 =================================================================== --- packages/windows/patches/nginx-1.9-5-fix-build-error.diff 2015-10-26 23:24:53 +0900 (ccb71c2) +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru nginx-1.9.5.orig/src/core/ngx_connection.c nginx-1.9.5/src/core/ngx_connection.c ---- nginx-1.9.5.orig/src/core/ngx_connection.c 2015-09-28 09:56:45.660075199 +0900 -+++ nginx-1.9.5/src/core/ngx_connection.c 2015-09-28 10:28:48.284449372 +0900 -@@ -1175,7 +1175,7 @@ - - /* THREAD: lock */ - -- if (c[i].fd != -1 && c[i].idle) { -+ if (c[i].fd != (ngx_socket_t) -1 && c[i].idle) { - c[i].close = 1; - c[i].read->handler(c[i].read); - } Renamed: vendor/nginx-1.9.6/auto/cc/acc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/cc/bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/cc/ccc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/cc/clang (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/cc/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/cc/gcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/cc/icc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/cc/msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/cc/name (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/cc/owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/cc/sunc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/configure (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/define (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/endianness (+7 -2) 87% =================================================================== --- vendor/nginx-1.9.5/auto/endianness 2015-10-26 23:24:53 +0900 (93da2f8) +++ vendor/nginx-1.9.6/auto/endianness 2015-10-28 10:46:57 +0900 (70b0a10) @@ -4,8 +4,13 @@ echo $ngx_n "checking for system byte ordering ...$ngx_c" -echo >> $NGX_ERR -echo "checking for system byte ordering" >> $NGX_ERR + +cat << END >> $NGX_AUTOCONF_ERR + +---------------------------------------- +checking for system byte ordering + +END cat << END > $NGX_AUTOTEST.c Renamed: vendor/nginx-1.9.6/auto/feature (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/have (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/have_headers (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/headers (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/include (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/init (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/install (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/lib/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/lib/geoip/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/lib/google-perftools/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/lib/libatomic/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/lib/libatomic/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/lib/libgd/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/lib/libxslt/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/lib/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/lib/md5/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/lib/md5/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/lib/md5/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/lib/md5/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/lib/md5/makefile.owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/lib/openssl/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/lib/openssl/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/lib/openssl/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/lib/openssl/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/lib/pcre/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/lib/pcre/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/lib/pcre/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/lib/pcre/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/lib/pcre/makefile.owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/lib/perl/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/lib/perl/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/lib/sha1/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/lib/sha1/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/lib/sha1/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/lib/sha1/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/lib/sha1/makefile.owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/lib/test (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/lib/zlib/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/lib/zlib/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/lib/zlib/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/lib/zlib/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/lib/zlib/makefile.owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/modules (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/nohave (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/options (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/os/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/os/darwin (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/os/freebsd (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/os/linux (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/os/solaris (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/os/win32 (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/sources (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/stubs (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/summary (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/threads (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/types/sizeof (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/types/typedef (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/types/uintptr_t (+7 -2) 88% =================================================================== --- vendor/nginx-1.9.5/auto/types/uintptr_t 2015-10-26 23:24:53 +0900 (f3cdccb) +++ vendor/nginx-1.9.6/auto/types/uintptr_t 2015-10-28 10:46:57 +0900 (2b7212e) @@ -4,8 +4,13 @@ echo $ngx_n "checking for uintptr_t ...$ngx_c" -echo >> $NGX_AUTOCONF_ERR -echo "checking for uintptr_t" >> $NGX_AUTOCONF_ERR + +cat << END >> $NGX_AUTOCONF_ERR + +---------------------------------------- +checking for uintptr_t + +END found=no Renamed: vendor/nginx-1.9.6/auto/types/value (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/auto/unix (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/conf/fastcgi.conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/conf/fastcgi_params (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/conf/koi-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/conf/koi-win (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/conf/mime.types (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/conf/nginx.conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/conf/scgi_params (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/conf/uwsgi_params (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/conf/win-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/contrib/README (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/contrib/geo2nginx.pl (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/contrib/unicode2nginx/koi-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/contrib/unicode2nginx/unicode-to-nginx.pl (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/contrib/unicode2nginx/win-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/contrib/vim/ftdetect/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/contrib/vim/indent/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/contrib/vim/syntax/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/docs/GNUmakefile (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/docs/dtd/change_log_conf.dtd (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/docs/dtd/changes.dtd (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/docs/html/50x.html (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/docs/html/index.html (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/docs/man/nginx.8 (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/docs/text/LICENSE (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/docs/text/README (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/docs/xml/change_log_conf.xml (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/docs/xml/nginx/changes.xml (+84 -0) 99% =================================================================== --- vendor/nginx-1.9.5/docs/xml/nginx/changes.xml 2015-10-26 23:24:53 +0900 (79ade21) +++ vendor/nginx-1.9.6/docs/xml/nginx/changes.xml 2015-10-28 10:46:57 +0900 (0efb368) @@ -5,6 +5,90 @@ <change_log title="nginx"> +<changes ver="1.9.6" date="27.10.2015"> + +<change type="bugfix"> +<para lang="ru"> +при использовании HTTP/2 +в рабочем процессе мог произойти segmentation fault.<br/> +Спасибо Piotr Sikora и Denis Andzakovic. +</para> +<para lang="en"> +a segmentation fault might occur in a worker process +when using HTTP/2.<br/> +Thanks to Piotr Sikora and Denis Andzakovic. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +при использовании HTTP/2 переменная $server_protocol была пустой. +</para> +<para lang="en"> +the $server_protocol variable was empty when using HTTP/2. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +SSL-соединения к бэкендам в модуле stream +могли неожиданно завершаться по таймауту. +</para> +<para lang="en"> +backend SSL connections in the stream module +might be timed out unexpectedly. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +при использовании различных настроек ssl_session_cache +в разных виртуальных серверах +в рабочем процессе мог произойти segmentation fault. +</para> +<para lang="en"> +a segmentation fault might occur in a worker process +if different ssl_session_cache settings were used +in different virtual servers. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +nginx/Windows не собирался с MinGW gcc; +ошибка появилась в 1.9.4.<br/> +Спасибо Kouhei Sutou. +</para> +<para lang="en"> +nginx/Windows could not be built with MinGW gcc; +the bug had appeared in 1.9.4.<br/> +Thanks to Kouhei Sutou. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +при использовании директивы timer_resolution на Windows время не обновлялось. +</para> +<para lang="en"> +time was not updated when the timer_resolution directive was used on Windows. +</para> +</change> + +<change> +<para lang="ru"> +Незначительные исправления и улучшения.<br/> +Спасибо Markus Linnala, Kurtis Nusbaum и Piotr Sikora. +</para> +<para lang="en"> +Miscellaneous minor fixes and improvements.<br/> +Thanks to Markus Linnala, Kurtis Nusbaum and Piotr Sikora. +</para> +</change> + +</changes> + + <changes ver="1.9.5" date="22.09.2015"> <change type="feature"> Renamed: vendor/nginx-1.9.6/docs/xsls/changes.xsls (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/docs/xslt/changes.xslt (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/misc/GNUmakefile (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/misc/README (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/nginx.c (+67 -60) 92% =================================================================== --- vendor/nginx-1.9.5/src/core/nginx.c 2015-10-26 23:24:53 +0900 (3213527) +++ vendor/nginx-1.9.6/src/core/nginx.c 2015-10-28 10:46:57 +0900 (3335587) @@ -10,6 +10,7 @@ #include <nginx.h> +static void ngx_show_version_info(); static ngx_int_t ngx_add_inherited_sockets(ngx_cycle_t *cycle); static ngx_int_t ngx_get_options(int argc, char *const *argv); static ngx_int_t ngx_process_options(ngx_cycle_t *cycle); @@ -194,64 +195,7 @@ main(int argc, char *const *argv) } if (ngx_show_version) { - ngx_write_stderr("nginx version: " NGINX_VER_BUILD NGX_LINEFEED); - - if (ngx_show_help) { - ngx_write_stderr( - "Usage: nginx [-?hvVtTq] [-s signal] [-c filename] " - "[-p prefix] [-g directives]" NGX_LINEFEED - NGX_LINEFEED - "Options:" NGX_LINEFEED - " -?,-h : this help" NGX_LINEFEED - " -v : show version and exit" NGX_LINEFEED - " -V : show version and configure options then exit" - NGX_LINEFEED - " -t : test configuration and exit" NGX_LINEFEED - " -T : test configuration, dump it and exit" - NGX_LINEFEED - " -q : suppress non-error messages " - "during configuration testing" NGX_LINEFEED - " -s signal : send signal to a master process: " - "stop, quit, reopen, reload" NGX_LINEFEED -#ifdef NGX_PREFIX - " -p prefix : set prefix path (default: " - NGX_PREFIX ")" NGX_LINEFEED -#else - " -p prefix : set prefix path (default: NONE)" NGX_LINEFEED -#endif - " -c filename : set configuration file (default: " - NGX_CONF_PATH ")" NGX_LINEFEED - " -g directives : set global directives out of configuration " - "file" NGX_LINEFEED NGX_LINEFEED - ); - } - - if (ngx_show_configure) { - -#ifdef NGX_COMPILER - ngx_write_stderr("built by " NGX_COMPILER NGX_LINEFEED); -#endif - -#if (NGX_SSL) - if (SSLeay() == SSLEAY_VERSION_NUMBER) { - ngx_write_stderr("built with " OPENSSL_VERSION_TEXT - NGX_LINEFEED); - } else { - ngx_write_stderr("built with " OPENSSL_VERSION_TEXT - " (running with "); - ngx_write_stderr((char *) (uintptr_t) - SSLeay_version(SSLEAY_VERSION)); - ngx_write_stderr(")" NGX_LINEFEED); - } -#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME - ngx_write_stderr("TLS SNI support enabled" NGX_LINEFEED); -#else - ngx_write_stderr("TLS SNI support disabled" NGX_LINEFEED); -#endif -#endif - - ngx_write_stderr("configure arguments:" NGX_CONFIGURE NGX_LINEFEED); - } + ngx_show_version_info(); if (!ngx_test_config) { return 0; @@ -419,6 +363,69 @@ main(int argc, char *const *argv) } +static void +ngx_show_version_info() +{ + ngx_write_stderr("nginx version: " NGINX_VER_BUILD NGX_LINEFEED); + + if (ngx_show_help) { + ngx_write_stderr( + "Usage: nginx [-?hvVtTq] [-s signal] [-c filename] " + "[-p prefix] [-g directives]" NGX_LINEFEED + NGX_LINEFEED + "Options:" NGX_LINEFEED + " -?,-h : this help" NGX_LINEFEED + " -v : show version and exit" NGX_LINEFEED + " -V : show version and configure options then exit" + NGX_LINEFEED + " -t : test configuration and exit" NGX_LINEFEED + " -T : test configuration, dump it and exit" + NGX_LINEFEED + " -q : suppress non-error messages " + "during configuration testing" NGX_LINEFEED + " -s signal : send signal to a master process: " + "stop, quit, reopen, reload" NGX_LINEFEED +#ifdef NGX_PREFIX + " -p prefix : set prefix path (default: " NGX_PREFIX ")" + NGX_LINEFEED +#else + " -p prefix : set prefix path (default: NONE)" NGX_LINEFEED +#endif + " -c filename : set configuration file (default: " NGX_CONF_PATH + ")" NGX_LINEFEED + " -g directives : set global directives out of configuration " + "file" NGX_LINEFEED NGX_LINEFEED + ); + } + + if (ngx_show_configure) { + +#ifdef NGX_COMPILER + ngx_write_stderr("built by " NGX_COMPILER NGX_LINEFEED); +#endif + +#if (NGX_SSL) + if (SSLeay() == SSLEAY_VERSION_NUMBER) { + ngx_write_stderr("built with " OPENSSL_VERSION_TEXT NGX_LINEFEED); + } else { + ngx_write_stderr("built with " OPENSSL_VERSION_TEXT + " (running with "); + ngx_write_stderr((char *) (uintptr_t) + SSLeay_version(SSLEAY_VERSION)); + ngx_write_stderr(")" NGX_LINEFEED); + } +#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME + ngx_write_stderr("TLS SNI support enabled" NGX_LINEFEED); +#else + ngx_write_stderr("TLS SNI support disabled" NGX_LINEFEED); +#endif +#endif + + ngx_write_stderr("configure arguments:" NGX_CONFIGURE NGX_LINEFEED); + } +} + + static ngx_int_t ngx_add_inherited_sockets(ngx_cycle_t *cycle) { @@ -1139,7 +1146,7 @@ ngx_set_user(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) return NGX_CONF_OK; } - value = (ngx_str_t *) cf->args->elts; + value = cf->args->elts; ccf->username = (char *) value[1].data; @@ -1345,7 +1352,7 @@ ngx_set_worker_processes(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) return "is duplicate"; } - value = (ngx_str_t *) cf->args->elts; + value = cf->args->elts; if (ngx_strcmp(value[1].data, "auto") == 0) { ccf->worker_processes = ngx_ncpu; Renamed: vendor/nginx-1.9.6/src/core/nginx.h (+2 -2) 85% =================================================================== --- vendor/nginx-1.9.5/src/core/nginx.h 2015-10-26 23:24:53 +0900 (34a6a80) +++ vendor/nginx-1.9.6/src/core/nginx.h 2015-10-28 10:46:57 +0900 (56e9587) @@ -9,8 +9,8 @@ #define _NGINX_H_INCLUDED_ -#define nginx_version 1009005 -#define NGINX_VERSION "1.9.5" +#define nginx_version 1009006 +#define NGINX_VERSION "1.9.6" #define NGINX_VER "nginx/" NGINX_VERSION #ifdef NGX_BUILD Renamed: vendor/nginx-1.9.6/src/core/ngx_array.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_array.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_buf.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_buf.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_conf_file.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_conf_file.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_connection.c (+1 -1) 99% =================================================================== --- vendor/nginx-1.9.5/src/core/ngx_connection.c 2015-10-26 23:24:53 +0900 (9f2675b) +++ vendor/nginx-1.9.6/src/core/ngx_connection.c 2015-10-28 10:46:57 +0900 (0c19d5d) @@ -1175,7 +1175,7 @@ ngx_close_idle_connections(ngx_cycle_t *cycle) /* THREAD: lock */ - if (c[i].fd != -1 && c[i].idle) { + if (c[i].fd != (ngx_socket_t) -1 && c[i].idle) { c[i].close = 1; c[i].read->handler(c[i].read); } Renamed: vendor/nginx-1.9.6/src/core/ngx_connection.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_core.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_cpuinfo.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_crc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_crc32.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_crc32.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_crypt.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_crypt.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_cycle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_cycle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_file.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_file.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_hash.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_hash.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_inet.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_inet.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_list.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_list.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_log.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_log.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_md5.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_md5.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_murmurhash.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_murmurhash.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_open_file_cache.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_open_file_cache.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_output_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_palloc.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_palloc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_parse.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_parse.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_parse_time.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_parse_time.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_proxy_protocol.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_proxy_protocol.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_queue.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_queue.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_radix_tree.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_radix_tree.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_rbtree.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_rbtree.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_regex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_regex.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_resolver.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_resolver.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_rwlock.c (+1 -1) 97% =================================================================== --- vendor/nginx-1.9.5/src/core/ngx_rwlock.c 2015-10-26 23:24:53 +0900 (1404c6e) +++ vendor/nginx-1.9.6/src/core/ngx_rwlock.c 2015-10-28 10:46:57 +0900 (905de78) @@ -111,7 +111,7 @@ ngx_rwlock_unlock(ngx_atomic_t *lock) #else -#if (NGX_HTTP_UPSTREAM_ZONE) +#if (NGX_HTTP_UPSTREAM_ZONE || NGX_STREAM_UPSTREAM_ZONE) #error ngx_atomic_cmp_set() is not defined! Renamed: vendor/nginx-1.9.6/src/core/ngx_rwlock.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_sha1.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_shmtx.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_shmtx.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_slab.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_slab.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_spinlock.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_string.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_string.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_syslog.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_syslog.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_thread_pool.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_thread_pool.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_times.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/core/ngx_times.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/event/modules/ngx_devpoll_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/event/modules/ngx_epoll_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/event/modules/ngx_eventport_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/event/modules/ngx_iocp_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/event/modules/ngx_iocp_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/event/modules/ngx_kqueue_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/event/modules/ngx_poll_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/event/modules/ngx_select_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/event/modules/ngx_win32_select_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/event/ngx_event.c (+9 -0) 98% =================================================================== --- vendor/nginx-1.9.5/src/event/ngx_event.c 2015-10-26 23:24:53 +0900 (b8e0607) +++ vendor/nginx-1.9.6/src/event/ngx_event.c 2015-10-28 10:46:57 +0900 (15da213) @@ -670,6 +670,15 @@ ngx_event_process_init(ngx_cycle_t *cycle) } } +#else + + if (ngx_timer_resolution && !(ngx_event_flags & NGX_USE_TIMER_EVENT)) { + ngx_log_error(NGX_LOG_WARN, cycle->log, 0, + "the \"timer_resolution\" directive is not supported " + "with the configured event method, ignored"); + ngx_timer_resolution = 0; + } + #endif cycle->connections = Renamed: vendor/nginx-1.9.6/src/event/ngx_event.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/event/ngx_event_accept.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/event/ngx_event_acceptex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/event/ngx_event_connect.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/event/ngx_event_connect.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/event/ngx_event_connectex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/event/ngx_event_openssl.c (+11 -14) 99% =================================================================== --- vendor/nginx-1.9.5/src/event/ngx_event_openssl.c 2015-10-26 23:24:53 +0900 (1b789e6) +++ vendor/nginx-1.9.6/src/event/ngx_event_openssl.c 2015-10-28 10:46:57 +0900 (57dfc6c) @@ -1038,6 +1038,8 @@ ngx_ssl_create_connection(ngx_ssl_t *ssl, ngx_connection_t *c, ngx_uint_t flags) sc->buffer = ((flags & NGX_SSL_BUFFER) != 0); sc->buffer_size = ssl->buffer_size; + sc->session_ctx = ssl->ctx; + sc->connection = SSL_new(ssl->ctx); if (sc->connection == NULL) { @@ -1158,6 +1160,7 @@ ngx_ssl_handshake(ngx_connection_t *c) c->recv_chain = ngx_ssl_recv_chain; c->send_chain = ngx_ssl_send_chain; +#if OPENSSL_VERSION_NUMBER < 0x10100000L #ifdef SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS /* initial handshake done, disable renegotiation (CVE-2009-3555) */ @@ -1166,6 +1169,7 @@ ngx_ssl_handshake(ngx_connection_t *c) } #endif +#endif return NGX_OK; } @@ -2043,7 +2047,7 @@ ngx_ssl_error(ngx_uint_t level, ngx_log_t *log, ngx_err_t err, char *fmt, ...) (void) ERR_get_error(); } - ngx_log_error(level, log, err, "%s)", errstr); + ngx_log_error(level, log, err, "%*s)", p - errstr, errstr); } @@ -2303,7 +2307,7 @@ ngx_ssl_new_session(ngx_ssl_conn_t *ssl_conn, ngx_ssl_session_t *sess) c = ngx_ssl_get_connection(ssl_conn); - ssl_ctx = SSL_get_SSL_CTX(ssl_conn); + ssl_ctx = c->ssl->session_ctx; shm_zone = SSL_CTX_get_ex_data(ssl_ctx, ngx_ssl_session_cache_index); cache = shm_zone->data; @@ -2441,21 +2445,17 @@ ngx_ssl_get_cached_session(ngx_ssl_conn_t *ssl_conn, u_char *id, int len, ngx_ssl_sess_id_t *sess_id; ngx_ssl_session_cache_t *cache; u_char buf[NGX_SSL_MAX_SESSION_SIZE]; -#if (NGX_DEBUG) ngx_connection_t *c; -#endif hash = ngx_crc32_short(id, (size_t) len); *copy = 0; -#if (NGX_DEBUG) c = ngx_ssl_get_connection(ssl_conn); ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0, "ssl get session: %08XD:%d", hash, len); -#endif - shm_zone = SSL_CTX_get_ex_data(SSL_get_SSL_CTX(ssl_conn), + shm_zone = SSL_CTX_get_ex_data(c->ssl->session_ctx, ngx_ssl_session_cache_index); cache = shm_zone->data; @@ -2834,13 +2834,14 @@ ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn, SSL_CTX *ssl_ctx; ngx_uint_t i; ngx_array_t *keys; + ngx_connection_t *c; ngx_ssl_session_ticket_key_t *key; #if (NGX_DEBUG) u_char buf[32]; - ngx_connection_t *c; #endif - ssl_ctx = SSL_get_SSL_CTX(ssl_conn); + c = ngx_ssl_get_connection(ssl_conn); + ssl_ctx = c->ssl->session_ctx; keys = SSL_CTX_get_ex_data(ssl_ctx, ngx_ssl_session_ticket_keys_index); if (keys == NULL) { @@ -2849,10 +2850,6 @@ ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn, key = keys->elts; -#if (NGX_DEBUG) - c = ngx_ssl_get_connection(ssl_conn); -#endif - if (enc == 1) { /* encrypt session ticket */ @@ -2861,7 +2858,7 @@ ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn, ngx_hex_dump(buf, key[0].name, 16) - buf, buf, SSL_session_reused(ssl_conn) ? "reused" : "new"); - RAND_pseudo_bytes(iv, 16); + RAND_bytes(iv, 16); EVP_EncryptInit_ex(ectx, EVP_aes_128_cbc(), NULL, key[0].aes_key, iv); HMAC_Init_ex(hctx, key[0].hmac_key, 16, ngx_ssl_session_ticket_md(), NULL); Renamed: vendor/nginx-1.9.6/src/event/ngx_event_openssl.h (+1 -0) 99% =================================================================== --- vendor/nginx-1.9.5/src/event/ngx_event_openssl.h 2015-10-26 23:24:53 +0900 (08eff64) +++ vendor/nginx-1.9.6/src/event/ngx_event_openssl.h 2015-10-28 10:46:57 +0900 (c86be2a) @@ -46,6 +46,7 @@ typedef struct { typedef struct { ngx_ssl_conn_t *connection; + SSL_CTX *session_ctx; ngx_int_t last; ngx_buf_t *buf; Renamed: vendor/nginx-1.9.6/src/event/ngx_event_openssl_stapling.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/event/ngx_event_pipe.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/event/ngx_event_pipe.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/event/ngx_event_posted.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/event/ngx_event_posted.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/event/ngx_event_timer.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/event/ngx_event_timer.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_access_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_addition_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_auth_basic_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_auth_request_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_autoindex_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_browser_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_charset_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_chunked_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_dav_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_degradation_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_empty_gif_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_fastcgi_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_flv_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_geo_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_geoip_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_gunzip_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_gzip_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_gzip_static_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_headers_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_image_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_index_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_limit_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_limit_req_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_log_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_map_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_memcached_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_mp4_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_not_modified_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_proxy_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_random_index_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_range_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_realip_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_referer_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_rewrite_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_scgi_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_secure_link_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_split_clients_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_ssi_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_ssi_filter_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_ssl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_ssl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_static_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_stub_status_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_sub_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_upstream_hash_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_upstream_ip_hash_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_upstream_keepalive_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_upstream_least_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_upstream_zone_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_userid_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_uwsgi_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/ngx_http_xslt_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/perl/Makefile.PL (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/perl/nginx.pm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/perl/nginx.xs (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/perl/ngx_http_perl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/perl/ngx_http_perl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/modules/perl/typemap (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/ngx_http.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/ngx_http.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/ngx_http_cache.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/ngx_http_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/ngx_http_copy_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/ngx_http_core_module.c (+3 -1) 99% =================================================================== --- vendor/nginx-1.9.5/src/http/ngx_http_core_module.c 2015-10-26 23:24:53 +0900 (36f00f6) +++ vendor/nginx-1.9.6/src/http/ngx_http_core_module.c 2015-10-28 10:46:57 +0900 (7a29608) @@ -4489,7 +4489,9 @@ ngx_http_core_root(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) clcf->alias = alias ? clcf->name.len : 0; clcf->root = value[1]; - if (!alias && clcf->root.data[clcf->root.len - 1] == '/') { + if (!alias && clcf->root.len > 0 + && clcf->root.data[clcf->root.len - 1] == '/') + { clcf->root.len--; } Renamed: vendor/nginx-1.9.6/src/http/ngx_http_core_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/ngx_http_file_cache.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/ngx_http_header_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/ngx_http_parse.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/ngx_http_postpone_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/ngx_http_request.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/ngx_http_request.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/ngx_http_request_body.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/ngx_http_script.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/ngx_http_script.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/ngx_http_special_response.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/ngx_http_upstream.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/ngx_http_upstream.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/ngx_http_upstream_round_robin.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/ngx_http_upstream_round_robin.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/ngx_http_variables.c (+26 -12) 98% =================================================================== --- vendor/nginx-1.9.5/src/http/ngx_http_variables.c 2015-10-26 23:24:53 +0900 (c65de35) +++ vendor/nginx-1.9.6/src/http/ngx_http_variables.c 2015-10-28 10:46:57 +0900 (eaf294a) @@ -575,7 +575,7 @@ ngx_http_get_variable(ngx_http_request_t *r, ngx_str_t *name, ngx_uint_t key) return NULL; } - if (ngx_strncmp(name->data, "http_", 5) == 0) { + if (name->len >= 5 && ngx_strncmp(name->data, "http_", 5) == 0) { if (ngx_http_variable_unknown_header_in(r, vv, (uintptr_t) name) == NGX_OK) @@ -586,7 +586,7 @@ ngx_http_get_variable(ngx_http_request_t *r, ngx_str_t *name, ngx_uint_t key) return NULL; } - if (ngx_strncmp(name->data, "sent_http_", 10) == 0) { + if (name->len >= 10 && ngx_strncmp(name->data, "sent_http_", 10) == 0) { if (ngx_http_variable_unknown_header_out(r, vv, (uintptr_t) name) == NGX_OK) @@ -597,7 +597,7 @@ ngx_http_get_variable(ngx_http_request_t *r, ngx_str_t *name, ngx_uint_t key) return NULL; } - if (ngx_strncmp(name->data, "upstream_http_", 14) == 0) { + if (name->len >= 14 && ngx_strncmp(name->data, "upstream_http_", 14) == 0) { if (ngx_http_upstream_header_variable(r, vv, (uintptr_t) name) == NGX_OK) @@ -608,7 +608,7 @@ ngx_http_get_variable(ngx_http_request_t *r, ngx_str_t *name, ngx_uint_t key) return NULL; } - if (ngx_strncmp(name->data, "cookie_", 7) == 0) { + if (name->len >= 7 && ngx_strncmp(name->data, "cookie_", 7) == 0) { if (ngx_http_variable_cookie(r, vv, (uintptr_t) name) == NGX_OK) { return vv; @@ -617,7 +617,9 @@ ngx_http_get_variable(ngx_http_request_t *r, ngx_str_t *name, ngx_uint_t key) return NULL; } - if (ngx_strncmp(name->data, "upstream_cookie_", 16) == 0) { + if (name->len >= 16 + && ngx_strncmp(name->data, "upstream_cookie_", 16) == 0) + { if (ngx_http_upstream_cookie_variable(r, vv, (uintptr_t) name) == NGX_OK) @@ -628,7 +630,7 @@ ngx_http_get_variable(ngx_http_request_t *r, ngx_str_t *name, ngx_uint_t key) return NULL; } - if (ngx_strncmp(name->data, "arg_", 4) == 0) { + if (name->len >= 4 && ngx_strncmp(name->data, "arg_", 4) == 0) { if (ngx_http_variable_argument(r, vv, (uintptr_t) name) == NGX_OK) { return vv; @@ -2535,21 +2537,27 @@ ngx_http_variables_init_vars(ngx_conf_t *cf) } } - if (ngx_strncmp(v[i].name.data, "http_", 5) == 0) { + if (v[i].name.len >= 5 + && ngx_strncmp(v[i].name.data, "http_", 5) == 0) + { v[i].get_handler = ngx_http_variable_unknown_header_in; v[i].data = (uintptr_t) &v[i].name; continue; } - if (ngx_strncmp(v[i].name.data, "sent_http_", 10) == 0) { + if (v[i].name.len >= 10 + && ngx_strncmp(v[i].name.data, "sent_http_", 10) == 0) + { v[i].get_handler = ngx_http_variable_unknown_header_out; v[i].data = (uintptr_t) &v[i].name; continue; } - if (ngx_strncmp(v[i].name.data, "upstream_http_", 14) == 0) { + if (v[i].name.len >= 14 + && ngx_strncmp(v[i].name.data, "upstream_http_", 14) == 0) + { v[i].get_handler = ngx_http_upstream_header_variable; v[i].data = (uintptr_t) &v[i].name; v[i].flags = NGX_HTTP_VAR_NOCACHEABLE; @@ -2557,14 +2565,18 @@ ngx_http_variables_init_vars(ngx_conf_t *cf) continue; } - if (ngx_strncmp(v[i].name.data, "cookie_", 7) == 0) { + if (v[i].name.len >= 7 + && ngx_strncmp(v[i].name.data, "cookie_", 7) == 0) + { v[i].get_handler = ngx_http_variable_cookie; v[i].data = (uintptr_t) &v[i].name; continue; } - if (ngx_strncmp(v[i].name.data, "upstream_cookie_", 16) == 0) { + if (v[i].name.len >= 16 + && ngx_strncmp(v[i].name.data, "upstream_cookie_", 16) == 0) + { v[i].get_handler = ngx_http_upstream_cookie_variable; v[i].data = (uintptr_t) &v[i].name; v[i].flags = NGX_HTTP_VAR_NOCACHEABLE; @@ -2572,7 +2584,9 @@ ngx_http_variables_init_vars(ngx_conf_t *cf) continue; } - if (ngx_strncmp(v[i].name.data, "arg_", 4) == 0) { + if (v[i].name.len >= 4 + && ngx_strncmp(v[i].name.data, "arg_", 4) == 0) + { v[i].get_handler = ngx_http_variable_argument; v[i].data = (uintptr_t) &v[i].name; v[i].flags = NGX_HTTP_VAR_NOCACHEABLE; Renamed: vendor/nginx-1.9.6/src/http/ngx_http_variables.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/ngx_http_write_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/v2/ngx_http_v2.c (+47 -22) 98% =================================================================== --- vendor/nginx-1.9.5/src/http/v2/ngx_http_v2.c 2015-10-26 23:24:53 +0900 (bf07997) +++ vendor/nginx-1.9.6/src/http/v2/ngx_http_v2.c 2015-10-28 10:46:57 +0900 (10cb727) @@ -870,6 +870,8 @@ 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->in_closed = h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG; + h2c->state.stream = stream; return ngx_http_v2_state_read_data(h2c, pos, end); @@ -897,8 +899,6 @@ ngx_http_v2_state_read_data(ngx_http_v2_connection_t *h2c, u_char *pos, } if (stream->skip_data) { - stream->in_closed = h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG; - ngx_log_debug1(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0, "skipping http2 DATA frame, reason: %d", stream->skip_data); @@ -988,9 +988,7 @@ ngx_http_v2_state_read_data(ngx_http_v2_connection_t *h2c, u_char *pos, ngx_http_v2_state_read_data); } - if (h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG) { - stream->in_closed = 1; - + if (stream->in_closed) { if (r->headers_in.content_length_n < 0) { r->headers_in.content_length_n = rb->rest; @@ -1133,6 +1131,22 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos, h2c->last_sid = h2c->state.sid; + if (depend == h2c->state.sid) { + ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0, + "client sent HEADERS frame for stream %ui " + "with incorrect dependency", h2c->state.sid); + + if (ngx_http_v2_send_rst_stream(h2c, h2c->state.sid, + NGX_HTTP_V2_PROTOCOL_ERROR) + != NGX_OK) + { + return ngx_http_v2_connection_error(h2c, + NGX_HTTP_V2_INTERNAL_ERROR); + } + + return ngx_http_v2_state_skip_headers(h2c, pos, end); + } + h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx, ngx_http_v2_module); @@ -1233,7 +1247,7 @@ ngx_http_v2_state_header_block(ngx_http_v2_connection_t *h2c, u_char *pos, } else { /* literal header field without indexing */ - prefix = ngx_http_v2_prefix(3); + prefix = ngx_http_v2_prefix(4); } value = ngx_http_v2_parse_int(h2c, &pos, end, prefix); @@ -2361,12 +2375,6 @@ ngx_http_v2_connection_error(ngx_http_v2_connection_t *h2c, ngx_debug_point(); } - if (h2c->state.stream) { - h2c->state.stream->out_closed = 1; - h2c->state.pool = NULL; - ngx_http_v2_close_stream(h2c->state.stream, NGX_HTTP_BAD_REQUEST); - } - ngx_http_v2_finalize_connection(h2c, err); return NULL; @@ -2396,8 +2404,8 @@ ngx_http_v2_parse_int(ngx_http_v2_connection_t *h2c, u_char **pos, u_char *end, return value; } - if (end - p > NGX_HTTP_V2_INT_OCTETS - 1) { - end = p + NGX_HTTP_V2_INT_OCTETS - 1; + if (end - start > NGX_HTTP_V2_INT_OCTETS) { + end = start + NGX_HTTP_V2_INT_OCTETS; } for (shift = 0; p != end; shift += 7) { @@ -2417,14 +2425,14 @@ ngx_http_v2_parse_int(ngx_http_v2_connection_t *h2c, u_char **pos, u_char *end, } } - if ((size_t) (end - start) >= NGX_HTTP_V2_INT_OCTETS) { - return NGX_DECLINED; - } - if ((size_t) (end - start) >= h2c->state.length) { return NGX_ERROR; } + if (end == start + NGX_HTTP_V2_INT_OCTETS) { + return NGX_DECLINED; + } + return NGX_AGAIN; } @@ -2762,6 +2770,8 @@ ngx_http_v2_create_stream(ngx_http_v2_connection_t *h2c) return NULL; } + ngx_str_set(&r->http_protocol, "HTTP/2.0"); + r->http_version = NGX_HTTP_VERSION_20; r->valid_location = 1; @@ -2896,11 +2906,14 @@ ngx_http_v2_get_closed_node(ngx_http_v2_connection_t *h2c) weight += child->weight; } + parent = node->parent; + for (q = ngx_queue_head(&node->children); q != ngx_queue_sentinel(&node->children); q = ngx_queue_next(q)) { child = ngx_queue_data(q, ngx_http_v2_node_t, queue); + child->parent = parent; child->weight = node->weight * child->weight / weight; if (child->weight == 0) { @@ -2908,8 +2921,6 @@ ngx_http_v2_get_closed_node(ngx_http_v2_connection_t *h2c) } } - parent = node->parent; - if (parent == NGX_HTTP_V2_ROOT) { node->rank = 0; node->rel_weight = 1.0; @@ -3795,6 +3806,12 @@ ngx_http_v2_finalize_connection(ngx_http_v2_connection_t *h2c, c = h2c->connection; + if (h2c->state.stream) { + h2c->state.stream->out_closed = 1; + h2c->state.pool = NULL; + ngx_http_v2_close_stream(h2c->state.stream, NGX_HTTP_BAD_REQUEST); + } + h2c->blocked = 1; if (!c->error && ngx_http_v2_send_goaway(h2c, status) != NGX_ERROR) { @@ -3922,8 +3939,8 @@ static void ngx_http_v2_set_dependency(ngx_http_v2_connection_t *h2c, ngx_http_v2_node_t *node, ngx_uint_t depend, ngx_uint_t exclusive) { - ngx_queue_t *children; - ngx_http_v2_node_t *parent, *next; + ngx_queue_t *children, *q; + ngx_http_v2_node_t *parent, *child, *next; parent = depend ? ngx_http_v2_get_node_by_id(h2c, depend, 0) : NULL; @@ -3985,6 +4002,14 @@ ngx_http_v2_set_dependency(ngx_http_v2_connection_t *h2c, } if (exclusive) { + for (q = ngx_queue_head(children); + q != ngx_queue_sentinel(children); + q = ngx_queue_next(q)) + { + child = ngx_queue_data(q, ngx_http_v2_node_t, queue); + child->parent = node; + } + ngx_queue_add(&node->children, children); ngx_queue_init(children); } Renamed: vendor/nginx-1.9.6/src/http/v2/ngx_http_v2.h (+2 -1) 98% =================================================================== --- vendor/nginx-1.9.5/src/http/v2/ngx_http_v2.h 2015-10-26 23:24:53 +0900 (b7e73c9) +++ vendor/nginx-1.9.6/src/http/v2/ngx_http_v2.h 2015-10-28 10:46:57 +0900 (462d254) @@ -21,7 +21,8 @@ #define NGX_HTTP_V2_MAX_FRAME_SIZE ((1 << 24) - 1) #define NGX_HTTP_V2_INT_OCTETS 4 -#define NGX_HTTP_V2_MAX_FIELD ((1 << NGX_HTTP_V2_INT_OCTETS * 7) - 1) +#define NGX_HTTP_V2_MAX_FIELD \ + (127 + (1 << (NGX_HTTP_V2_INT_OCTETS - 1) * 7) - 1) #define NGX_HTTP_V2_DATA_DISCARD 1 #define NGX_HTTP_V2_DATA_ERROR 2 Renamed: vendor/nginx-1.9.6/src/http/v2/ngx_http_v2_filter_module.c (+167 -175) 79% =================================================================== --- vendor/nginx-1.9.5/src/http/v2/ngx_http_v2_filter_module.c 2015-10-26 23:24:53 +0900 (17cfcd8) +++ vendor/nginx-1.9.6/src/http/v2/ngx_http_v2_filter_module.c 2015-10-28 10:46:57 +0900 (a866cde) @@ -12,7 +12,12 @@ #include <ngx_http_v2_module.h> -#define ngx_http_v2_integer_octets(v) (((v) + 127) / 128) +/* + * This returns precise number of octets for values in range 0..253 + * and estimate number for the rest, but not smaller than required. + */ + +#define ngx_http_v2_integer_octets(v) (1 + (v) / 127) #define ngx_http_v2_literal_size(h) \ (ngx_http_v2_integer_octets(sizeof(h) - 1) + sizeof(h) - 1) @@ -20,6 +25,8 @@ #define ngx_http_v2_indexed(i) (128 + (i)) #define ngx_http_v2_inc_indexed(i) (64 + (i)) +#define NGX_HTTP_V2_ENCODE_RAW 0 +#define NGX_HTTP_V2_ENCODE_HUFF 0x80 #define NGX_HTTP_V2_STATUS_INDEX 8 #define NGX_HTTP_V2_STATUS_200_INDEX 8 @@ -41,10 +48,8 @@ static u_char *ngx_http_v2_write_int(u_char *pos, ngx_uint_t prefix, ngx_uint_t value); -static void ngx_http_v2_write_headers_head(u_char *pos, size_t length, - ngx_uint_t sid, ngx_uint_t end_headers, ngx_uint_t end_stream); -static void ngx_http_v2_write_continuation_head(u_char *pos, size_t length, - ngx_uint_t sid, ngx_uint_t end_headers); +static ngx_http_v2_out_frame_t *ngx_http_v2_create_headers_frame( + ngx_http_request_t *r, u_char *pos, u_char *end); static ngx_chain_t *ngx_http_v2_send_chain(ngx_connection_t *fc, ngx_chain_t *in, off_t limit); @@ -114,17 +119,14 @@ static ngx_http_output_header_filter_pt ngx_http_next_header_filter; static ngx_int_t ngx_http_v2_header_filter(ngx_http_request_t *r) { - u_char status, *p, *head; - size_t len, rest, frame_size; - ngx_buf_t *b; + u_char status, *pos, *start, *p; + size_t len; ngx_str_t host, location; - ngx_uint_t i, port, continuation; - ngx_chain_t *cl; + ngx_uint_t i, port; ngx_list_part_t *part; ngx_table_elt_t *header; ngx_connection_t *fc; ngx_http_cleanup_t *cln; - ngx_http_v2_stream_t *stream; ngx_http_v2_out_frame_t *frame; ngx_http_core_loc_conf_t *clcf; ngx_http_core_srv_conf_t *cscf; @@ -222,7 +224,7 @@ ngx_http_v2_header_filter(ngx_http_request_t *r) } if (r->headers_out.content_type.len) { - len += NGX_HTTP_V2_INT_OCTETS + r->headers_out.content_type.len; + len += 1 + NGX_HTTP_V2_INT_OCTETS + r->headers_out.content_type.len; if (r->headers_out.content_type_len == r->headers_out.content_type.len && r->headers_out.charset.len) @@ -386,134 +388,117 @@ ngx_http_v2_header_filter(ngx_http_request_t *r) + NGX_HTTP_V2_INT_OCTETS + header[i].value.len; } - stream = r->stream; - frame_size = stream->connection->frame_size; - - len += NGX_HTTP_V2_FRAME_HEADER_SIZE - * ((len + frame_size - 1) / frame_size); - - b = ngx_create_temp_buf(r->pool, len); - if (b == NULL) { + pos = ngx_palloc(r->pool, len); + if (pos == NULL) { return NGX_ERROR; } - b->last_buf = r->header_only; - - b->last += NGX_HTTP_V2_FRAME_HEADER_SIZE; + start = pos; if (status) { - *b->last++ = status; + *pos++ = status; } else { - *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_STATUS_INDEX); - *b->last++ = 3; - b->last = ngx_sprintf(b->last, "%03ui", r->headers_out.status); + *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_STATUS_INDEX); + *pos++ = NGX_HTTP_V2_ENCODE_RAW | 3; + pos = ngx_sprintf(pos, "%03ui", r->headers_out.status); } if (r->headers_out.server == NULL) { - *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SERVER_INDEX); + *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SERVER_INDEX); if (clcf->server_tokens) { - *b->last++ = sizeof(NGINX_VER) - 1; - b->last = ngx_cpymem(b->last, NGINX_VER, sizeof(NGINX_VER) - 1); + *pos++ = NGX_HTTP_V2_ENCODE_RAW | (sizeof(NGINX_VER) - 1); + pos = ngx_cpymem(pos, NGINX_VER, sizeof(NGINX_VER) - 1); } else { - *b->last++ = sizeof("nginx") - 1; - b->last = ngx_cpymem(b->last, "nginx", sizeof("nginx") - 1); + *pos++ = NGX_HTTP_V2_ENCODE_RAW | (sizeof("nginx") - 1); + pos = ngx_cpymem(pos, "nginx", sizeof("nginx") - 1); } } if (r->headers_out.date == NULL) { - *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_DATE_INDEX); - *b->last++ = (u_char) ngx_cached_http_time.len; + *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_DATE_INDEX); + *pos++ = (u_char) ngx_cached_http_time.len; - b->last = ngx_cpymem(b->last, ngx_cached_http_time.data, - ngx_cached_http_time.len); + pos = ngx_cpymem(pos, ngx_cached_http_time.data, + ngx_cached_http_time.len); } if (r->headers_out.content_type.len) { - *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_CONTENT_TYPE_INDEX); + *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_CONTENT_TYPE_INDEX); if (r->headers_out.content_type_len == r->headers_out.content_type.len && r->headers_out.charset.len) { - *b->last = 0; - b->last = ngx_http_v2_write_int(b->last, ngx_http_v2_prefix(7), - r->headers_out.content_type.len - + sizeof("; charset=") - 1 - + r->headers_out.charset.len); + *pos = NGX_HTTP_V2_ENCODE_RAW; + pos = ngx_http_v2_write_int(pos, ngx_http_v2_prefix(7), + r->headers_out.content_type.len + + sizeof("; charset=") - 1 + + r->headers_out.charset.len); - p = b->last; + p = pos; - b->last = ngx_cpymem(p, r->headers_out.content_type.data, - r->headers_out.content_type.len); + pos = ngx_cpymem(pos, r->headers_out.content_type.data, + r->headers_out.content_type.len); - b->last = ngx_cpymem(b->last, "; charset=", - sizeof("; charset=") - 1); + pos = ngx_cpymem(pos, "; charset=", sizeof("; charset=") - 1); - b->last = ngx_cpymem(b->last, r->headers_out.charset.data, - r->headers_out.charset.len); + pos = ngx_cpymem(pos, r->headers_out.charset.data, + r->headers_out.charset.len); /* update r->headers_out.content_type for possible logging */ - r->headers_out.content_type.len = b->last - p; + r->headers_out.content_type.len = pos - p; r->headers_out.content_type.data = p; } else { - *b->last = 0; - b->last = ngx_http_v2_write_int(b->last, ngx_http_v2_prefix(7), - r->headers_out.content_type.len); - b->last = ngx_cpymem(b->last, r->headers_out.content_type.data, - r->headers_out.content_type.len); + *pos = NGX_HTTP_V2_ENCODE_RAW; + pos = ngx_http_v2_write_int(pos, ngx_http_v2_prefix(7), + r->headers_out.content_type.len); + pos = ngx_cpymem(pos, r->headers_out.content_type.data, + r->headers_out.content_type.len); } } if (r->headers_out.content_length == NULL && r->headers_out.content_length_n >= 0) { - *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_CONTENT_LENGTH_INDEX); + *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_CONTENT_LENGTH_INDEX); - p = b->last; - b->last = ngx_sprintf(b->last + 1, "%O", - r->headers_out.content_length_n); - *p = (u_char) (b->last - p - 1); + p = pos; + pos = ngx_sprintf(pos + 1, "%O", r->headers_out.content_length_n); + *p = NGX_HTTP_V2_ENCODE_RAW | (u_char) (pos - p - 1); } if (r->headers_out.last_modified == NULL && r->headers_out.last_modified_time != -1) { - *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_LAST_MODIFIED_INDEX); + *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_LAST_MODIFIED_INDEX); - p = b->last; - b->last = ngx_http_time(b->last + 1, r->headers_out.last_modified_time); - *p = (u_char) (b->last - p - 1); + *pos++ = NGX_HTTP_V2_ENCODE_RAW + | (sizeof("Wed, 31 Dec 1986 18:00:00 GMT") - 1); + pos = ngx_http_time(pos, r->headers_out.last_modified_time); } if (r->headers_out.location && r->headers_out.location->value.len) { - *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_LOCATION_INDEX); + *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_LOCATION_INDEX); - *b->last = 0; - b->last = ngx_http_v2_write_int(b->last, ngx_http_v2_prefix(7), - r->headers_out.location->value.len); - b->last = ngx_cpymem(b->last, r->headers_out.location->value.data, - r->headers_out.location->value.len); + *pos = NGX_HTTP_V2_ENCODE_RAW; + pos = ngx_http_v2_write_int(pos, ngx_http_v2_prefix(7), + r->headers_out.location->value.len); + pos = ngx_cpymem(pos, r->headers_out.location->value.data, + r->headers_out.location->value.len); } #if (NGX_HTTP_GZIP) if (r->gzip_vary) { - *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_VARY_INDEX); - *b->last++ = sizeof("Accept-Encoding") - 1; - b->last = ngx_cpymem(b->last, "Accept-Encoding", - sizeof("Accept-Encoding") - 1); + *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_VARY_INDEX); + *pos++ = NGX_HTTP_V2_ENCODE_RAW | (sizeof("Accept-Encoding") - 1); + pos = ngx_cpymem(pos, "Accept-Encoding", sizeof("Accept-Encoding") - 1); } #endif - continuation = 0; - head = b->pos; - - len = b->last - head - NGX_HTTP_V2_FRAME_HEADER_SIZE; - rest = frame_size - len; - part = &r->headers_out.headers.part; header = part->elts; @@ -533,82 +518,26 @@ ngx_http_v2_header_filter(ngx_http_request_t *r) continue; } - len = 1 + NGX_HTTP_V2_INT_OCTETS * 2 - + header[i].key.len - + header[i].value.len; - - if (len > rest) { - len = b->last - head - NGX_HTTP_V2_FRAME_HEADER_SIZE; - - if (continuation) { - ngx_http_v2_write_continuation_head(head, len, - stream->node->id, 0); - } else { - continuation = 1; - ngx_http_v2_write_headers_head(head, len, stream->node->id, 0, - r->header_only); - } - - rest = frame_size; - head = b->last; - - b->last += NGX_HTTP_V2_FRAME_HEADER_SIZE; - } - - p = b->last; - - *p++ = 0; - - *p = 0; - p = ngx_http_v2_write_int(p, ngx_http_v2_prefix(7), header[i].key.len); - ngx_strlow(p, header[i].key.data, header[i].key.len); - p += header[i].key.len; + *pos++ = 0; - *p = 0; - p = ngx_http_v2_write_int(p, ngx_http_v2_prefix(7), - header[i].value.len); - p = ngx_cpymem(p, header[i].value.data, header[i].value.len); + *pos = NGX_HTTP_V2_ENCODE_RAW; + pos = ngx_http_v2_write_int(pos, ngx_http_v2_prefix(7), + header[i].key.len); + ngx_strlow(pos, header[i].key.data, header[i].key.len); + pos += header[i].key.len; - rest -= p - b->last; - b->last = p; + *pos = NGX_HTTP_V2_ENCODE_RAW; + pos = ngx_http_v2_write_int(pos, ngx_http_v2_prefix(7), + header[i].value.len); + pos = ngx_cpymem(pos, header[i].value.data, header[i].value.len); } - len = b->last - head - NGX_HTTP_V2_FRAME_HEADER_SIZE; - - if (continuation) { - ngx_http_v2_write_continuation_head(head, len, stream->node->id, 1); - - } else { - ngx_http_v2_write_headers_head(head, len, stream->node->id, 1, - r->header_only); - } - - cl = ngx_alloc_chain_link(r->pool); - if (cl == NULL) { - return NGX_ERROR; - } - - cl->buf = b; - cl->next = NULL; - - frame = ngx_palloc(r->pool, sizeof(ngx_http_v2_out_frame_t)); + frame = ngx_http_v2_create_headers_frame(r, start, pos); if (frame == NULL) { return NGX_ERROR; } - frame->first = cl; - frame->last = cl; - frame->handler = ngx_http_v2_headers_frame_handler; - frame->stream = stream; - frame->length = b->last - b->pos - NGX_HTTP_V2_FRAME_HEADER_SIZE; - frame->blocked = 1; - frame->fin = r->header_only; - - ngx_log_debug3(NGX_LOG_DEBUG_HTTP, stream->request->connection->log, 0, - "http2:%ui create HEADERS frame %p: len:%uz", - stream->node->id, frame, frame->length); - - ngx_http_v2_queue_blocked_frame(stream->connection, frame); + ngx_http_v2_queue_blocked_frame(r->stream->connection, frame); cln = ngx_http_cleanup_add(r, 0); if (cln == NULL) { @@ -616,14 +545,14 @@ ngx_http_v2_header_filter(ngx_http_request_t *r) } cln->handler = ngx_http_v2_filter_cleanup; - cln->data = stream; + cln->data = r->stream; - stream->queued = 1; + r->stream->queued = 1; fc->send_chain = ngx_http_v2_send_chain; fc->need_last_buf = 1; - return ngx_http_v2_filter_send(fc, stream); + return ngx_http_v2_filter_send(fc, r->stream); } @@ -649,41 +578,104 @@ ngx_http_v2_write_int(u_char *pos, ngx_uint_t prefix, ngx_uint_t value) } -static void -ngx_http_v2_write_headers_head(u_char *pos, size_t length, ngx_uint_t sid, - ngx_uint_t end_headers, ngx_uint_t end_stream) +static ngx_http_v2_out_frame_t * +ngx_http_v2_create_headers_frame(ngx_http_request_t *r, u_char *pos, + u_char *end) { - u_char flags; - - pos = ngx_http_v2_write_len_and_type(pos, length, - NGX_HTTP_V2_HEADERS_FRAME); + u_char type, flags; + size_t rest, frame_size; + ngx_buf_t *b; + ngx_chain_t *cl, **ll; + ngx_http_v2_stream_t *stream; + ngx_http_v2_out_frame_t *frame; - flags = NGX_HTTP_V2_NO_FLAG; + stream = r->stream; + rest = end - pos; - if (end_headers) { - flags |= NGX_HTTP_V2_END_HEADERS_FLAG; + frame = ngx_palloc(r->pool, sizeof(ngx_http_v2_out_frame_t)); + if (frame == NULL) { + return NULL; } - if (end_stream) { - flags |= NGX_HTTP_V2_END_STREAM_FLAG; - } + frame->handler = ngx_http_v2_headers_frame_handler; + frame->stream = stream; + frame->length = rest; + frame->blocked = 1; + frame->fin = r->header_only; - *pos++ = flags; + ll = &frame->first; - (void) ngx_http_v2_write_sid(pos, sid); -} + type = NGX_HTTP_V2_HEADERS_FRAME; + flags = r->header_only ? NGX_HTTP_V2_END_STREAM_FLAG : NGX_HTTP_V2_NO_FLAG; + frame_size = stream->connection->frame_size; + + for ( ;; ) { + if (rest <= frame_size) { + frame_size = rest; + flags |= NGX_HTTP_V2_END_HEADERS_FLAG; + } + b = ngx_create_temp_buf(r->pool, NGX_HTTP_V2_FRAME_HEADER_SIZE); + if (b == NULL) { + return NULL; + } -static void -ngx_http_v2_write_continuation_head(u_char *pos, size_t length, ngx_uint_t sid, - ngx_uint_t end_headers) -{ - pos = ngx_http_v2_write_len_and_type(pos, length, - NGX_HTTP_V2_CONTINUATION_FRAME); + b->last = ngx_http_v2_write_len_and_type(b->last, frame_size, type); + *b->last++ = flags; + b->last = ngx_http_v2_write_sid(b->last, stream->node->id); + + cl = ngx_alloc_chain_link(r->pool); + if (cl == NULL) { + return NULL; + } - *pos++ = end_headers ? NGX_HTTP_V2_END_HEADERS_FLAG : NGX_HTTP_V2_NO_FLAG; + cl->buf = b; - (void) ngx_http_v2_write_sid(pos, sid); + *ll = cl; + ll = &cl->next; + + b = ngx_calloc_buf(r->pool); + if (b == NULL) { + return NULL; + } + + b->pos = pos; + + pos += frame_size; + + b->last = pos; + b->start = b->pos; + b->end = b->last; + b->temporary = 1; + + cl = ngx_alloc_chain_link(r->pool); + if (cl == NULL) { + return NULL; + } + + cl->buf = b; + + *ll = cl; + ll = &cl->next; + + rest -= frame_size; + + if (rest) { + type = NGX_HTTP_V2_CONTINUATION_FRAME; + flags = NGX_HTTP_V2_NO_FLAG; + continue; + } + + b->last_buf = r->header_only; + cl->next = NULL; + frame->last = cl; + + ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, + "http2:%ui create HEADERS frame %p: len:%uz", + stream->node->id, frame, frame->length); + + return frame; + } } Renamed: vendor/nginx-1.9.6/src/http/v2/ngx_http_v2_huff_decode.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/v2/ngx_http_v2_huff_encode.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/v2/ngx_http_v2_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/v2/ngx_http_v2_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/http/v2/ngx_http_v2_table.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/mail/ngx_mail.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/mail/ngx_mail.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/mail/ngx_mail_auth_http_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/mail/ngx_mail_core_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/mail/ngx_mail_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/mail/ngx_mail_imap_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/mail/ngx_mail_imap_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/mail/ngx_mail_imap_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/mail/ngx_mail_parse.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/mail/ngx_mail_pop3_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/mail/ngx_mail_pop3_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/mail/ngx_mail_pop3_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/mail/ngx_mail_proxy_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/mail/ngx_mail_smtp_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/mail/ngx_mail_smtp_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/mail/ngx_mail_smtp_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/mail/ngx_mail_ssl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/mail/ngx_mail_ssl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/misc/ngx_cpp_test_module.cpp (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/misc/ngx_google_perftools_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/mysql/config (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/mysql/ngx_http_mysql_test.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/mysql/ngx_mysql.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/mysql/ngx_mysql.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_alloc.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_alloc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_atomic.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_channel.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_channel.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_daemon.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_darwin.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_darwin_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_darwin_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_darwin_sendfile_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_errno.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_errno.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_file_aio_read.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_files.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_files.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_freebsd.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_freebsd_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_freebsd_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_freebsd_sendfile_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_gcc_atomic_amd64.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_gcc_atomic_ppc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_gcc_atomic_sparc64.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_gcc_atomic_x86.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_linux.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_linux_aio_read.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_linux_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_linux_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_linux_sendfile_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_os.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_posix_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_posix_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_process.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_process.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_process_cycle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_process_cycle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_readv_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_recv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_send.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_setaffinity.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_setaffinity.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_setproctitle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_setproctitle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_shmem.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_shmem.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_socket.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_socket.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_solaris.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_solaris_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_solaris_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_solaris_sendfilev_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_sunpro_amd64.il (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_sunpro_atomic_sparc64.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_sunpro_sparc64.il (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_sunpro_x86.il (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_thread.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_thread_cond.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_thread_id.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_thread_mutex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_time.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_time.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_udp_recv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_user.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_user.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/unix/ngx_writev_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/nginx.ico (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/nginx.rc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/nginx_icon16.xpm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/nginx_icon32.xpm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/nginx_icon48.xpm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/ngx_alloc.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/ngx_alloc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/ngx_atomic.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/ngx_errno.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/ngx_errno.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/ngx_event_log.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/ngx_files.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/ngx_files.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/ngx_os.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/ngx_process.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/ngx_process.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/ngx_process_cycle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/ngx_process_cycle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/ngx_service.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/ngx_shmem.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/ngx_shmem.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/ngx_socket.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/ngx_socket.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/ngx_stat.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/ngx_thread.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/ngx_thread.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/ngx_time.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/ngx_time.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/ngx_udp_wsarecv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/ngx_user.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/ngx_user.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/ngx_win32_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/ngx_win32_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/ngx_wsarecv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/ngx_wsarecv_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/ngx_wsasend.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/os/win32/ngx_wsasend_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/stream/ngx_stream.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/stream/ngx_stream.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/stream/ngx_stream_access_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/stream/ngx_stream_core_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/stream/ngx_stream_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/stream/ngx_stream_limit_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/stream/ngx_stream_proxy_module.c (+4 -0) 99% =================================================================== --- vendor/nginx-1.9.5/src/stream/ngx_stream_proxy_module.c 2015-10-26 23:24:53 +0900 (ea142e7) +++ vendor/nginx-1.9.6/src/stream/ngx_stream_proxy_module.c 2015-10-28 10:46:57 +0900 (6800500) @@ -759,6 +759,10 @@ ngx_stream_proxy_ssl_handshake(ngx_connection_t *pc) u->peer.save_session(&u->peer, u->peer.data); } + if (pc->write->timer_set) { + ngx_del_timer(pc->write); + } + ngx_stream_proxy_init_upstream(s); return; Renamed: vendor/nginx-1.9.6/src/stream/ngx_stream_ssl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/stream/ngx_stream_ssl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/stream/ngx_stream_upstream.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/stream/ngx_stream_upstream.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/stream/ngx_stream_upstream_hash_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/stream/ngx_stream_upstream_least_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/stream/ngx_stream_upstream_round_robin.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/stream/ngx_stream_upstream_round_robin.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.9.6/src/stream/ngx_stream_upstream_zone_module.c (+0 -0) 100% ===================================================================
