HAYASHI Kentaro
null+****@clear*****
Mon Aug 11 17:07:53 JST 2014
HAYASHI Kentaro 2014-08-11 17:07:53 +0900 (Mon, 11 Aug 2014) New Revision: fb43e40e78ed3b6fb734cab13833c5ab030f850a https://github.com/groonga/groonga/commit/fb43e40e78ed3b6fb734cab13833c5ab030f850a Message: nginx: update the latest mainline 1.7.3 -> 1.7.4 This update contains STARTTLS vulnerability fix (CVE-2014-3556) Removed files: vendor/nginx-1.7.3/auto/lib/zlib/patch.zlib.h Modified files: nginx_version Renamed files: vendor/nginx-1.7.4/CHANGES (from vendor/nginx-1.7.3/CHANGES) vendor/nginx-1.7.4/CHANGES.ru (from vendor/nginx-1.7.3/CHANGES.ru) vendor/nginx-1.7.4/LICENSE (from vendor/nginx-1.7.3/LICENSE) vendor/nginx-1.7.4/README (from vendor/nginx-1.7.3/README) vendor/nginx-1.7.4/auto/cc/acc (from vendor/nginx-1.7.3/auto/cc/acc) vendor/nginx-1.7.4/auto/cc/bcc (from vendor/nginx-1.7.3/auto/cc/bcc) vendor/nginx-1.7.4/auto/cc/ccc (from vendor/nginx-1.7.3/auto/cc/ccc) vendor/nginx-1.7.4/auto/cc/clang (from vendor/nginx-1.7.3/auto/cc/clang) vendor/nginx-1.7.4/auto/cc/conf (from vendor/nginx-1.7.3/auto/cc/conf) vendor/nginx-1.7.4/auto/cc/gcc (from vendor/nginx-1.7.3/auto/cc/gcc) vendor/nginx-1.7.4/auto/cc/icc (from vendor/nginx-1.7.3/auto/cc/icc) vendor/nginx-1.7.4/auto/cc/msvc (from vendor/nginx-1.7.3/auto/cc/msvc) vendor/nginx-1.7.4/auto/cc/name (from vendor/nginx-1.7.3/auto/cc/name) vendor/nginx-1.7.4/auto/cc/owc (from vendor/nginx-1.7.3/auto/cc/owc) vendor/nginx-1.7.4/auto/cc/sunc (from vendor/nginx-1.7.3/auto/cc/sunc) vendor/nginx-1.7.4/auto/define (from vendor/nginx-1.7.3/auto/define) vendor/nginx-1.7.4/auto/endianness (from vendor/nginx-1.7.3/auto/endianness) vendor/nginx-1.7.4/auto/feature (from vendor/nginx-1.7.3/auto/feature) vendor/nginx-1.7.4/auto/have (from vendor/nginx-1.7.3/auto/have) vendor/nginx-1.7.4/auto/have_headers (from vendor/nginx-1.7.3/auto/have_headers) vendor/nginx-1.7.4/auto/headers (from vendor/nginx-1.7.3/auto/headers) vendor/nginx-1.7.4/auto/include (from vendor/nginx-1.7.3/auto/include) vendor/nginx-1.7.4/auto/init (from vendor/nginx-1.7.3/auto/init) vendor/nginx-1.7.4/auto/install (from vendor/nginx-1.7.3/auto/install) vendor/nginx-1.7.4/auto/lib/conf (from vendor/nginx-1.7.3/auto/lib/conf) vendor/nginx-1.7.4/auto/lib/geoip/conf (from vendor/nginx-1.7.3/auto/lib/geoip/conf) vendor/nginx-1.7.4/auto/lib/google-perftools/conf (from vendor/nginx-1.7.3/auto/lib/google-perftools/conf) vendor/nginx-1.7.4/auto/lib/libatomic/conf (from vendor/nginx-1.7.3/auto/lib/libatomic/conf) vendor/nginx-1.7.4/auto/lib/libatomic/make (from vendor/nginx-1.7.3/auto/lib/libatomic/make) vendor/nginx-1.7.4/auto/lib/libgd/conf (from vendor/nginx-1.7.3/auto/lib/libgd/conf) vendor/nginx-1.7.4/auto/lib/libxslt/conf (from vendor/nginx-1.7.3/auto/lib/libxslt/conf) vendor/nginx-1.7.4/auto/lib/make (from vendor/nginx-1.7.3/auto/lib/make) vendor/nginx-1.7.4/auto/lib/md5/conf (from vendor/nginx-1.7.3/auto/lib/md5/conf) vendor/nginx-1.7.4/auto/lib/md5/make (from vendor/nginx-1.7.3/auto/lib/md5/make) vendor/nginx-1.7.4/auto/lib/md5/makefile.bcc (from vendor/nginx-1.7.3/auto/lib/md5/makefile.bcc) vendor/nginx-1.7.4/auto/lib/md5/makefile.msvc (from vendor/nginx-1.7.3/auto/lib/md5/makefile.msvc) vendor/nginx-1.7.4/auto/lib/md5/makefile.owc (from vendor/nginx-1.7.3/auto/lib/md5/makefile.owc) vendor/nginx-1.7.4/auto/lib/openssl/conf (from vendor/nginx-1.7.3/auto/lib/openssl/conf) vendor/nginx-1.7.4/auto/lib/openssl/make (from vendor/nginx-1.7.3/auto/lib/openssl/make) vendor/nginx-1.7.4/auto/lib/openssl/makefile.bcc (from vendor/nginx-1.7.3/auto/lib/openssl/makefile.bcc) vendor/nginx-1.7.4/auto/lib/openssl/makefile.msvc (from vendor/nginx-1.7.3/auto/lib/openssl/makefile.msvc) vendor/nginx-1.7.4/auto/lib/pcre/conf (from vendor/nginx-1.7.3/auto/lib/pcre/conf) vendor/nginx-1.7.4/auto/lib/pcre/make (from vendor/nginx-1.7.3/auto/lib/pcre/make) vendor/nginx-1.7.4/auto/lib/pcre/makefile.bcc (from vendor/nginx-1.7.3/auto/lib/pcre/makefile.bcc) vendor/nginx-1.7.4/auto/lib/pcre/makefile.msvc (from vendor/nginx-1.7.3/auto/lib/pcre/makefile.msvc) vendor/nginx-1.7.4/auto/lib/pcre/makefile.owc (from vendor/nginx-1.7.3/auto/lib/pcre/makefile.owc) vendor/nginx-1.7.4/auto/lib/perl/conf (from vendor/nginx-1.7.3/auto/lib/perl/conf) vendor/nginx-1.7.4/auto/lib/perl/make (from vendor/nginx-1.7.3/auto/lib/perl/make) vendor/nginx-1.7.4/auto/lib/sha1/conf (from vendor/nginx-1.7.3/auto/lib/sha1/conf) vendor/nginx-1.7.4/auto/lib/sha1/make (from vendor/nginx-1.7.3/auto/lib/sha1/make) vendor/nginx-1.7.4/auto/lib/sha1/makefile.bcc (from vendor/nginx-1.7.3/auto/lib/sha1/makefile.bcc) vendor/nginx-1.7.4/auto/lib/sha1/makefile.msvc (from vendor/nginx-1.7.3/auto/lib/sha1/makefile.msvc) vendor/nginx-1.7.4/auto/lib/sha1/makefile.owc (from vendor/nginx-1.7.3/auto/lib/sha1/makefile.owc) vendor/nginx-1.7.4/auto/lib/test (from vendor/nginx-1.7.3/auto/lib/test) vendor/nginx-1.7.4/auto/lib/zlib/conf (from vendor/nginx-1.7.3/auto/lib/zlib/conf) vendor/nginx-1.7.4/auto/lib/zlib/make (from vendor/nginx-1.7.3/auto/lib/zlib/make) vendor/nginx-1.7.4/auto/lib/zlib/makefile.bcc (from vendor/nginx-1.7.3/auto/lib/zlib/makefile.bcc) vendor/nginx-1.7.4/auto/lib/zlib/makefile.msvc (from vendor/nginx-1.7.3/auto/lib/zlib/makefile.msvc) vendor/nginx-1.7.4/auto/lib/zlib/makefile.owc (from vendor/nginx-1.7.3/auto/lib/zlib/makefile.owc) vendor/nginx-1.7.4/auto/make (from vendor/nginx-1.7.3/auto/make) vendor/nginx-1.7.4/auto/modules (from vendor/nginx-1.7.3/auto/modules) vendor/nginx-1.7.4/auto/nohave (from vendor/nginx-1.7.3/auto/nohave) vendor/nginx-1.7.4/auto/options (from vendor/nginx-1.7.3/auto/options) vendor/nginx-1.7.4/auto/os/conf (from vendor/nginx-1.7.3/auto/os/conf) vendor/nginx-1.7.4/auto/os/darwin (from vendor/nginx-1.7.3/auto/os/darwin) vendor/nginx-1.7.4/auto/os/freebsd (from vendor/nginx-1.7.3/auto/os/freebsd) vendor/nginx-1.7.4/auto/os/linux (from vendor/nginx-1.7.3/auto/os/linux) vendor/nginx-1.7.4/auto/os/solaris (from vendor/nginx-1.7.3/auto/os/solaris) vendor/nginx-1.7.4/auto/os/win32 (from vendor/nginx-1.7.3/auto/os/win32) vendor/nginx-1.7.4/auto/sources (from vendor/nginx-1.7.3/auto/sources) vendor/nginx-1.7.4/auto/stubs (from vendor/nginx-1.7.3/auto/stubs) vendor/nginx-1.7.4/auto/summary (from vendor/nginx-1.7.3/auto/summary) vendor/nginx-1.7.4/auto/types/sizeof (from vendor/nginx-1.7.3/auto/types/sizeof) vendor/nginx-1.7.4/auto/types/typedef (from vendor/nginx-1.7.3/auto/types/typedef) vendor/nginx-1.7.4/auto/types/uintptr_t (from vendor/nginx-1.7.3/auto/types/uintptr_t) vendor/nginx-1.7.4/auto/types/value (from vendor/nginx-1.7.3/auto/types/value) vendor/nginx-1.7.4/auto/unix (from vendor/nginx-1.7.3/auto/unix) vendor/nginx-1.7.4/conf/fastcgi.conf (from vendor/nginx-1.7.3/conf/fastcgi.conf) vendor/nginx-1.7.4/conf/fastcgi_params (from vendor/nginx-1.7.3/conf/fastcgi_params) vendor/nginx-1.7.4/conf/koi-utf (from vendor/nginx-1.7.3/conf/koi-utf) vendor/nginx-1.7.4/conf/koi-win (from vendor/nginx-1.7.3/conf/koi-win) vendor/nginx-1.7.4/conf/mime.types (from vendor/nginx-1.7.3/conf/mime.types) vendor/nginx-1.7.4/conf/nginx.conf (from vendor/nginx-1.7.3/conf/nginx.conf) vendor/nginx-1.7.4/conf/scgi_params (from vendor/nginx-1.7.3/conf/scgi_params) vendor/nginx-1.7.4/conf/uwsgi_params (from vendor/nginx-1.7.3/conf/uwsgi_params) vendor/nginx-1.7.4/conf/win-utf (from vendor/nginx-1.7.3/conf/win-utf) vendor/nginx-1.7.4/configure (from vendor/nginx-1.7.3/configure) vendor/nginx-1.7.4/contrib/README (from vendor/nginx-1.7.3/contrib/README) vendor/nginx-1.7.4/contrib/geo2nginx.pl (from vendor/nginx-1.7.3/contrib/geo2nginx.pl) vendor/nginx-1.7.4/contrib/unicode2nginx/koi-utf (from vendor/nginx-1.7.3/contrib/unicode2nginx/koi-utf) vendor/nginx-1.7.4/contrib/unicode2nginx/unicode-to-nginx.pl (from vendor/nginx-1.7.3/contrib/unicode2nginx/unicode-to-nginx.pl) vendor/nginx-1.7.4/contrib/unicode2nginx/win-utf (from vendor/nginx-1.7.3/contrib/unicode2nginx/win-utf) vendor/nginx-1.7.4/contrib/vim/ftdetect/nginx.vim (from vendor/nginx-1.7.3/contrib/vim/ftdetect/nginx.vim) vendor/nginx-1.7.4/contrib/vim/indent/nginx.vim (from vendor/nginx-1.7.3/contrib/vim/indent/nginx.vim) vendor/nginx-1.7.4/contrib/vim/syntax/nginx.vim (from vendor/nginx-1.7.3/contrib/vim/syntax/nginx.vim) vendor/nginx-1.7.4/html/50x.html (from vendor/nginx-1.7.3/html/50x.html) vendor/nginx-1.7.4/html/index.html (from vendor/nginx-1.7.3/html/index.html) vendor/nginx-1.7.4/man/nginx.8 (from vendor/nginx-1.7.3/man/nginx.8) vendor/nginx-1.7.4/src/core/nginx.c (from vendor/nginx-1.7.3/src/core/nginx.c) vendor/nginx-1.7.4/src/core/nginx.h (from vendor/nginx-1.7.3/src/core/nginx.h) vendor/nginx-1.7.4/src/core/ngx_array.c (from vendor/nginx-1.7.3/src/core/ngx_array.c) vendor/nginx-1.7.4/src/core/ngx_array.h (from vendor/nginx-1.7.3/src/core/ngx_array.h) vendor/nginx-1.7.4/src/core/ngx_buf.c (from vendor/nginx-1.7.3/src/core/ngx_buf.c) vendor/nginx-1.7.4/src/core/ngx_buf.h (from vendor/nginx-1.7.3/src/core/ngx_buf.h) vendor/nginx-1.7.4/src/core/ngx_conf_file.c (from vendor/nginx-1.7.3/src/core/ngx_conf_file.c) vendor/nginx-1.7.4/src/core/ngx_conf_file.h (from vendor/nginx-1.7.3/src/core/ngx_conf_file.h) vendor/nginx-1.7.4/src/core/ngx_config.h (from vendor/nginx-1.7.3/src/core/ngx_config.h) vendor/nginx-1.7.4/src/core/ngx_connection.c (from vendor/nginx-1.7.3/src/core/ngx_connection.c) vendor/nginx-1.7.4/src/core/ngx_connection.h (from vendor/nginx-1.7.3/src/core/ngx_connection.h) vendor/nginx-1.7.4/src/core/ngx_core.h (from vendor/nginx-1.7.3/src/core/ngx_core.h) vendor/nginx-1.7.4/src/core/ngx_cpuinfo.c (from vendor/nginx-1.7.3/src/core/ngx_cpuinfo.c) vendor/nginx-1.7.4/src/core/ngx_crc.h (from vendor/nginx-1.7.3/src/core/ngx_crc.h) vendor/nginx-1.7.4/src/core/ngx_crc32.c (from vendor/nginx-1.7.3/src/core/ngx_crc32.c) vendor/nginx-1.7.4/src/core/ngx_crc32.h (from vendor/nginx-1.7.3/src/core/ngx_crc32.h) vendor/nginx-1.7.4/src/core/ngx_crypt.c (from vendor/nginx-1.7.3/src/core/ngx_crypt.c) vendor/nginx-1.7.4/src/core/ngx_crypt.h (from vendor/nginx-1.7.3/src/core/ngx_crypt.h) vendor/nginx-1.7.4/src/core/ngx_cycle.c (from vendor/nginx-1.7.3/src/core/ngx_cycle.c) vendor/nginx-1.7.4/src/core/ngx_cycle.h (from vendor/nginx-1.7.3/src/core/ngx_cycle.h) vendor/nginx-1.7.4/src/core/ngx_file.c (from vendor/nginx-1.7.3/src/core/ngx_file.c) vendor/nginx-1.7.4/src/core/ngx_file.h (from vendor/nginx-1.7.3/src/core/ngx_file.h) vendor/nginx-1.7.4/src/core/ngx_hash.c (from vendor/nginx-1.7.3/src/core/ngx_hash.c) vendor/nginx-1.7.4/src/core/ngx_hash.h (from vendor/nginx-1.7.3/src/core/ngx_hash.h) vendor/nginx-1.7.4/src/core/ngx_inet.c (from vendor/nginx-1.7.3/src/core/ngx_inet.c) vendor/nginx-1.7.4/src/core/ngx_inet.h (from vendor/nginx-1.7.3/src/core/ngx_inet.h) vendor/nginx-1.7.4/src/core/ngx_list.c (from vendor/nginx-1.7.3/src/core/ngx_list.c) vendor/nginx-1.7.4/src/core/ngx_list.h (from vendor/nginx-1.7.3/src/core/ngx_list.h) vendor/nginx-1.7.4/src/core/ngx_log.c (from vendor/nginx-1.7.3/src/core/ngx_log.c) vendor/nginx-1.7.4/src/core/ngx_log.h (from vendor/nginx-1.7.3/src/core/ngx_log.h) vendor/nginx-1.7.4/src/core/ngx_md5.c (from vendor/nginx-1.7.3/src/core/ngx_md5.c) vendor/nginx-1.7.4/src/core/ngx_md5.h (from vendor/nginx-1.7.3/src/core/ngx_md5.h) vendor/nginx-1.7.4/src/core/ngx_murmurhash.c (from vendor/nginx-1.7.3/src/core/ngx_murmurhash.c) vendor/nginx-1.7.4/src/core/ngx_murmurhash.h (from vendor/nginx-1.7.3/src/core/ngx_murmurhash.h) vendor/nginx-1.7.4/src/core/ngx_open_file_cache.c (from vendor/nginx-1.7.3/src/core/ngx_open_file_cache.c) vendor/nginx-1.7.4/src/core/ngx_open_file_cache.h (from vendor/nginx-1.7.3/src/core/ngx_open_file_cache.h) vendor/nginx-1.7.4/src/core/ngx_output_chain.c (from vendor/nginx-1.7.3/src/core/ngx_output_chain.c) vendor/nginx-1.7.4/src/core/ngx_palloc.c (from vendor/nginx-1.7.3/src/core/ngx_palloc.c) vendor/nginx-1.7.4/src/core/ngx_palloc.h (from vendor/nginx-1.7.3/src/core/ngx_palloc.h) vendor/nginx-1.7.4/src/core/ngx_parse.c (from vendor/nginx-1.7.3/src/core/ngx_parse.c) vendor/nginx-1.7.4/src/core/ngx_parse.h (from vendor/nginx-1.7.3/src/core/ngx_parse.h) vendor/nginx-1.7.4/src/core/ngx_proxy_protocol.c (from vendor/nginx-1.7.3/src/core/ngx_proxy_protocol.c) vendor/nginx-1.7.4/src/core/ngx_proxy_protocol.h (from vendor/nginx-1.7.3/src/core/ngx_proxy_protocol.h) vendor/nginx-1.7.4/src/core/ngx_queue.c (from vendor/nginx-1.7.3/src/core/ngx_queue.c) vendor/nginx-1.7.4/src/core/ngx_queue.h (from vendor/nginx-1.7.3/src/core/ngx_queue.h) vendor/nginx-1.7.4/src/core/ngx_radix_tree.c (from vendor/nginx-1.7.3/src/core/ngx_radix_tree.c) vendor/nginx-1.7.4/src/core/ngx_radix_tree.h (from vendor/nginx-1.7.3/src/core/ngx_radix_tree.h) vendor/nginx-1.7.4/src/core/ngx_rbtree.c (from vendor/nginx-1.7.3/src/core/ngx_rbtree.c) vendor/nginx-1.7.4/src/core/ngx_rbtree.h (from vendor/nginx-1.7.3/src/core/ngx_rbtree.h) vendor/nginx-1.7.4/src/core/ngx_regex.c (from vendor/nginx-1.7.3/src/core/ngx_regex.c) vendor/nginx-1.7.4/src/core/ngx_regex.h (from vendor/nginx-1.7.3/src/core/ngx_regex.h) vendor/nginx-1.7.4/src/core/ngx_resolver.c (from vendor/nginx-1.7.3/src/core/ngx_resolver.c) vendor/nginx-1.7.4/src/core/ngx_resolver.h (from vendor/nginx-1.7.3/src/core/ngx_resolver.h) vendor/nginx-1.7.4/src/core/ngx_sha1.h (from vendor/nginx-1.7.3/src/core/ngx_sha1.h) vendor/nginx-1.7.4/src/core/ngx_shmtx.c (from vendor/nginx-1.7.3/src/core/ngx_shmtx.c) vendor/nginx-1.7.4/src/core/ngx_shmtx.h (from vendor/nginx-1.7.3/src/core/ngx_shmtx.h) vendor/nginx-1.7.4/src/core/ngx_slab.c (from vendor/nginx-1.7.3/src/core/ngx_slab.c) vendor/nginx-1.7.4/src/core/ngx_slab.h (from vendor/nginx-1.7.3/src/core/ngx_slab.h) vendor/nginx-1.7.4/src/core/ngx_spinlock.c (from vendor/nginx-1.7.3/src/core/ngx_spinlock.c) vendor/nginx-1.7.4/src/core/ngx_string.c (from vendor/nginx-1.7.3/src/core/ngx_string.c) vendor/nginx-1.7.4/src/core/ngx_string.h (from vendor/nginx-1.7.3/src/core/ngx_string.h) vendor/nginx-1.7.4/src/core/ngx_syslog.c (from vendor/nginx-1.7.3/src/core/ngx_syslog.c) vendor/nginx-1.7.4/src/core/ngx_syslog.h (from vendor/nginx-1.7.3/src/core/ngx_syslog.h) vendor/nginx-1.7.4/src/core/ngx_times.c (from vendor/nginx-1.7.3/src/core/ngx_times.c) vendor/nginx-1.7.4/src/core/ngx_times.h (from vendor/nginx-1.7.3/src/core/ngx_times.h) vendor/nginx-1.7.4/src/event/modules/ngx_aio_module.c (from vendor/nginx-1.7.3/src/event/modules/ngx_aio_module.c) vendor/nginx-1.7.4/src/event/modules/ngx_devpoll_module.c (from vendor/nginx-1.7.3/src/event/modules/ngx_devpoll_module.c) vendor/nginx-1.7.4/src/event/modules/ngx_epoll_module.c (from vendor/nginx-1.7.3/src/event/modules/ngx_epoll_module.c) vendor/nginx-1.7.4/src/event/modules/ngx_eventport_module.c (from vendor/nginx-1.7.3/src/event/modules/ngx_eventport_module.c) vendor/nginx-1.7.4/src/event/modules/ngx_kqueue_module.c (from vendor/nginx-1.7.3/src/event/modules/ngx_kqueue_module.c) vendor/nginx-1.7.4/src/event/modules/ngx_poll_module.c (from vendor/nginx-1.7.3/src/event/modules/ngx_poll_module.c) vendor/nginx-1.7.4/src/event/modules/ngx_rtsig_module.c (from vendor/nginx-1.7.3/src/event/modules/ngx_rtsig_module.c) vendor/nginx-1.7.4/src/event/modules/ngx_select_module.c (from vendor/nginx-1.7.3/src/event/modules/ngx_select_module.c) vendor/nginx-1.7.4/src/event/modules/ngx_win32_select_module.c (from vendor/nginx-1.7.3/src/event/modules/ngx_win32_select_module.c) vendor/nginx-1.7.4/src/event/ngx_event.c (from vendor/nginx-1.7.3/src/event/ngx_event.c) vendor/nginx-1.7.4/src/event/ngx_event.h (from vendor/nginx-1.7.3/src/event/ngx_event.h) vendor/nginx-1.7.4/src/event/ngx_event_accept.c (from vendor/nginx-1.7.3/src/event/ngx_event_accept.c) vendor/nginx-1.7.4/src/event/ngx_event_busy_lock.c (from vendor/nginx-1.7.3/src/event/ngx_event_busy_lock.c) vendor/nginx-1.7.4/src/event/ngx_event_busy_lock.h (from vendor/nginx-1.7.3/src/event/ngx_event_busy_lock.h) vendor/nginx-1.7.4/src/event/ngx_event_connect.c (from vendor/nginx-1.7.3/src/event/ngx_event_connect.c) vendor/nginx-1.7.4/src/event/ngx_event_connect.h (from vendor/nginx-1.7.3/src/event/ngx_event_connect.h) vendor/nginx-1.7.4/src/event/ngx_event_mutex.c (from vendor/nginx-1.7.3/src/event/ngx_event_mutex.c) vendor/nginx-1.7.4/src/event/ngx_event_openssl.c (from vendor/nginx-1.7.3/src/event/ngx_event_openssl.c) vendor/nginx-1.7.4/src/event/ngx_event_openssl.h (from vendor/nginx-1.7.3/src/event/ngx_event_openssl.h) vendor/nginx-1.7.4/src/event/ngx_event_openssl_stapling.c (from vendor/nginx-1.7.3/src/event/ngx_event_openssl_stapling.c) vendor/nginx-1.7.4/src/event/ngx_event_pipe.c (from vendor/nginx-1.7.3/src/event/ngx_event_pipe.c) vendor/nginx-1.7.4/src/event/ngx_event_pipe.h (from vendor/nginx-1.7.3/src/event/ngx_event_pipe.h) vendor/nginx-1.7.4/src/event/ngx_event_posted.c (from vendor/nginx-1.7.3/src/event/ngx_event_posted.c) vendor/nginx-1.7.4/src/event/ngx_event_posted.h (from vendor/nginx-1.7.3/src/event/ngx_event_posted.h) vendor/nginx-1.7.4/src/event/ngx_event_timer.c (from vendor/nginx-1.7.3/src/event/ngx_event_timer.c) vendor/nginx-1.7.4/src/event/ngx_event_timer.h (from vendor/nginx-1.7.3/src/event/ngx_event_timer.h) vendor/nginx-1.7.4/src/http/modules/ngx_http_access_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_access_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_addition_filter_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_addition_filter_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_auth_basic_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_auth_basic_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_auth_request_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_auth_request_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_autoindex_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_autoindex_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_browser_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_browser_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_charset_filter_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_charset_filter_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_chunked_filter_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_chunked_filter_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_dav_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_dav_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_degradation_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_degradation_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_empty_gif_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_empty_gif_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_fastcgi_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_fastcgi_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_flv_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_flv_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_geo_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_geo_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_geoip_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_geoip_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_gunzip_filter_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_gunzip_filter_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_gzip_filter_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_gzip_filter_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_gzip_static_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_gzip_static_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_headers_filter_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_headers_filter_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_image_filter_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_image_filter_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_index_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_index_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_limit_conn_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_limit_conn_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_limit_req_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_limit_req_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_log_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_log_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_map_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_map_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_memcached_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_memcached_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_mp4_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_mp4_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_not_modified_filter_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_not_modified_filter_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_proxy_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_proxy_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_random_index_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_random_index_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_range_filter_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_range_filter_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_realip_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_realip_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_referer_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_referer_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_rewrite_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_rewrite_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_scgi_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_scgi_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_secure_link_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_secure_link_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_split_clients_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_split_clients_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_ssi_filter_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_ssi_filter_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_ssi_filter_module.h (from vendor/nginx-1.7.3/src/http/modules/ngx_http_ssi_filter_module.h) vendor/nginx-1.7.4/src/http/modules/ngx_http_ssl_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_ssl_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_ssl_module.h (from vendor/nginx-1.7.3/src/http/modules/ngx_http_ssl_module.h) vendor/nginx-1.7.4/src/http/modules/ngx_http_static_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_static_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_stub_status_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_stub_status_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_sub_filter_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_sub_filter_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_upstream_hash_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_upstream_hash_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_upstream_ip_hash_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_upstream_ip_hash_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_upstream_keepalive_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_upstream_keepalive_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_upstream_least_conn_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_upstream_least_conn_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_userid_filter_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_userid_filter_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_uwsgi_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_uwsgi_module.c) vendor/nginx-1.7.4/src/http/modules/ngx_http_xslt_filter_module.c (from vendor/nginx-1.7.3/src/http/modules/ngx_http_xslt_filter_module.c) vendor/nginx-1.7.4/src/http/modules/perl/Makefile.PL (from vendor/nginx-1.7.3/src/http/modules/perl/Makefile.PL) vendor/nginx-1.7.4/src/http/modules/perl/nginx.pm (from vendor/nginx-1.7.3/src/http/modules/perl/nginx.pm) vendor/nginx-1.7.4/src/http/modules/perl/nginx.xs (from vendor/nginx-1.7.3/src/http/modules/perl/nginx.xs) vendor/nginx-1.7.4/src/http/modules/perl/ngx_http_perl_module.c (from vendor/nginx-1.7.3/src/http/modules/perl/ngx_http_perl_module.c) vendor/nginx-1.7.4/src/http/modules/perl/ngx_http_perl_module.h (from vendor/nginx-1.7.3/src/http/modules/perl/ngx_http_perl_module.h) vendor/nginx-1.7.4/src/http/modules/perl/typemap (from vendor/nginx-1.7.3/src/http/modules/perl/typemap) vendor/nginx-1.7.4/src/http/ngx_http.c (from vendor/nginx-1.7.3/src/http/ngx_http.c) vendor/nginx-1.7.4/src/http/ngx_http.h (from vendor/nginx-1.7.3/src/http/ngx_http.h) vendor/nginx-1.7.4/src/http/ngx_http_busy_lock.c (from vendor/nginx-1.7.3/src/http/ngx_http_busy_lock.c) vendor/nginx-1.7.4/src/http/ngx_http_busy_lock.h (from vendor/nginx-1.7.3/src/http/ngx_http_busy_lock.h) vendor/nginx-1.7.4/src/http/ngx_http_cache.h (from vendor/nginx-1.7.3/src/http/ngx_http_cache.h) vendor/nginx-1.7.4/src/http/ngx_http_config.h (from vendor/nginx-1.7.3/src/http/ngx_http_config.h) vendor/nginx-1.7.4/src/http/ngx_http_copy_filter_module.c (from vendor/nginx-1.7.3/src/http/ngx_http_copy_filter_module.c) vendor/nginx-1.7.4/src/http/ngx_http_core_module.c (from vendor/nginx-1.7.3/src/http/ngx_http_core_module.c) vendor/nginx-1.7.4/src/http/ngx_http_core_module.h (from vendor/nginx-1.7.3/src/http/ngx_http_core_module.h) vendor/nginx-1.7.4/src/http/ngx_http_file_cache.c (from vendor/nginx-1.7.3/src/http/ngx_http_file_cache.c) vendor/nginx-1.7.4/src/http/ngx_http_header_filter_module.c (from vendor/nginx-1.7.3/src/http/ngx_http_header_filter_module.c) vendor/nginx-1.7.4/src/http/ngx_http_parse.c (from vendor/nginx-1.7.3/src/http/ngx_http_parse.c) vendor/nginx-1.7.4/src/http/ngx_http_parse_time.c (from vendor/nginx-1.7.3/src/http/ngx_http_parse_time.c) vendor/nginx-1.7.4/src/http/ngx_http_postpone_filter_module.c (from vendor/nginx-1.7.3/src/http/ngx_http_postpone_filter_module.c) vendor/nginx-1.7.4/src/http/ngx_http_request.c (from vendor/nginx-1.7.3/src/http/ngx_http_request.c) vendor/nginx-1.7.4/src/http/ngx_http_request.h (from vendor/nginx-1.7.3/src/http/ngx_http_request.h) vendor/nginx-1.7.4/src/http/ngx_http_request_body.c (from vendor/nginx-1.7.3/src/http/ngx_http_request_body.c) vendor/nginx-1.7.4/src/http/ngx_http_script.c (from vendor/nginx-1.7.3/src/http/ngx_http_script.c) vendor/nginx-1.7.4/src/http/ngx_http_script.h (from vendor/nginx-1.7.3/src/http/ngx_http_script.h) vendor/nginx-1.7.4/src/http/ngx_http_spdy.c (from vendor/nginx-1.7.3/src/http/ngx_http_spdy.c) vendor/nginx-1.7.4/src/http/ngx_http_spdy.h (from vendor/nginx-1.7.3/src/http/ngx_http_spdy.h) vendor/nginx-1.7.4/src/http/ngx_http_spdy_filter_module.c (from vendor/nginx-1.7.3/src/http/ngx_http_spdy_filter_module.c) vendor/nginx-1.7.4/src/http/ngx_http_spdy_module.c (from vendor/nginx-1.7.3/src/http/ngx_http_spdy_module.c) vendor/nginx-1.7.4/src/http/ngx_http_spdy_module.h (from vendor/nginx-1.7.3/src/http/ngx_http_spdy_module.h) vendor/nginx-1.7.4/src/http/ngx_http_special_response.c (from vendor/nginx-1.7.3/src/http/ngx_http_special_response.c) vendor/nginx-1.7.4/src/http/ngx_http_upstream.c (from vendor/nginx-1.7.3/src/http/ngx_http_upstream.c) vendor/nginx-1.7.4/src/http/ngx_http_upstream.h (from vendor/nginx-1.7.3/src/http/ngx_http_upstream.h) vendor/nginx-1.7.4/src/http/ngx_http_upstream_round_robin.c (from vendor/nginx-1.7.3/src/http/ngx_http_upstream_round_robin.c) vendor/nginx-1.7.4/src/http/ngx_http_upstream_round_robin.h (from vendor/nginx-1.7.3/src/http/ngx_http_upstream_round_robin.h) vendor/nginx-1.7.4/src/http/ngx_http_variables.c (from vendor/nginx-1.7.3/src/http/ngx_http_variables.c) vendor/nginx-1.7.4/src/http/ngx_http_variables.h (from vendor/nginx-1.7.3/src/http/ngx_http_variables.h) vendor/nginx-1.7.4/src/http/ngx_http_write_filter_module.c (from vendor/nginx-1.7.3/src/http/ngx_http_write_filter_module.c) vendor/nginx-1.7.4/src/mail/ngx_mail.c (from vendor/nginx-1.7.3/src/mail/ngx_mail.c) vendor/nginx-1.7.4/src/mail/ngx_mail.h (from vendor/nginx-1.7.3/src/mail/ngx_mail.h) vendor/nginx-1.7.4/src/mail/ngx_mail_auth_http_module.c (from vendor/nginx-1.7.3/src/mail/ngx_mail_auth_http_module.c) vendor/nginx-1.7.4/src/mail/ngx_mail_core_module.c (from vendor/nginx-1.7.3/src/mail/ngx_mail_core_module.c) vendor/nginx-1.7.4/src/mail/ngx_mail_handler.c (from vendor/nginx-1.7.3/src/mail/ngx_mail_handler.c) vendor/nginx-1.7.4/src/mail/ngx_mail_imap_handler.c (from vendor/nginx-1.7.3/src/mail/ngx_mail_imap_handler.c) vendor/nginx-1.7.4/src/mail/ngx_mail_imap_module.c (from vendor/nginx-1.7.3/src/mail/ngx_mail_imap_module.c) vendor/nginx-1.7.4/src/mail/ngx_mail_imap_module.h (from vendor/nginx-1.7.3/src/mail/ngx_mail_imap_module.h) vendor/nginx-1.7.4/src/mail/ngx_mail_parse.c (from vendor/nginx-1.7.3/src/mail/ngx_mail_parse.c) vendor/nginx-1.7.4/src/mail/ngx_mail_pop3_handler.c (from vendor/nginx-1.7.3/src/mail/ngx_mail_pop3_handler.c) vendor/nginx-1.7.4/src/mail/ngx_mail_pop3_module.c (from vendor/nginx-1.7.3/src/mail/ngx_mail_pop3_module.c) vendor/nginx-1.7.4/src/mail/ngx_mail_pop3_module.h (from vendor/nginx-1.7.3/src/mail/ngx_mail_pop3_module.h) vendor/nginx-1.7.4/src/mail/ngx_mail_proxy_module.c (from vendor/nginx-1.7.3/src/mail/ngx_mail_proxy_module.c) vendor/nginx-1.7.4/src/mail/ngx_mail_smtp_handler.c (from vendor/nginx-1.7.3/src/mail/ngx_mail_smtp_handler.c) vendor/nginx-1.7.4/src/mail/ngx_mail_smtp_module.c (from vendor/nginx-1.7.3/src/mail/ngx_mail_smtp_module.c) vendor/nginx-1.7.4/src/mail/ngx_mail_smtp_module.h (from vendor/nginx-1.7.3/src/mail/ngx_mail_smtp_module.h) vendor/nginx-1.7.4/src/mail/ngx_mail_ssl_module.c (from vendor/nginx-1.7.3/src/mail/ngx_mail_ssl_module.c) vendor/nginx-1.7.4/src/mail/ngx_mail_ssl_module.h (from vendor/nginx-1.7.3/src/mail/ngx_mail_ssl_module.h) vendor/nginx-1.7.4/src/misc/ngx_cpp_test_module.cpp (from vendor/nginx-1.7.3/src/misc/ngx_cpp_test_module.cpp) vendor/nginx-1.7.4/src/misc/ngx_google_perftools_module.c (from vendor/nginx-1.7.3/src/misc/ngx_google_perftools_module.c) vendor/nginx-1.7.4/src/os/unix/ngx_aio_read.c (from vendor/nginx-1.7.3/src/os/unix/ngx_aio_read.c) vendor/nginx-1.7.4/src/os/unix/ngx_aio_read_chain.c (from vendor/nginx-1.7.3/src/os/unix/ngx_aio_read_chain.c) vendor/nginx-1.7.4/src/os/unix/ngx_aio_write.c (from vendor/nginx-1.7.3/src/os/unix/ngx_aio_write.c) vendor/nginx-1.7.4/src/os/unix/ngx_aio_write_chain.c (from vendor/nginx-1.7.3/src/os/unix/ngx_aio_write_chain.c) vendor/nginx-1.7.4/src/os/unix/ngx_alloc.c (from vendor/nginx-1.7.3/src/os/unix/ngx_alloc.c) vendor/nginx-1.7.4/src/os/unix/ngx_alloc.h (from vendor/nginx-1.7.3/src/os/unix/ngx_alloc.h) vendor/nginx-1.7.4/src/os/unix/ngx_atomic.h (from vendor/nginx-1.7.3/src/os/unix/ngx_atomic.h) vendor/nginx-1.7.4/src/os/unix/ngx_channel.c (from vendor/nginx-1.7.3/src/os/unix/ngx_channel.c) vendor/nginx-1.7.4/src/os/unix/ngx_channel.h (from vendor/nginx-1.7.3/src/os/unix/ngx_channel.h) vendor/nginx-1.7.4/src/os/unix/ngx_daemon.c (from vendor/nginx-1.7.3/src/os/unix/ngx_daemon.c) vendor/nginx-1.7.4/src/os/unix/ngx_darwin.h (from vendor/nginx-1.7.3/src/os/unix/ngx_darwin.h) vendor/nginx-1.7.4/src/os/unix/ngx_darwin_config.h (from vendor/nginx-1.7.3/src/os/unix/ngx_darwin_config.h) vendor/nginx-1.7.4/src/os/unix/ngx_darwin_init.c (from vendor/nginx-1.7.3/src/os/unix/ngx_darwin_init.c) vendor/nginx-1.7.4/src/os/unix/ngx_darwin_sendfile_chain.c (from vendor/nginx-1.7.3/src/os/unix/ngx_darwin_sendfile_chain.c) vendor/nginx-1.7.4/src/os/unix/ngx_errno.c (from vendor/nginx-1.7.3/src/os/unix/ngx_errno.c) vendor/nginx-1.7.4/src/os/unix/ngx_errno.h (from vendor/nginx-1.7.3/src/os/unix/ngx_errno.h) vendor/nginx-1.7.4/src/os/unix/ngx_file_aio_read.c (from vendor/nginx-1.7.3/src/os/unix/ngx_file_aio_read.c) vendor/nginx-1.7.4/src/os/unix/ngx_files.c (from vendor/nginx-1.7.3/src/os/unix/ngx_files.c) vendor/nginx-1.7.4/src/os/unix/ngx_files.h (from vendor/nginx-1.7.3/src/os/unix/ngx_files.h) vendor/nginx-1.7.4/src/os/unix/ngx_freebsd.h (from vendor/nginx-1.7.3/src/os/unix/ngx_freebsd.h) vendor/nginx-1.7.4/src/os/unix/ngx_freebsd_config.h (from vendor/nginx-1.7.3/src/os/unix/ngx_freebsd_config.h) vendor/nginx-1.7.4/src/os/unix/ngx_freebsd_init.c (from vendor/nginx-1.7.3/src/os/unix/ngx_freebsd_init.c) vendor/nginx-1.7.4/src/os/unix/ngx_freebsd_rfork_thread.c (from vendor/nginx-1.7.3/src/os/unix/ngx_freebsd_rfork_thread.c) vendor/nginx-1.7.4/src/os/unix/ngx_freebsd_rfork_thread.h (from vendor/nginx-1.7.3/src/os/unix/ngx_freebsd_rfork_thread.h) vendor/nginx-1.7.4/src/os/unix/ngx_freebsd_sendfile_chain.c (from vendor/nginx-1.7.3/src/os/unix/ngx_freebsd_sendfile_chain.c) vendor/nginx-1.7.4/src/os/unix/ngx_gcc_atomic_amd64.h (from vendor/nginx-1.7.3/src/os/unix/ngx_gcc_atomic_amd64.h) vendor/nginx-1.7.4/src/os/unix/ngx_gcc_atomic_ppc.h (from vendor/nginx-1.7.3/src/os/unix/ngx_gcc_atomic_ppc.h) vendor/nginx-1.7.4/src/os/unix/ngx_gcc_atomic_sparc64.h (from vendor/nginx-1.7.3/src/os/unix/ngx_gcc_atomic_sparc64.h) vendor/nginx-1.7.4/src/os/unix/ngx_gcc_atomic_x86.h (from vendor/nginx-1.7.3/src/os/unix/ngx_gcc_atomic_x86.h) vendor/nginx-1.7.4/src/os/unix/ngx_linux.h (from vendor/nginx-1.7.3/src/os/unix/ngx_linux.h) vendor/nginx-1.7.4/src/os/unix/ngx_linux_aio_read.c (from vendor/nginx-1.7.3/src/os/unix/ngx_linux_aio_read.c) vendor/nginx-1.7.4/src/os/unix/ngx_linux_config.h (from vendor/nginx-1.7.3/src/os/unix/ngx_linux_config.h) vendor/nginx-1.7.4/src/os/unix/ngx_linux_init.c (from vendor/nginx-1.7.3/src/os/unix/ngx_linux_init.c) vendor/nginx-1.7.4/src/os/unix/ngx_linux_sendfile_chain.c (from vendor/nginx-1.7.3/src/os/unix/ngx_linux_sendfile_chain.c) vendor/nginx-1.7.4/src/os/unix/ngx_os.h (from vendor/nginx-1.7.3/src/os/unix/ngx_os.h) vendor/nginx-1.7.4/src/os/unix/ngx_posix_config.h (from vendor/nginx-1.7.3/src/os/unix/ngx_posix_config.h) vendor/nginx-1.7.4/src/os/unix/ngx_posix_init.c (from vendor/nginx-1.7.3/src/os/unix/ngx_posix_init.c) vendor/nginx-1.7.4/src/os/unix/ngx_process.c (from vendor/nginx-1.7.3/src/os/unix/ngx_process.c) vendor/nginx-1.7.4/src/os/unix/ngx_process.h (from vendor/nginx-1.7.3/src/os/unix/ngx_process.h) vendor/nginx-1.7.4/src/os/unix/ngx_process_cycle.c (from vendor/nginx-1.7.3/src/os/unix/ngx_process_cycle.c) vendor/nginx-1.7.4/src/os/unix/ngx_process_cycle.h (from vendor/nginx-1.7.3/src/os/unix/ngx_process_cycle.h) vendor/nginx-1.7.4/src/os/unix/ngx_pthread_thread.c (from vendor/nginx-1.7.3/src/os/unix/ngx_pthread_thread.c) vendor/nginx-1.7.4/src/os/unix/ngx_readv_chain.c (from vendor/nginx-1.7.3/src/os/unix/ngx_readv_chain.c) vendor/nginx-1.7.4/src/os/unix/ngx_recv.c (from vendor/nginx-1.7.3/src/os/unix/ngx_recv.c) vendor/nginx-1.7.4/src/os/unix/ngx_send.c (from vendor/nginx-1.7.3/src/os/unix/ngx_send.c) vendor/nginx-1.7.4/src/os/unix/ngx_setaffinity.c (from vendor/nginx-1.7.3/src/os/unix/ngx_setaffinity.c) vendor/nginx-1.7.4/src/os/unix/ngx_setaffinity.h (from vendor/nginx-1.7.3/src/os/unix/ngx_setaffinity.h) vendor/nginx-1.7.4/src/os/unix/ngx_setproctitle.c (from vendor/nginx-1.7.3/src/os/unix/ngx_setproctitle.c) vendor/nginx-1.7.4/src/os/unix/ngx_setproctitle.h (from vendor/nginx-1.7.3/src/os/unix/ngx_setproctitle.h) vendor/nginx-1.7.4/src/os/unix/ngx_shmem.c (from vendor/nginx-1.7.3/src/os/unix/ngx_shmem.c) vendor/nginx-1.7.4/src/os/unix/ngx_shmem.h (from vendor/nginx-1.7.3/src/os/unix/ngx_shmem.h) vendor/nginx-1.7.4/src/os/unix/ngx_socket.c (from vendor/nginx-1.7.3/src/os/unix/ngx_socket.c) vendor/nginx-1.7.4/src/os/unix/ngx_socket.h (from vendor/nginx-1.7.3/src/os/unix/ngx_socket.h) vendor/nginx-1.7.4/src/os/unix/ngx_solaris.h (from vendor/nginx-1.7.3/src/os/unix/ngx_solaris.h) vendor/nginx-1.7.4/src/os/unix/ngx_solaris_config.h (from vendor/nginx-1.7.3/src/os/unix/ngx_solaris_config.h) vendor/nginx-1.7.4/src/os/unix/ngx_solaris_init.c (from vendor/nginx-1.7.3/src/os/unix/ngx_solaris_init.c) vendor/nginx-1.7.4/src/os/unix/ngx_solaris_sendfilev_chain.c (from vendor/nginx-1.7.3/src/os/unix/ngx_solaris_sendfilev_chain.c) vendor/nginx-1.7.4/src/os/unix/ngx_sunpro_amd64.il (from vendor/nginx-1.7.3/src/os/unix/ngx_sunpro_amd64.il) vendor/nginx-1.7.4/src/os/unix/ngx_sunpro_atomic_sparc64.h (from vendor/nginx-1.7.3/src/os/unix/ngx_sunpro_atomic_sparc64.h) vendor/nginx-1.7.4/src/os/unix/ngx_sunpro_sparc64.il (from vendor/nginx-1.7.3/src/os/unix/ngx_sunpro_sparc64.il) vendor/nginx-1.7.4/src/os/unix/ngx_sunpro_x86.il (from vendor/nginx-1.7.3/src/os/unix/ngx_sunpro_x86.il) vendor/nginx-1.7.4/src/os/unix/ngx_thread.h (from vendor/nginx-1.7.3/src/os/unix/ngx_thread.h) vendor/nginx-1.7.4/src/os/unix/ngx_time.c (from vendor/nginx-1.7.3/src/os/unix/ngx_time.c) vendor/nginx-1.7.4/src/os/unix/ngx_time.h (from vendor/nginx-1.7.3/src/os/unix/ngx_time.h) vendor/nginx-1.7.4/src/os/unix/ngx_udp_recv.c (from vendor/nginx-1.7.3/src/os/unix/ngx_udp_recv.c) vendor/nginx-1.7.4/src/os/unix/ngx_user.c (from vendor/nginx-1.7.3/src/os/unix/ngx_user.c) vendor/nginx-1.7.4/src/os/unix/ngx_user.h (from vendor/nginx-1.7.3/src/os/unix/ngx_user.h) vendor/nginx-1.7.4/src/os/unix/ngx_writev_chain.c (from vendor/nginx-1.7.3/src/os/unix/ngx_writev_chain.c) vendor/nginx-1.7.4/src/os/unix/rfork_thread.S (from vendor/nginx-1.7.3/src/os/unix/rfork_thread.S) Modified: nginx_version (+1 -1) =================================================================== --- nginx_version 2014-08-10 16:31:58 +0900 (661e7ae) +++ nginx_version 2014-08-11 17:07:53 +0900 (10c0880) @@ -1 +1 @@ -1.7.3 +1.7.4 Deleted: vendor/nginx-1.7.3/auto/lib/zlib/patch.zlib.h (+0 -10) 100644 =================================================================== --- vendor/nginx-1.7.3/auto/lib/zlib/patch.zlib.h 2014-08-10 16:31:58 +0900 (122f7fa) +++ /dev/null @@ -1,10 +0,0 @@ ---- zlib.h Thu Jul 9 20:06:56 1998 -+++ zlib-1.1.3/zlib.h Tue Mar 22 13:41:04 2005 -@@ -709,7 +709,6 @@ - (0 in case of error). - */ - --ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...)); - /* - Converts, formats, and writes the args to the compressed file under - control of the format string, as in fprintf. gzprintf returns the number of Renamed: vendor/nginx-1.7.4/CHANGES (+37 -0) 99% =================================================================== --- vendor/nginx-1.7.3/CHANGES 2014-08-10 16:31:58 +0900 (a4837bd) +++ vendor/nginx-1.7.4/CHANGES 2014-08-11 17:07:53 +0900 (5ff1c20) @@ -1,4 +1,41 @@ +Changes with nginx 1.7.4 05 Aug 2014 + + *) Security: pipelined commands were not discarded after STARTTLS + command in SMTP proxy (CVE-2014-3556); the bug had appeared in 1.5.6. + Thanks to Chris Boulton. + + *) Change: URI escaping now uses uppercase hexadecimal digits. + Thanks to Piotr Sikora. + + *) Feature: now nginx can be build with BoringSSL and LibreSSL. + Thanks to Piotr Sikora. + + *) Bugfix: requests might hang if resolver was used and a DNS server + returned a malformed response; the bug had appeared in 1.5.8. + + *) Bugfix: in the ngx_http_spdy_module. + Thanks to Piotr Sikora. + + *) Bugfix: the $uri variable might contain garbage when returning errors + with code 400. + Thanks to Sergey Bobrov. + + *) Bugfix: in error handling in the "proxy_store" directive and the + ngx_http_dav_module. + Thanks to Feng Gu. + + *) Bugfix: a segmentation fault might occur if logging of errors to + syslog was used; the bug had appeared in 1.7.1. + + *) Bugfix: the $geoip_latitude, $geoip_longitude, $geoip_dma_code, and + $geoip_area_code variables might not work. + Thanks to Yichun Zhang. + + *) Bugfix: in memory allocation error handling. + Thanks to Tatsuhiko Kubo and Piotr Sikora. + + Changes with nginx 1.7.3 08 Jul 2014 *) Feature: weak entity tags are now preserved on response Renamed: vendor/nginx-1.7.4/CHANGES.ru (+43 -4) 99% =================================================================== --- vendor/nginx-1.7.3/CHANGES.ru 2014-08-10 16:31:58 +0900 (f87375f) +++ vendor/nginx-1.7.4/CHANGES.ru 2014-08-11 17:07:53 +0900 (720180c) @@ -1,4 +1,43 @@ +Изменения в nginx 1.7.4 05.08.2014 + + *) Безопасность: pipelined-команды не отбрасывались после команды + STARTTLS в SMTP прокси-сервере (CVE-2014-3556); ошибка появилась в + 1.5.6. + Спасибо Chris Boulton. + + *) Изменение: экранирование символов в URI теперь использует + шестнадцатеричные цифры в верхнем регистре. + Спасибо Piotr Sikora. + + *) Добавление: теперь nginx можно собрать с BoringSSL и LibreSSL. + Спасибо Piotr Sikora. + + *) Исправление: запросы могли зависать, если использовался resolver и + DNS-сервер возвращал некорректный ответ; ошибка появилась в 1.5.8. + + *) Исправление: в модуле ngx_http_spdy_module. + Спасибо Piotr Sikora. + + *) Исправление: переменная $uri могла содержать мусор при возврате + ошибок с кодом 400. + Спасибо Сергею Боброву. + + *) Исправление: в обработке ошибок в директиве proxy_store и в модуле + ngx_http_dav_module. + Спасибо Feng Gu. + + *) Исправление: при логгировании ошибок в syslog мог происходить + segmentation fault; ошибка появилась в 1.7.1. + + *) Исправление: переменные $geoip_latitude, $geoip_longitude, + $geoip_dma_code и $geoip_area_code могли не работать. + Спасибо Yichun Zhang. + + *) Исправление: в обработке ошибок выделения памяти. + Спасибо Tatsuhiko Kubo и Piotr Sikora. + + Изменения в nginx 1.7.3 08.07.2014 *) Добавление: weak entity tags теперь не удаляются при изменениях @@ -1614,7 +1653,7 @@ Изменения в nginx 0.9.2 06.12.2010 *) Добавление: поддержка строки "If-Unmodified-Since" в заголовке - запросе клиента. + запроса клиента. *) Изменение: использование accept(), если accept4() не реализован; ошибка появилась в 0.9.0. @@ -3562,7 +3601,7 @@ Изменения в nginx 0.6.31 12.05.2008 *) Исправление: nginx не обрабатывал ответ FastCGI-сервера, если строка - заголовка ответ была в конце записи FastCGI; ошибка появилась в + заголовка ответа была в конце записи FastCGI; ошибка появилась в 0.6.2. Спасибо Сергею Серову. @@ -4638,7 +4677,7 @@ *) Добавление: директива ip_hash в блоке upstream. - *) Добавление: статус WAIT в строке "Auth-Status" в заголовка ответа + *) Добавление: статус WAIT в строке "Auth-Status" в заголовке ответа сервера аутентификации IMAP/POP3 прокси. *) Исправление: nginx не собирался на 64-битных платформах; ошибка @@ -6123,7 +6162,7 @@ Изменения в nginx 0.1.36 15.06.2005 - *) Изменение: если в заголовке запросе есть дублирующиеся строки "Host", + *) Изменение: если в заголовке запроса есть дублирующиеся строки "Host", "Connection", "Content-Length" и "Authorization", то nginx теперь выдаёт ошибку 400. Renamed: vendor/nginx-1.7.4/LICENSE (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/README (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/cc/acc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/cc/bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/cc/ccc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/cc/clang (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/cc/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/cc/gcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/cc/icc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/cc/msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/cc/name (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/cc/owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/cc/sunc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/define (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/endianness (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/feature (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/have (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/have_headers (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/headers (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/include (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/init (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/install (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/lib/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/lib/geoip/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/lib/google-perftools/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/lib/libatomic/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/lib/libatomic/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/lib/libgd/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/lib/libxslt/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/lib/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/lib/md5/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/lib/md5/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/lib/md5/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/lib/md5/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/lib/md5/makefile.owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/lib/openssl/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/lib/openssl/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/lib/openssl/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/lib/openssl/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/lib/pcre/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/lib/pcre/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/lib/pcre/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/lib/pcre/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/lib/pcre/makefile.owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/lib/perl/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/lib/perl/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/lib/sha1/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/lib/sha1/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/lib/sha1/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/lib/sha1/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/lib/sha1/makefile.owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/lib/test (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/lib/zlib/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/lib/zlib/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/lib/zlib/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/lib/zlib/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/lib/zlib/makefile.owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/modules (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/nohave (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/options (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/os/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/os/darwin (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/os/freebsd (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/os/linux (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/os/solaris (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/os/win32 (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/sources (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/stubs (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/summary (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/types/sizeof (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/types/typedef (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/types/uintptr_t (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/types/value (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/auto/unix (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/conf/fastcgi.conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/conf/fastcgi_params (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/conf/koi-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/conf/koi-win (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/conf/mime.types (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/conf/nginx.conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/conf/scgi_params (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/conf/uwsgi_params (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/conf/win-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/configure (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/contrib/README (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/contrib/geo2nginx.pl (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/contrib/unicode2nginx/koi-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/contrib/unicode2nginx/unicode-to-nginx.pl (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/contrib/unicode2nginx/win-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/contrib/vim/ftdetect/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/contrib/vim/indent/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/contrib/vim/syntax/nginx.vim (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/html/50x.html (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/html/index.html (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/man/nginx.8 (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/nginx.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/nginx.h (+2 -2) 85% =================================================================== --- vendor/nginx-1.7.3/src/core/nginx.h 2014-08-10 16:31:58 +0900 (8d13448) +++ vendor/nginx-1.7.4/src/core/nginx.h 2014-08-11 17:07:53 +0900 (3cdf3ec) @@ -9,8 +9,8 @@ #define _NGINX_H_INCLUDED_ -#define nginx_version 1007003 -#define NGINX_VERSION "1.7.3" +#define nginx_version 1007004 +#define NGINX_VERSION "1.7.4" #define NGINX_VER "nginx/" NGINX_VERSION #ifdef NGX_BUILD Renamed: vendor/nginx-1.7.4/src/core/ngx_array.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_array.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_buf.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_buf.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_conf_file.c (+3 -0) 99% =================================================================== --- vendor/nginx-1.7.3/src/core/ngx_conf_file.c 2014-08-10 16:31:58 +0900 (d6b5cdf) +++ vendor/nginx-1.7.4/src/core/ngx_conf_file.c 2014-08-11 17:07:53 +0900 (ec3c1fa) @@ -781,6 +781,9 @@ ngx_conf_include(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) file.len = name.len++; file.data = ngx_pstrdup(cf->pool, &name); + if (file.data == NULL) { + return NGX_CONF_ERROR; + } ngx_log_debug1(NGX_LOG_DEBUG_CORE, cf->log, 0, "include %s", file.data); Renamed: vendor/nginx-1.7.4/src/core/ngx_conf_file.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_connection.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_connection.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_core.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_cpuinfo.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_crc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_crc32.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_crc32.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_crypt.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_crypt.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_cycle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_cycle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_file.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_file.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_hash.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_hash.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_inet.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_inet.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_list.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_list.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_log.c (+6 -4) 99% =================================================================== --- vendor/nginx-1.7.3/src/core/ngx_log.c 2014-08-10 16:31:58 +0900 (375d52f) +++ vendor/nginx-1.7.4/src/core/ngx_log.c 2014-08-11 17:07:53 +0900 (005d9ff) @@ -387,20 +387,22 @@ ngx_log_open_default(ngx_cycle_t *cycle) return NGX_ERROR; } - log->log_level = NGX_LOG_ERR; - ngx_log_insert(&cycle->new_log, log); - } else { /* no error logs at all */ log = &cycle->new_log; - log->log_level = NGX_LOG_ERR; } + log->log_level = NGX_LOG_ERR; + log->file = ngx_conf_open_file(cycle, &error_log); if (log->file == NULL) { return NGX_ERROR; } + if (log != &cycle->new_log) { + ngx_log_insert(&cycle->new_log, log); + } + return NGX_OK; } Renamed: vendor/nginx-1.7.4/src/core/ngx_log.h (+1 -1) 99% =================================================================== --- vendor/nginx-1.7.3/src/core/ngx_log.h 2014-08-10 16:31:58 +0900 (c1a52c4) +++ vendor/nginx-1.7.4/src/core/ngx_log.h 2014-08-11 17:07:53 +0900 (95ecca5) @@ -248,7 +248,7 @@ char *ngx_log_set_log(ngx_conf_t *cf, ngx_log_t **head); static ngx_inline void ngx_write_stderr(char *text) { - (void) ngx_write_fd(ngx_stderr, text, strlen(text)); + (void) ngx_write_fd(ngx_stderr, text, ngx_strlen(text)); } Renamed: vendor/nginx-1.7.4/src/core/ngx_md5.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_md5.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_murmurhash.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_murmurhash.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_open_file_cache.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_open_file_cache.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_output_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_palloc.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_palloc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_parse.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_parse.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_proxy_protocol.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_proxy_protocol.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_queue.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_queue.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_radix_tree.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_radix_tree.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_rbtree.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_rbtree.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_regex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_regex.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_resolver.c (+28 -4) 99% =================================================================== --- vendor/nginx-1.7.3/src/core/ngx_resolver.c 2014-08-10 16:31:58 +0900 (645738c) +++ vendor/nginx-1.7.4/src/core/ngx_resolver.c 2014-08-11 17:07:53 +0900 (dfe3dcb) @@ -1467,7 +1467,6 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last, goto failed; } - rn->naddrs6 = 0; qident = (rn->query6[0] << 8) + rn->query6[1]; break; @@ -1482,7 +1481,6 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last, goto failed; } - rn->naddrs = 0; qident = (rn->query[0] << 8) + rn->query[1]; } @@ -1507,6 +1505,8 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last, case NGX_RESOLVE_AAAA: + rn->naddrs6 = 0; + if (rn->naddrs == (u_short) -1) { goto next; } @@ -1519,6 +1519,8 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last, default: /* NGX_RESOLVE_A */ + rn->naddrs = 0; + if (rn->naddrs6 == (u_short) -1) { goto next; } @@ -1539,6 +1541,8 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last, case NGX_RESOLVE_AAAA: + rn->naddrs6 = 0; + if (rn->naddrs == (u_short) -1) { rn->code = (u_char) code; goto next; @@ -1548,6 +1552,8 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last, default: /* NGX_RESOLVE_A */ + rn->naddrs = 0; + if (rn->naddrs6 == (u_short) -1) { rn->code = (u_char) code; goto next; @@ -1817,6 +1823,25 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last, } } + switch (qtype) { + +#if (NGX_HAVE_INET6) + case NGX_RESOLVE_AAAA: + + if (rn->naddrs6 == (u_short) -1) { + rn->naddrs6 = 0; + } + + break; +#endif + + default: /* NGX_RESOLVE_A */ + + if (rn->naddrs == (u_short) -1) { + rn->naddrs = 0; + } + } + if (rn->naddrs != (u_short) -1 #if (NGX_HAVE_INET6) && rn->naddrs6 != (u_short) -1 @@ -2722,8 +2747,7 @@ done: } if (len == -1) { - name->len = 0; - name->data = NULL; + ngx_str_null(name); return NGX_OK; } Renamed: vendor/nginx-1.7.4/src/core/ngx_resolver.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_sha1.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_shmtx.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_shmtx.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_slab.c (+1 -1) 99% =================================================================== --- vendor/nginx-1.7.3/src/core/ngx_slab.c 2014-08-10 16:31:58 +0900 (24f2ff1) +++ vendor/nginx-1.7.4/src/core/ngx_slab.c 2014-08-11 17:07:53 +0900 (c112506) @@ -160,7 +160,7 @@ ngx_slab_alloc_locked(ngx_slab_pool_t *pool, size_t size) ngx_uint_t i, slot, shift, map; ngx_slab_page_t *page, *prev, *slots; - if (size >= ngx_slab_max_size) { + if (size > ngx_slab_max_size) { ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, ngx_cycle->log, 0, "slab alloc: %uz", size); Renamed: vendor/nginx-1.7.4/src/core/ngx_slab.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_spinlock.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_string.c (+1 -1) 99% =================================================================== --- vendor/nginx-1.7.3/src/core/ngx_string.c 2014-08-10 16:31:58 +0900 (4e27917) +++ vendor/nginx-1.7.4/src/core/ngx_string.c 2014-08-11 17:07:53 +0900 (9d854fa) @@ -1407,7 +1407,7 @@ ngx_escape_uri(u_char *dst, u_char *src, size_t size, ngx_uint_t type) { ngx_uint_t n; uint32_t *escape; - static u_char hex[] = "0123456789abcdef"; + static u_char hex[] = "0123456789ABCDEF"; /* " ", "#", "%", "?", %00-%1F, %7F-%FF */ Renamed: vendor/nginx-1.7.4/src/core/ngx_string.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_syslog.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_syslog.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_times.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/core/ngx_times.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/event/modules/ngx_aio_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/event/modules/ngx_devpoll_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/event/modules/ngx_epoll_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/event/modules/ngx_eventport_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/event/modules/ngx_kqueue_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/event/modules/ngx_poll_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/event/modules/ngx_rtsig_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/event/modules/ngx_select_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/event/modules/ngx_win32_select_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/event/ngx_event.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/event/ngx_event.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/event/ngx_event_accept.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/event/ngx_event_busy_lock.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/event/ngx_event_busy_lock.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/event/ngx_event_connect.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/event/ngx_event_connect.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/event/ngx_event_mutex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/event/ngx_event_openssl.c (+78 -24) 97% =================================================================== --- vendor/nginx-1.7.3/src/event/ngx_event_openssl.c 2014-08-10 16:31:58 +0900 (50691ad) +++ vendor/nginx-1.7.4/src/event/ngx_event_openssl.c 2014-08-11 17:07:53 +0900 (bb82143) @@ -50,7 +50,7 @@ static int ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn, HMAC_CTX *hctx, int enc); #endif -#if OPENSSL_VERSION_NUMBER < 0x10002001L +#if (OPENSSL_VERSION_NUMBER < 0x10002002L || defined LIBRESSL_VERSION_NUMBER) static ngx_int_t ngx_ssl_check_name(ngx_str_t *name, ASN1_STRING *str); #endif @@ -106,7 +106,9 @@ int ngx_ssl_stapling_index; ngx_int_t ngx_ssl_init(ngx_log_t *log) { +#ifndef OPENSSL_IS_BORINGSSL OPENSSL_config(NULL); +#endif SSL_library_init(); SSL_load_error_strings(); @@ -217,7 +219,10 @@ ngx_ssl_create(ngx_ssl_t *ssl, ngx_uint_t protocols, void *data) SSL_CTX_set_options(ssl->ctx, SSL_OP_MSIE_SSLV2_RSA_PADDING); #endif +#ifdef SSL_OP_SSLEAY_080_CLIENT_DH_BUG SSL_CTX_set_options(ssl->ctx, SSL_OP_SSLEAY_080_CLIENT_DH_BUG); +#endif + SSL_CTX_set_options(ssl->ctx, SSL_OP_TLS_D5_BUG); SSL_CTX_set_options(ssl->ctx, SSL_OP_TLS_BLOCK_PADDING_BUG); @@ -382,8 +387,13 @@ ngx_ssl_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *cert, if (--tries) { n = ERR_peek_error(); +#ifdef OPENSSL_IS_BORINGSSL + if (ERR_GET_LIB(n) == ERR_LIB_CIPHER + && ERR_GET_REASON(n) == CIPHER_R_BAD_DECRYPT) +#else if (ERR_GET_LIB(n) == ERR_LIB_EVP && ERR_GET_REASON(n) == EVP_R_BAD_DECRYPT) +#endif { ERR_clear_error(); SSL_CTX_set_default_passwd_cb_userdata(ssl->ctx, ++pwd); @@ -588,7 +598,7 @@ ngx_ssl_verify_callback(int ok, X509_STORE_CTX *x509_store) ngx_log_debug5(NGX_LOG_DEBUG_EVENT, c->log, 0, "verify:%d, error:%d, depth:%d, " - "subject:\"%s\",issuer: \"%s\"", + "subject:\"%s\", issuer:\"%s\"", ok, err, depth, subject, issuer); if (sname) { @@ -652,12 +662,18 @@ ngx_ssl_rsa512_key_callback(ngx_ssl_conn_t *ssl_conn, int is_export, { static RSA *key; - if (key_length == 512) { - if (key == NULL) { - key = RSA_generate_key(512, RSA_F4, NULL, NULL); - } + if (key_length != 512) { + return NULL; + } + +#ifndef OPENSSL_NO_DEPRECATED + + if (key == NULL) { + key = RSA_generate_key(512, RSA_F4, NULL, NULL); } +#endif + return key; } @@ -2072,9 +2088,10 @@ static int ngx_ssl_new_session(ngx_ssl_conn_t *ssl_conn, ngx_ssl_session_t *sess) { int len; - u_char *p, *id, *cached_sess; + u_char *p, *id, *cached_sess, *session_id; uint32_t hash; SSL_CTX *ssl_ctx; + unsigned int session_id_length; ngx_shm_zone_t *shm_zone; ngx_connection_t *c; ngx_slab_pool_t *shpool; @@ -2137,13 +2154,24 @@ ngx_ssl_new_session(ngx_ssl_conn_t *ssl_conn, ngx_ssl_session_t *sess) } } +#if OPENSSL_VERSION_NUMBER >= 0x0090800fL + + session_id = (u_char *) SSL_SESSION_get_id(sess, &session_id_length); + +#else + + session_id = sess->session_id; + session_id_length = sess->session_id_length; + +#endif + #if (NGX_PTR_SIZE == 8) id = sess_id->sess_id; #else - id = ngx_slab_alloc_locked(shpool, sess->session_id_length); + id = ngx_slab_alloc_locked(shpool, session_id_length); if (id == NULL) { @@ -2151,7 +2179,7 @@ ngx_ssl_new_session(ngx_ssl_conn_t *ssl_conn, ngx_ssl_session_t *sess) ngx_ssl_expire_sessions(cache, shpool, 0); - id = ngx_slab_alloc_locked(shpool, sess->session_id_length); + id = ngx_slab_alloc_locked(shpool, session_id_length); if (id == NULL) { goto failed; @@ -2162,16 +2190,16 @@ ngx_ssl_new_session(ngx_ssl_conn_t *ssl_conn, ngx_ssl_session_t *sess) ngx_memcpy(cached_sess, buf, len); - ngx_memcpy(id, sess->session_id, sess->session_id_length); + ngx_memcpy(id, session_id, session_id_length); - hash = ngx_crc32_short(sess->session_id, sess->session_id_length); + hash = ngx_crc32_short(session_id, session_id_length); ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0, - "ssl new session: %08XD:%d:%d", - hash, sess->session_id_length, len); + "ssl new session: %08XD:%ud:%d", + hash, session_id_length, len); sess_id->node.key = hash; - sess_id->node.data = (u_char) sess->session_id_length; + sess_id->node.data = (u_char) session_id_length; sess_id->id = id; sess_id->len = len; sess_id->session = cached_sess; @@ -2319,10 +2347,10 @@ ngx_ssl_remove_cached_session(SSL_CTX *ssl, ngx_ssl_session_t *sess) static void ngx_ssl_remove_session(SSL_CTX *ssl, ngx_ssl_session_t *sess) { - size_t len; u_char *id; uint32_t hash; ngx_int_t rc; + unsigned int len; ngx_shm_zone_t *shm_zone; ngx_slab_pool_t *shpool; ngx_rbtree_node_t *node, *sentinel; @@ -2337,13 +2365,21 @@ ngx_ssl_remove_session(SSL_CTX *ssl, ngx_ssl_session_t *sess) cache = shm_zone->data; +#if OPENSSL_VERSION_NUMBER >= 0x0090800fL + + id = (u_char *) SSL_SESSION_get_id(sess, &len); + +#else + id = sess->session_id; - len = (size_t) sess->session_id_length; + len = sess->session_id_length; + +#endif hash = ngx_crc32_short(id, len); ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ngx_cycle->log, 0, - "ssl remove session: %08XD:%uz", hash, len); + "ssl remove session: %08XD:%ud", hash, len); shpool = (ngx_slab_pool_t *) shm_zone->shm.addr; @@ -2638,7 +2674,7 @@ ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn, 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); - memcpy(name, key[0].name, 16); + ngx_memcpy(name, key[0].name, 16); return 0; @@ -2707,7 +2743,7 @@ ngx_ssl_check_host(ngx_connection_t *c, ngx_str_t *name) return NGX_ERROR; } -#if OPENSSL_VERSION_NUMBER >= 0x10002001L +#if (OPENSSL_VERSION_NUMBER >= 0x10002002L && !defined LIBRESSL_VERSION_NUMBER) /* X509_check_host() is only available in OpenSSL 1.0.2+ */ @@ -2715,7 +2751,7 @@ ngx_ssl_check_host(ngx_connection_t *c, ngx_str_t *name) goto failed; } - if (X509_check_host(cert, name->data, name->len, 0) != 1) { + if (X509_check_host(cert, (char *) name->data, name->len, 0, NULL) != 1) { ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0, "X509_check_host(): no match"); goto failed; @@ -2824,7 +2860,7 @@ found: } -#if OPENSSL_VERSION_NUMBER < 0x10002001L +#if (OPENSSL_VERSION_NUMBER < 0x10002002L || defined LIBRESSL_VERSION_NUMBER) static ngx_int_t ngx_ssl_check_name(ngx_str_t *name, ASN1_STRING *pattern) @@ -2885,9 +2921,9 @@ ngx_ssl_get_cipher_name(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s) ngx_int_t ngx_ssl_get_session_id(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s) { - int len; - u_char *buf; - SSL_SESSION *sess; + u_char *buf; + SSL_SESSION *sess; + unsigned int len; sess = SSL_get0_session(c->ssl->connection); if (sess == NULL) { @@ -2895,9 +2931,17 @@ ngx_ssl_get_session_id(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s) return NGX_OK; } +#if OPENSSL_VERSION_NUMBER >= 0x0090800fL + + buf = (u_char *) SSL_SESSION_get_id(sess, &len); + +#else + buf = sess->session_id; len = sess->session_id_length; +#endif + s->len = 2 * len; s->data = ngx_pnalloc(pool, 2 * len); if (s->data == NULL) { @@ -3245,6 +3289,8 @@ ngx_openssl_create_conf(ngx_cycle_t *cycle) static char * ngx_openssl_engine(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) { +#ifndef OPENSSL_NO_ENGINE + ngx_openssl_conf_t *oscf = conf; ENGINE *engine; @@ -3279,6 +3325,12 @@ ngx_openssl_engine(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) ENGINE_free(engine); return NGX_CONF_OK; + +#else + + return "is not supported"; + +#endif } @@ -3286,5 +3338,7 @@ static void ngx_openssl_exit(ngx_cycle_t *cycle) { EVP_cleanup(); +#ifndef OPENSSL_NO_ENGINE ENGINE_cleanup(); +#endif } Renamed: vendor/nginx-1.7.4/src/event/ngx_event_openssl.h (+11 -0) 96% =================================================================== --- vendor/nginx-1.7.3/src/event/ngx_event_openssl.h 2014-08-10 16:31:58 +0900 (0194602) +++ vendor/nginx-1.7.4/src/event/ngx_event_openssl.h 2014-08-11 17:07:53 +0900 (4086940) @@ -14,10 +14,21 @@ #include <openssl/ssl.h> #include <openssl/err.h> +#include <openssl/bn.h> #include <openssl/conf.h> +#include <openssl/crypto.h> +#include <openssl/dh.h> +#ifndef OPENSSL_NO_ENGINE #include <openssl/engine.h> +#endif #include <openssl/evp.h> +#ifndef OPENSSL_NO_OCSP #include <openssl/ocsp.h> +#endif +#include <openssl/rand.h> +#include <openssl/rsa.h> +#include <openssl/x509.h> +#include <openssl/x509v3.h> #define NGX_SSL_NAME "OpenSSL" Renamed: vendor/nginx-1.7.4/src/event/ngx_event_openssl_stapling.c (+1 -1) 99% =================================================================== --- vendor/nginx-1.7.3/src/event/ngx_event_openssl_stapling.c 2014-08-10 16:31:58 +0900 (69340b3) +++ vendor/nginx-1.7.4/src/event/ngx_event_openssl_stapling.c 2014-08-11 17:07:53 +0900 (2fa0673) @@ -11,7 +11,7 @@ #include <ngx_event_connect.h> -#ifdef SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB +#if (!defined OPENSSL_NO_OCSP && defined SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB) typedef struct { Renamed: vendor/nginx-1.7.4/src/event/ngx_event_pipe.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/event/ngx_event_pipe.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/event/ngx_event_posted.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/event/ngx_event_posted.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/event/ngx_event_timer.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/event/ngx_event_timer.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_access_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_addition_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_auth_basic_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_auth_request_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_autoindex_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_browser_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_charset_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_chunked_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_dav_module.c (+16 -4) 98% =================================================================== --- vendor/nginx-1.7.3/src/http/modules/ngx_http_dav_module.c 2014-08-10 16:31:58 +0900 (e7f9e9a) +++ vendor/nginx-1.7.4/src/http/modules/ngx_http_dav_module.c 2014-08-11 17:07:53 +0900 (529aba5) @@ -212,7 +212,10 @@ ngx_http_dav_put_handler(ngx_http_request_t *r) return; } - ngx_http_map_uri_to_path(r, &path, &root, 0); + if (ngx_http_map_uri_to_path(r, &path, &root, 0) == NULL) { + ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); + return; + } path.len--; @@ -320,7 +323,9 @@ ngx_http_dav_delete_handler(ngx_http_request_t *r) ok: - ngx_http_map_uri_to_path(r, &path, &root, 0); + if (ngx_http_map_uri_to_path(r, &path, &root, 0) == NULL) { + return NGX_HTTP_INTERNAL_SERVER_ERROR; + } ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "http delete filename: \"%s\"", path.data); @@ -488,6 +493,9 @@ ngx_http_dav_mkcol_handler(ngx_http_request_t *r, ngx_http_dav_loc_conf_t *dlcf) } p = ngx_http_map_uri_to_path(r, &path, &root, 0); + if (p == NULL) { + return NGX_HTTP_INTERNAL_SERVER_ERROR; + } *(p - 1) = '\0'; r->uri.len--; @@ -666,7 +674,9 @@ destination_done: overwrite_done: - ngx_http_map_uri_to_path(r, &path, &root, 0); + if (ngx_http_map_uri_to_path(r, &path, &root, 0) == NULL) { + return NGX_HTTP_INTERNAL_SERVER_ERROR; + } ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "http copy from: \"%s\"", path.data); @@ -674,7 +684,9 @@ overwrite_done: uri = r->uri; r->uri = duri; - ngx_http_map_uri_to_path(r, ©.path, &root, 0); + if (ngx_http_map_uri_to_path(r, ©.path, &root, 0) == NULL) { + return NGX_HTTP_INTERNAL_SERVER_ERROR; + } r->uri = uri; Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_degradation_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_empty_gif_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_fastcgi_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_flv_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_geo_module.c (+1 -1) 99% =================================================================== --- vendor/nginx-1.7.3/src/http/modules/ngx_http_geo_module.c 2014-08-10 16:31:58 +0900 (34c3b19) +++ vendor/nginx-1.7.4/src/http/modules/ngx_http_geo_module.c 2014-08-11 17:07:53 +0900 (9b3c6cb) @@ -1470,7 +1470,7 @@ ngx_http_geo_include_binary_base(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx, vv = (ngx_http_variable_value_t *) (base + sizeof(ngx_http_geo_header_t)); - while(vv->data) { + while (vv->data) { len = ngx_align(sizeof(ngx_http_variable_value_t) + vv->len, sizeof(void *)); ngx_crc32_update(&crc32, (u_char *) vv, len); Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_geoip_module.c (+9 -3) 98% =================================================================== --- vendor/nginx-1.7.3/src/http/modules/ngx_http_geoip_module.c 2014-08-10 16:31:58 +0900 (576fc5f) +++ vendor/nginx-1.7.4/src/http/modules/ngx_http_geoip_module.c 2014-08-11 17:07:53 +0900 (8e151aa) @@ -553,6 +553,9 @@ ngx_http_geoip_city_float_variable(ngx_http_request_t *r, val = *(float *) ((char *) gr + data); v->len = ngx_sprintf(v->data, "%.4f", val) - v->data; + v->valid = 1; + v->no_cacheable = 0; + v->not_found = 0; GeoIPRecord_delete(gr); @@ -582,6 +585,9 @@ ngx_http_geoip_city_int_variable(ngx_http_request_t *r, val = *(int *) ((char *) gr + data); v->len = ngx_sprintf(v->data, "%d", val) - v->data; + v->valid = 1; + v->no_cacheable = 0; + v->not_found = 0; GeoIPRecord_delete(gr); @@ -691,7 +697,7 @@ ngx_http_geoip_country(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) if (cf->args->nelts == 3) { if (ngx_strcmp(value[2].data, "utf8") == 0) { - GeoIP_set_charset (gcf->country, GEOIP_CHARSET_UTF8); + GeoIP_set_charset(gcf->country, GEOIP_CHARSET_UTF8); } else { ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, @@ -746,7 +752,7 @@ ngx_http_geoip_org(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) if (cf->args->nelts == 3) { if (ngx_strcmp(value[2].data, "utf8") == 0) { - GeoIP_set_charset (gcf->org, GEOIP_CHARSET_UTF8); + GeoIP_set_charset(gcf->org, GEOIP_CHARSET_UTF8); } else { ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, @@ -807,7 +813,7 @@ ngx_http_geoip_city(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) if (cf->args->nelts == 3) { if (ngx_strcmp(value[2].data, "utf8") == 0) { - GeoIP_set_charset (gcf->city, GEOIP_CHARSET_UTF8); + GeoIP_set_charset(gcf->city, GEOIP_CHARSET_UTF8); } else { ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_gunzip_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_gzip_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_gzip_static_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_headers_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_image_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_index_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_limit_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_limit_req_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_log_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_map_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_memcached_module.c (+2 -5) 98% =================================================================== --- vendor/nginx-1.7.3/src/http/modules/ngx_http_memcached_module.c 2014-08-10 16:31:58 +0900 (aaa047e) +++ vendor/nginx-1.7.4/src/http/modules/ngx_http_memcached_module.c 2014-08-11 17:07:53 +0900 (bda038d) @@ -380,11 +380,8 @@ found: } h->hash = 1; - h->key.len = sizeof("Content-Encoding") - 1; - h->key.data = (u_char *) "Content-Encoding"; - h->value.len = sizeof("gzip") - 1; - h->value.data = (u_char *) "gzip"; - + ngx_str_set(&h->key, "Content-Encoding"); + ngx_str_set(&h->value, "gzip"); r->headers_out.content_encoding = h; } Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_mp4_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_not_modified_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_proxy_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_random_index_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_range_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_realip_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_referer_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_rewrite_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_scgi_module.c (+1 -1) 99% =================================================================== --- vendor/nginx-1.7.3/src/http/modules/ngx_http_scgi_module.c 2014-08-10 16:31:58 +0900 (d3a8f11) +++ vendor/nginx-1.7.4/src/http/modules/ngx_http_scgi_module.c 2014-08-11 17:07:53 +0900 (0be5066) @@ -1645,7 +1645,7 @@ ngx_http_scgi_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) return "is duplicate"; } - clcf = ngx_http_conf_get_module_loc_conf (cf, ngx_http_core_module); + clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module); clcf->handler = ngx_http_scgi_handler; value = cf->args->elts; Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_secure_link_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_split_clients_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_ssi_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_ssi_filter_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_ssl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_ssl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_static_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_stub_status_module.c (+9 -7) 93% =================================================================== --- vendor/nginx-1.7.3/src/http/modules/ngx_http_stub_status_module.c 2014-08-10 16:31:58 +0900 (b5ecd6d) +++ vendor/nginx-1.7.4/src/http/modules/ngx_http_stub_status_module.c 2014-08-11 17:07:53 +0900 (f4f5888) @@ -10,18 +10,19 @@ #include <ngx_http.h> +static ngx_int_t ngx_http_stub_status_handler(ngx_http_request_t *r); static ngx_int_t ngx_http_stub_status_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data); static ngx_int_t ngx_http_stub_status_add_variables(ngx_conf_t *cf); +static char *ngx_http_set_stub_status(ngx_conf_t *cf, ngx_command_t *cmd, + void *conf); -static char *ngx_http_set_status(ngx_conf_t *cf, ngx_command_t *cmd, - void *conf); static ngx_command_t ngx_http_status_commands[] = { { ngx_string("stub_status"), NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, - ngx_http_set_status, + ngx_http_set_stub_status, 0, 0, NULL }, @@ -30,7 +31,6 @@ static ngx_command_t ngx_http_status_commands[] = { }; - static ngx_http_module_t ngx_http_stub_status_module_ctx = { ngx_http_stub_status_add_variables, /* preconfiguration */ NULL, /* postconfiguration */ @@ -80,7 +80,8 @@ static ngx_http_variable_t ngx_http_stub_status_vars[] = { }; -static ngx_int_t ngx_http_status_handler(ngx_http_request_t *r) +static ngx_int_t +ngx_http_stub_status_handler(ngx_http_request_t *r) { size_t size; ngx_int_t rc; @@ -223,12 +224,13 @@ ngx_http_stub_status_add_variables(ngx_conf_t *cf) } -static char *ngx_http_set_status(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) +static char * +ngx_http_set_stub_status(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) { ngx_http_core_loc_conf_t *clcf; clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module); - clcf->handler = ngx_http_status_handler; + clcf->handler = ngx_http_stub_status_handler; return NGX_CONF_OK; } Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_sub_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_upstream_hash_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_upstream_ip_hash_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_upstream_keepalive_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_upstream_least_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_userid_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_uwsgi_module.c (+1 -1) 99% =================================================================== --- vendor/nginx-1.7.3/src/http/modules/ngx_http_uwsgi_module.c 2014-08-10 16:31:58 +0900 (588b135) +++ vendor/nginx-1.7.4/src/http/modules/ngx_http_uwsgi_module.c 2014-08-11 17:07:53 +0900 (a613b68) @@ -1868,7 +1868,7 @@ ngx_http_uwsgi_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) return "is duplicate"; } - clcf = ngx_http_conf_get_module_loc_conf (cf, ngx_http_core_module); + clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module); clcf->handler = ngx_http_uwsgi_handler; value = cf->args->elts; Renamed: vendor/nginx-1.7.4/src/http/modules/ngx_http_xslt_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/perl/Makefile.PL (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/perl/nginx.pm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/perl/nginx.xs (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/perl/ngx_http_perl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/perl/ngx_http_perl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/modules/perl/typemap (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/ngx_http.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/ngx_http.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/ngx_http_busy_lock.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/ngx_http_busy_lock.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/ngx_http_cache.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/ngx_http_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/ngx_http_copy_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/ngx_http_core_module.c (+2 -2) 99% =================================================================== --- vendor/nginx-1.7.3/src/http/ngx_http_core_module.c 2014-08-10 16:31:58 +0900 (2947ad3) +++ vendor/nginx-1.7.4/src/http/ngx_http_core_module.c 2014-08-11 17:07:53 +0900 (4071b61) @@ -2355,7 +2355,7 @@ ngx_http_gzip_accept_encoding(ngx_str_t *ae) p += 4; while (p < last) { - switch(*p++) { + switch (*p++) { case ',': return NGX_OK; case ';': @@ -2372,7 +2372,7 @@ ngx_http_gzip_accept_encoding(ngx_str_t *ae) quantity: while (p < last) { - switch(*p++) { + switch (*p++) { case 'q': case 'Q': goto equal; Renamed: vendor/nginx-1.7.4/src/http/ngx_http_core_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/ngx_http_file_cache.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/ngx_http_header_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/ngx_http_parse.c (+4 -4) 99% =================================================================== --- vendor/nginx-1.7.3/src/http/ngx_http_parse.c 2014-08-10 16:31:58 +0900 (f287869) +++ vendor/nginx-1.7.4/src/http/ngx_http_parse.c 2014-08-11 17:07:53 +0900 (b60f41b) @@ -1287,7 +1287,7 @@ ngx_http_parse_complex_uri(ngx_http_request_t *r, ngx_uint_t merge_slashes) break; } - switch(ch) { + switch (ch) { #if (NGX_WIN32) case '\\': if (u - 2 >= r->uri.data @@ -1357,7 +1357,7 @@ ngx_http_parse_complex_uri(ngx_http_request_t *r, ngx_uint_t merge_slashes) break; } - switch(ch) { + switch (ch) { #if (NGX_WIN32) case '\\': break; @@ -1400,7 +1400,7 @@ ngx_http_parse_complex_uri(ngx_http_request_t *r, ngx_uint_t merge_slashes) break; } - switch(ch) { + switch (ch) { #if (NGX_WIN32) case '\\': #endif @@ -1441,7 +1441,7 @@ ngx_http_parse_complex_uri(ngx_http_request_t *r, ngx_uint_t merge_slashes) break; } - switch(ch) { + switch (ch) { #if (NGX_WIN32) case '\\': #endif Renamed: vendor/nginx-1.7.4/src/http/ngx_http_parse_time.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/ngx_http_postpone_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/ngx_http_request.c (+2 -0) 99% =================================================================== --- vendor/nginx-1.7.3/src/http/ngx_http_request.c 2014-08-10 16:31:58 +0900 (4bf9d1f) +++ vendor/nginx-1.7.4/src/http/ngx_http_request.c 2014-08-11 17:07:53 +0900 (845ada3) @@ -1071,6 +1071,8 @@ ngx_http_process_request_uri(ngx_http_request_t *r) cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module); if (ngx_http_parse_complex_uri(r, cscf->merge_slashes) != NGX_OK) { + r->uri.len = 0; + ngx_log_error(NGX_LOG_INFO, r->connection->log, 0, "client sent invalid request"); ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST); Renamed: vendor/nginx-1.7.4/src/http/ngx_http_request.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/ngx_http_request_body.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/ngx_http_script.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/ngx_http_script.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/ngx_http_spdy.c (+2 -0) 99% =================================================================== --- vendor/nginx-1.7.3/src/http/ngx_http_spdy.c 2014-08-10 16:31:58 +0900 (810d8d8) +++ vendor/nginx-1.7.4/src/http/ngx_http_spdy.c 2014-08-11 17:07:53 +0900 (4780369) @@ -2584,6 +2584,8 @@ ngx_http_spdy_parse_header(ngx_http_request_t *r) r->header_end = p; r->header_in->pos = p + 1; + r->state = sw_value; + return NGX_OK; } Renamed: vendor/nginx-1.7.4/src/http/ngx_http_spdy.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/ngx_http_spdy_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/ngx_http_spdy_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/ngx_http_spdy_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/ngx_http_special_response.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/ngx_http_upstream.c (+11 -3) 99% =================================================================== --- vendor/nginx-1.7.3/src/http/ngx_http_upstream.c 2014-08-10 16:31:58 +0900 (0129691) +++ vendor/nginx-1.7.4/src/http/ngx_http_upstream.c 2014-08-11 17:07:53 +0900 (18b04f7) @@ -1393,6 +1393,11 @@ ngx_http_upstream_ssl_init_connection(ngx_http_request_t *r, rc = ngx_ssl_handshake(c); if (rc == NGX_AGAIN) { + + if (!c->write->timer_set) { + ngx_add_timer(c->write, u->conf->connect_timeout); + } + c->ssl->handler = ngx_http_upstream_ssl_handshake; return; } @@ -3253,7 +3258,6 @@ ngx_http_upstream_process_request(ngx_http_request_t *r) || u->headers_in.content_length_n == tf->offset)) { ngx_http_upstream_store(r, u); - u->store = 0; } } } @@ -3375,7 +3379,9 @@ ngx_http_upstream_store(ngx_http_request_t *r, ngx_http_upstream_t *u) if (u->conf->store_lengths == NULL) { - ngx_http_map_uri_to_path(r, &path, &root, 0); + if (ngx_http_map_uri_to_path(r, &path, &root, 0) == NULL) { + return; + } } else { if (ngx_http_script_run(r, &path, u->conf->store_lengths->elts, 0, @@ -3393,6 +3399,8 @@ ngx_http_upstream_store(ngx_http_request_t *r, ngx_http_upstream_t *u) tf->file.name.data, path.data); (void) ngx_ext_rename_file(&tf->file.name, &path, &ext); + + u->store = 0; } @@ -3441,7 +3449,7 @@ ngx_http_upstream_next(ngx_http_request_t *r, ngx_http_upstream_t *u, u->peer.tries++; } else { - switch(ft_type) { + switch (ft_type) { case NGX_HTTP_UPSTREAM_FT_TIMEOUT: status = NGX_HTTP_GATEWAY_TIME_OUT; Renamed: vendor/nginx-1.7.4/src/http/ngx_http_upstream.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/ngx_http_upstream_round_robin.c (+6 -8) 97% =================================================================== --- vendor/nginx-1.7.3/src/http/ngx_http_upstream_round_robin.c 2014-08-10 16:31:58 +0900 (37c835c) +++ vendor/nginx-1.7.4/src/http/ngx_http_upstream_round_robin.c 2014-08-11 17:07:53 +0900 (b39eeae) @@ -632,9 +632,8 @@ ngx_http_upstream_set_round_robin_peer_session(ngx_peer_connection_t *pc, rc = ngx_ssl_set_session(pc->connection, ssl_session); - ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0, - "set session: %p:%d", - ssl_session, ssl_session ? ssl_session->references : 0); + ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, + "set session: %p", ssl_session); /* ngx_unlock_mutex(rrp->peers->mutex); */ @@ -657,8 +656,8 @@ ngx_http_upstream_save_round_robin_peer_session(ngx_peer_connection_t *pc, return; } - ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0, - "save session: %p:%d", ssl_session, ssl_session->references); + ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, + "save session: %p", ssl_session); peer = &rrp->peers->peer[rrp->current]; @@ -672,9 +671,8 @@ ngx_http_upstream_save_round_robin_peer_session(ngx_peer_connection_t *pc, if (old_ssl_session) { - ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0, - "old session: %p:%d", - old_ssl_session, old_ssl_session->references); + ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, + "old session: %p", old_ssl_session); /* TODO: may block */ Renamed: vendor/nginx-1.7.4/src/http/ngx_http_upstream_round_robin.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/ngx_http_variables.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/ngx_http_variables.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/http/ngx_http_write_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/mail/ngx_mail.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/mail/ngx_mail.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/mail/ngx_mail_auth_http_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/mail/ngx_mail_core_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/mail/ngx_mail_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/mail/ngx_mail_imap_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/mail/ngx_mail_imap_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/mail/ngx_mail_imap_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/mail/ngx_mail_parse.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/mail/ngx_mail_pop3_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/mail/ngx_mail_pop3_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/mail/ngx_mail_pop3_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/mail/ngx_mail_proxy_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/mail/ngx_mail_smtp_handler.c (+3 -0) 99% =================================================================== --- vendor/nginx-1.7.3/src/mail/ngx_mail_smtp_handler.c 2014-08-10 16:31:58 +0900 (665f5ef) +++ vendor/nginx-1.7.4/src/mail/ngx_mail_smtp_handler.c 2014-08-11 17:07:53 +0900 (46d703e) @@ -777,6 +777,9 @@ ngx_mail_smtp_starttls(ngx_mail_session_t *s, ngx_connection_t *c) ngx_str_null(&s->smtp_from); ngx_str_null(&s->smtp_to); + s->buffer->pos = s->buffer->start; + s->buffer->last = s->buffer->start; + c->read->handler = ngx_mail_starttls_handler; return NGX_OK; } Renamed: vendor/nginx-1.7.4/src/mail/ngx_mail_smtp_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/mail/ngx_mail_smtp_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/mail/ngx_mail_ssl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/mail/ngx_mail_ssl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/misc/ngx_cpp_test_module.cpp (+1 -1) 90% =================================================================== --- vendor/nginx-1.7.3/src/misc/ngx_cpp_test_module.cpp 2014-08-10 16:31:58 +0900 (3cbc0a8) +++ vendor/nginx-1.7.4/src/misc/ngx_cpp_test_module.cpp 2014-08-11 17:07:53 +0900 (5d2f08d) @@ -1,5 +1,5 @@ -// stub module to test header files' C++ compatibilty +// stub module to test header files' C++ compatibility extern "C" { #include <ngx_config.h> Renamed: vendor/nginx-1.7.4/src/misc/ngx_google_perftools_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_aio_read.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_aio_read_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_aio_write.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_aio_write_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_alloc.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_alloc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_atomic.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_channel.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_channel.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_daemon.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_darwin.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_darwin_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_darwin_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_darwin_sendfile_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_errno.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_errno.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_file_aio_read.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_files.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_files.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_freebsd.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_freebsd_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_freebsd_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_freebsd_rfork_thread.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_freebsd_rfork_thread.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_freebsd_sendfile_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_gcc_atomic_amd64.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_gcc_atomic_ppc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_gcc_atomic_sparc64.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_gcc_atomic_x86.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_linux.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_linux_aio_read.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_linux_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_linux_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_linux_sendfile_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_os.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_posix_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_posix_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_process.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_process.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_process_cycle.c (+4 -0) 99% =================================================================== --- vendor/nginx-1.7.3/src/os/unix/ngx_process_cycle.c 2014-08-10 16:31:58 +0900 (fb10d77) +++ vendor/nginx-1.7.4/src/os/unix/ngx_process_cycle.c 2014-08-11 17:07:53 +0900 (3205aa5) @@ -121,6 +121,10 @@ ngx_master_process_cycle(ngx_cycle_t *cycle) } title = ngx_pnalloc(cycle->pool, size); + if (title == NULL) { + /* fatal */ + exit(2); + } p = ngx_cpymem(title, master_process, sizeof(master_process) - 1); for (i = 0; i < ngx_argc; i++) { Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_process_cycle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_pthread_thread.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_readv_chain.c (+5 -1) 98% =================================================================== --- vendor/nginx-1.7.3/src/os/unix/ngx_readv_chain.c 2014-08-10 16:31:58 +0900 (8836c81) +++ vendor/nginx-1.7.4/src/os/unix/ngx_readv_chain.c 2014-08-11 17:07:53 +0900 (e4eb5ff) @@ -10,7 +10,11 @@ #include <ngx_event.h> -#define NGX_IOVS 16 +#if (IOV_MAX > 64) +#define NGX_IOVS 64 +#else +#define NGX_IOVS IOV_MAX +#endif #if (NGX_HAVE_KQUEUE) Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_recv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_send.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_setaffinity.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_setaffinity.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_setproctitle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_setproctitle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_shmem.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_shmem.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_socket.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_socket.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_solaris.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_solaris_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_solaris_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_solaris_sendfilev_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_sunpro_amd64.il (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_sunpro_atomic_sparc64.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_sunpro_sparc64.il (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_sunpro_x86.il (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_thread.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_time.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_time.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_udp_recv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_user.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_user.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/ngx_writev_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.7.4/src/os/unix/rfork_thread.S (+0 -0) 100% ===================================================================
