HAYASHI Kentaro
null+****@clear*****
Wed Mar 26 11:37:10 JST 2014
HAYASHI Kentaro 2014-03-26 11:37:10 +0900 (Wed, 26 Mar 2014) New Revision: 90b23b6b264d846804ceb25d877e1e0e5ccbf738 https://github.com/groonga/groonga/commit/90b23b6b264d846804ceb25d877e1e0e5ccbf738 Message: httpd: update nginx to latest stable release 1.4.4 -> 1.4.7 Note that nginx 1.4.7 contains security fix(CVE-2014-0133). % make update-nginx NEW_NGINX_VERSION=1.4.7 Modified files: nginx_version Renamed files: vendor/nginx-1.4.7/CHANGES (from vendor/nginx-1.4.4/CHANGES) vendor/nginx-1.4.7/CHANGES.ru (from vendor/nginx-1.4.4/CHANGES.ru) vendor/nginx-1.4.7/LICENSE (from vendor/nginx-1.4.4/LICENSE) vendor/nginx-1.4.7/README (from vendor/nginx-1.4.4/README) vendor/nginx-1.4.7/auto/cc/acc (from vendor/nginx-1.4.4/auto/cc/acc) vendor/nginx-1.4.7/auto/cc/bcc (from vendor/nginx-1.4.4/auto/cc/bcc) vendor/nginx-1.4.7/auto/cc/ccc (from vendor/nginx-1.4.4/auto/cc/ccc) vendor/nginx-1.4.7/auto/cc/clang (from vendor/nginx-1.4.4/auto/cc/clang) vendor/nginx-1.4.7/auto/cc/conf (from vendor/nginx-1.4.4/auto/cc/conf) vendor/nginx-1.4.7/auto/cc/gcc (from vendor/nginx-1.4.4/auto/cc/gcc) vendor/nginx-1.4.7/auto/cc/icc (from vendor/nginx-1.4.4/auto/cc/icc) vendor/nginx-1.4.7/auto/cc/msvc (from vendor/nginx-1.4.4/auto/cc/msvc) vendor/nginx-1.4.7/auto/cc/name (from vendor/nginx-1.4.4/auto/cc/name) vendor/nginx-1.4.7/auto/cc/owc (from vendor/nginx-1.4.4/auto/cc/owc) vendor/nginx-1.4.7/auto/cc/sunc (from vendor/nginx-1.4.4/auto/cc/sunc) vendor/nginx-1.4.7/auto/define (from vendor/nginx-1.4.4/auto/define) vendor/nginx-1.4.7/auto/endianness (from vendor/nginx-1.4.4/auto/endianness) vendor/nginx-1.4.7/auto/feature (from vendor/nginx-1.4.4/auto/feature) vendor/nginx-1.4.7/auto/have (from vendor/nginx-1.4.4/auto/have) vendor/nginx-1.4.7/auto/have_headers (from vendor/nginx-1.4.4/auto/have_headers) vendor/nginx-1.4.7/auto/headers (from vendor/nginx-1.4.4/auto/headers) vendor/nginx-1.4.7/auto/include (from vendor/nginx-1.4.4/auto/include) vendor/nginx-1.4.7/auto/init (from vendor/nginx-1.4.4/auto/init) vendor/nginx-1.4.7/auto/install (from vendor/nginx-1.4.4/auto/install) vendor/nginx-1.4.7/auto/lib/conf (from vendor/nginx-1.4.4/auto/lib/conf) vendor/nginx-1.4.7/auto/lib/geoip/conf (from vendor/nginx-1.4.4/auto/lib/geoip/conf) vendor/nginx-1.4.7/auto/lib/google-perftools/conf (from vendor/nginx-1.4.4/auto/lib/google-perftools/conf) vendor/nginx-1.4.7/auto/lib/libatomic/conf (from vendor/nginx-1.4.4/auto/lib/libatomic/conf) vendor/nginx-1.4.7/auto/lib/libatomic/make (from vendor/nginx-1.4.4/auto/lib/libatomic/make) vendor/nginx-1.4.7/auto/lib/libgd/conf (from vendor/nginx-1.4.4/auto/lib/libgd/conf) vendor/nginx-1.4.7/auto/lib/libxslt/conf (from vendor/nginx-1.4.4/auto/lib/libxslt/conf) vendor/nginx-1.4.7/auto/lib/make (from vendor/nginx-1.4.4/auto/lib/make) vendor/nginx-1.4.7/auto/lib/md5/conf (from vendor/nginx-1.4.4/auto/lib/md5/conf) vendor/nginx-1.4.7/auto/lib/md5/make (from vendor/nginx-1.4.4/auto/lib/md5/make) vendor/nginx-1.4.7/auto/lib/md5/makefile.bcc (from vendor/nginx-1.4.4/auto/lib/md5/makefile.bcc) vendor/nginx-1.4.7/auto/lib/md5/makefile.msvc (from vendor/nginx-1.4.4/auto/lib/md5/makefile.msvc) vendor/nginx-1.4.7/auto/lib/md5/makefile.owc (from vendor/nginx-1.4.4/auto/lib/md5/makefile.owc) vendor/nginx-1.4.7/auto/lib/openssl/conf (from vendor/nginx-1.4.4/auto/lib/openssl/conf) vendor/nginx-1.4.7/auto/lib/openssl/make (from vendor/nginx-1.4.4/auto/lib/openssl/make) vendor/nginx-1.4.7/auto/lib/openssl/makefile.bcc (from vendor/nginx-1.4.4/auto/lib/openssl/makefile.bcc) vendor/nginx-1.4.7/auto/lib/openssl/makefile.msvc (from vendor/nginx-1.4.4/auto/lib/openssl/makefile.msvc) vendor/nginx-1.4.7/auto/lib/pcre/conf (from vendor/nginx-1.4.4/auto/lib/pcre/conf) vendor/nginx-1.4.7/auto/lib/pcre/make (from vendor/nginx-1.4.4/auto/lib/pcre/make) vendor/nginx-1.4.7/auto/lib/pcre/makefile.bcc (from vendor/nginx-1.4.4/auto/lib/pcre/makefile.bcc) vendor/nginx-1.4.7/auto/lib/pcre/makefile.msvc (from vendor/nginx-1.4.4/auto/lib/pcre/makefile.msvc) vendor/nginx-1.4.7/auto/lib/pcre/makefile.owc (from vendor/nginx-1.4.4/auto/lib/pcre/makefile.owc) vendor/nginx-1.4.7/auto/lib/perl/conf (from vendor/nginx-1.4.4/auto/lib/perl/conf) vendor/nginx-1.4.7/auto/lib/perl/make (from vendor/nginx-1.4.4/auto/lib/perl/make) vendor/nginx-1.4.7/auto/lib/sha1/conf (from vendor/nginx-1.4.4/auto/lib/sha1/conf) vendor/nginx-1.4.7/auto/lib/sha1/make (from vendor/nginx-1.4.4/auto/lib/sha1/make) vendor/nginx-1.4.7/auto/lib/sha1/makefile.bcc (from vendor/nginx-1.4.4/auto/lib/sha1/makefile.bcc) vendor/nginx-1.4.7/auto/lib/sha1/makefile.msvc (from vendor/nginx-1.4.4/auto/lib/sha1/makefile.msvc) vendor/nginx-1.4.7/auto/lib/sha1/makefile.owc (from vendor/nginx-1.4.4/auto/lib/sha1/makefile.owc) vendor/nginx-1.4.7/auto/lib/test (from vendor/nginx-1.4.4/auto/lib/test) vendor/nginx-1.4.7/auto/lib/zlib/conf (from vendor/nginx-1.4.4/auto/lib/zlib/conf) vendor/nginx-1.4.7/auto/lib/zlib/make (from vendor/nginx-1.4.4/auto/lib/zlib/make) vendor/nginx-1.4.7/auto/lib/zlib/makefile.bcc (from vendor/nginx-1.4.4/auto/lib/zlib/makefile.bcc) vendor/nginx-1.4.7/auto/lib/zlib/makefile.msvc (from vendor/nginx-1.4.4/auto/lib/zlib/makefile.msvc) vendor/nginx-1.4.7/auto/lib/zlib/makefile.owc (from vendor/nginx-1.4.4/auto/lib/zlib/makefile.owc) vendor/nginx-1.4.7/auto/lib/zlib/patch.zlib.h (from vendor/nginx-1.4.4/auto/lib/zlib/patch.zlib.h) vendor/nginx-1.4.7/auto/make (from vendor/nginx-1.4.4/auto/make) vendor/nginx-1.4.7/auto/modules (from vendor/nginx-1.4.4/auto/modules) vendor/nginx-1.4.7/auto/nohave (from vendor/nginx-1.4.4/auto/nohave) vendor/nginx-1.4.7/auto/options (from vendor/nginx-1.4.4/auto/options) vendor/nginx-1.4.7/auto/os/conf (from vendor/nginx-1.4.4/auto/os/conf) vendor/nginx-1.4.7/auto/os/darwin (from vendor/nginx-1.4.4/auto/os/darwin) vendor/nginx-1.4.7/auto/os/freebsd (from vendor/nginx-1.4.4/auto/os/freebsd) vendor/nginx-1.4.7/auto/os/linux (from vendor/nginx-1.4.4/auto/os/linux) vendor/nginx-1.4.7/auto/os/solaris (from vendor/nginx-1.4.4/auto/os/solaris) vendor/nginx-1.4.7/auto/os/win32 (from vendor/nginx-1.4.4/auto/os/win32) vendor/nginx-1.4.7/auto/sources (from vendor/nginx-1.4.4/auto/sources) vendor/nginx-1.4.7/auto/stubs (from vendor/nginx-1.4.4/auto/stubs) vendor/nginx-1.4.7/auto/summary (from vendor/nginx-1.4.4/auto/summary) vendor/nginx-1.4.7/auto/types/sizeof (from vendor/nginx-1.4.4/auto/types/sizeof) vendor/nginx-1.4.7/auto/types/typedef (from vendor/nginx-1.4.4/auto/types/typedef) vendor/nginx-1.4.7/auto/types/uintptr_t (from vendor/nginx-1.4.4/auto/types/uintptr_t) vendor/nginx-1.4.7/auto/types/value (from vendor/nginx-1.4.4/auto/types/value) vendor/nginx-1.4.7/auto/unix (from vendor/nginx-1.4.4/auto/unix) vendor/nginx-1.4.7/conf/fastcgi.conf (from vendor/nginx-1.4.4/conf/fastcgi.conf) vendor/nginx-1.4.7/conf/fastcgi_params (from vendor/nginx-1.4.4/conf/fastcgi_params) vendor/nginx-1.4.7/conf/koi-utf (from vendor/nginx-1.4.4/conf/koi-utf) vendor/nginx-1.4.7/conf/koi-win (from vendor/nginx-1.4.4/conf/koi-win) vendor/nginx-1.4.7/conf/mime.types (from vendor/nginx-1.4.4/conf/mime.types) vendor/nginx-1.4.7/conf/nginx.conf (from vendor/nginx-1.4.4/conf/nginx.conf) vendor/nginx-1.4.7/conf/scgi_params (from vendor/nginx-1.4.4/conf/scgi_params) vendor/nginx-1.4.7/conf/uwsgi_params (from vendor/nginx-1.4.4/conf/uwsgi_params) vendor/nginx-1.4.7/conf/win-utf (from vendor/nginx-1.4.4/conf/win-utf) vendor/nginx-1.4.7/configure (from vendor/nginx-1.4.4/configure) vendor/nginx-1.4.7/contrib/README (from vendor/nginx-1.4.4/contrib/README) vendor/nginx-1.4.7/contrib/geo2nginx.pl (from vendor/nginx-1.4.4/contrib/geo2nginx.pl) vendor/nginx-1.4.7/contrib/unicode2nginx/koi-utf (from vendor/nginx-1.4.4/contrib/unicode2nginx/koi-utf) vendor/nginx-1.4.7/contrib/unicode2nginx/unicode-to-nginx.pl (from vendor/nginx-1.4.4/contrib/unicode2nginx/unicode-to-nginx.pl) vendor/nginx-1.4.7/contrib/unicode2nginx/win-utf (from vendor/nginx-1.4.4/contrib/unicode2nginx/win-utf) vendor/nginx-1.4.7/html/50x.html (from vendor/nginx-1.4.4/html/50x.html) vendor/nginx-1.4.7/html/index.html (from vendor/nginx-1.4.4/html/index.html) vendor/nginx-1.4.7/man/nginx.8 (from vendor/nginx-1.4.4/man/nginx.8) vendor/nginx-1.4.7/src/core/nginx.c (from vendor/nginx-1.4.4/src/core/nginx.c) vendor/nginx-1.4.7/src/core/nginx.h (from vendor/nginx-1.4.4/src/core/nginx.h) vendor/nginx-1.4.7/src/core/ngx_array.c (from vendor/nginx-1.4.4/src/core/ngx_array.c) vendor/nginx-1.4.7/src/core/ngx_array.h (from vendor/nginx-1.4.4/src/core/ngx_array.h) vendor/nginx-1.4.7/src/core/ngx_buf.c (from vendor/nginx-1.4.4/src/core/ngx_buf.c) vendor/nginx-1.4.7/src/core/ngx_buf.h (from vendor/nginx-1.4.4/src/core/ngx_buf.h) vendor/nginx-1.4.7/src/core/ngx_conf_file.c (from vendor/nginx-1.4.4/src/core/ngx_conf_file.c) vendor/nginx-1.4.7/src/core/ngx_conf_file.h (from vendor/nginx-1.4.4/src/core/ngx_conf_file.h) vendor/nginx-1.4.7/src/core/ngx_config.h (from vendor/nginx-1.4.4/src/core/ngx_config.h) vendor/nginx-1.4.7/src/core/ngx_connection.c (from vendor/nginx-1.4.4/src/core/ngx_connection.c) vendor/nginx-1.4.7/src/core/ngx_connection.h (from vendor/nginx-1.4.4/src/core/ngx_connection.h) vendor/nginx-1.4.7/src/core/ngx_core.h (from vendor/nginx-1.4.4/src/core/ngx_core.h) vendor/nginx-1.4.7/src/core/ngx_cpuinfo.c (from vendor/nginx-1.4.4/src/core/ngx_cpuinfo.c) vendor/nginx-1.4.7/src/core/ngx_crc.h (from vendor/nginx-1.4.4/src/core/ngx_crc.h) vendor/nginx-1.4.7/src/core/ngx_crc32.c (from vendor/nginx-1.4.4/src/core/ngx_crc32.c) vendor/nginx-1.4.7/src/core/ngx_crc32.h (from vendor/nginx-1.4.4/src/core/ngx_crc32.h) vendor/nginx-1.4.7/src/core/ngx_crypt.c (from vendor/nginx-1.4.4/src/core/ngx_crypt.c) vendor/nginx-1.4.7/src/core/ngx_crypt.h (from vendor/nginx-1.4.4/src/core/ngx_crypt.h) vendor/nginx-1.4.7/src/core/ngx_cycle.c (from vendor/nginx-1.4.4/src/core/ngx_cycle.c) vendor/nginx-1.4.7/src/core/ngx_cycle.h (from vendor/nginx-1.4.4/src/core/ngx_cycle.h) vendor/nginx-1.4.7/src/core/ngx_file.c (from vendor/nginx-1.4.4/src/core/ngx_file.c) vendor/nginx-1.4.7/src/core/ngx_file.h (from vendor/nginx-1.4.4/src/core/ngx_file.h) vendor/nginx-1.4.7/src/core/ngx_hash.c (from vendor/nginx-1.4.4/src/core/ngx_hash.c) vendor/nginx-1.4.7/src/core/ngx_hash.h (from vendor/nginx-1.4.4/src/core/ngx_hash.h) vendor/nginx-1.4.7/src/core/ngx_inet.c (from vendor/nginx-1.4.4/src/core/ngx_inet.c) vendor/nginx-1.4.7/src/core/ngx_inet.h (from vendor/nginx-1.4.4/src/core/ngx_inet.h) vendor/nginx-1.4.7/src/core/ngx_list.c (from vendor/nginx-1.4.4/src/core/ngx_list.c) vendor/nginx-1.4.7/src/core/ngx_list.h (from vendor/nginx-1.4.4/src/core/ngx_list.h) vendor/nginx-1.4.7/src/core/ngx_log.c (from vendor/nginx-1.4.4/src/core/ngx_log.c) vendor/nginx-1.4.7/src/core/ngx_log.h (from vendor/nginx-1.4.4/src/core/ngx_log.h) vendor/nginx-1.4.7/src/core/ngx_md5.c (from vendor/nginx-1.4.4/src/core/ngx_md5.c) vendor/nginx-1.4.7/src/core/ngx_md5.h (from vendor/nginx-1.4.4/src/core/ngx_md5.h) vendor/nginx-1.4.7/src/core/ngx_murmurhash.c (from vendor/nginx-1.4.4/src/core/ngx_murmurhash.c) vendor/nginx-1.4.7/src/core/ngx_murmurhash.h (from vendor/nginx-1.4.4/src/core/ngx_murmurhash.h) vendor/nginx-1.4.7/src/core/ngx_open_file_cache.c (from vendor/nginx-1.4.4/src/core/ngx_open_file_cache.c) vendor/nginx-1.4.7/src/core/ngx_open_file_cache.h (from vendor/nginx-1.4.4/src/core/ngx_open_file_cache.h) vendor/nginx-1.4.7/src/core/ngx_output_chain.c (from vendor/nginx-1.4.4/src/core/ngx_output_chain.c) vendor/nginx-1.4.7/src/core/ngx_palloc.c (from vendor/nginx-1.4.4/src/core/ngx_palloc.c) vendor/nginx-1.4.7/src/core/ngx_palloc.h (from vendor/nginx-1.4.4/src/core/ngx_palloc.h) vendor/nginx-1.4.7/src/core/ngx_parse.c (from vendor/nginx-1.4.4/src/core/ngx_parse.c) vendor/nginx-1.4.7/src/core/ngx_parse.h (from vendor/nginx-1.4.4/src/core/ngx_parse.h) vendor/nginx-1.4.7/src/core/ngx_queue.c (from vendor/nginx-1.4.4/src/core/ngx_queue.c) vendor/nginx-1.4.7/src/core/ngx_queue.h (from vendor/nginx-1.4.4/src/core/ngx_queue.h) vendor/nginx-1.4.7/src/core/ngx_radix_tree.c (from vendor/nginx-1.4.4/src/core/ngx_radix_tree.c) vendor/nginx-1.4.7/src/core/ngx_radix_tree.h (from vendor/nginx-1.4.4/src/core/ngx_radix_tree.h) vendor/nginx-1.4.7/src/core/ngx_rbtree.c (from vendor/nginx-1.4.4/src/core/ngx_rbtree.c) vendor/nginx-1.4.7/src/core/ngx_rbtree.h (from vendor/nginx-1.4.4/src/core/ngx_rbtree.h) vendor/nginx-1.4.7/src/core/ngx_regex.c (from vendor/nginx-1.4.4/src/core/ngx_regex.c) vendor/nginx-1.4.7/src/core/ngx_regex.h (from vendor/nginx-1.4.4/src/core/ngx_regex.h) vendor/nginx-1.4.7/src/core/ngx_resolver.c (from vendor/nginx-1.4.4/src/core/ngx_resolver.c) vendor/nginx-1.4.7/src/core/ngx_resolver.h (from vendor/nginx-1.4.4/src/core/ngx_resolver.h) vendor/nginx-1.4.7/src/core/ngx_sha1.h (from vendor/nginx-1.4.4/src/core/ngx_sha1.h) vendor/nginx-1.4.7/src/core/ngx_shmtx.c (from vendor/nginx-1.4.4/src/core/ngx_shmtx.c) vendor/nginx-1.4.7/src/core/ngx_shmtx.h (from vendor/nginx-1.4.4/src/core/ngx_shmtx.h) vendor/nginx-1.4.7/src/core/ngx_slab.c (from vendor/nginx-1.4.4/src/core/ngx_slab.c) vendor/nginx-1.4.7/src/core/ngx_slab.h (from vendor/nginx-1.4.4/src/core/ngx_slab.h) vendor/nginx-1.4.7/src/core/ngx_spinlock.c (from vendor/nginx-1.4.4/src/core/ngx_spinlock.c) vendor/nginx-1.4.7/src/core/ngx_string.c (from vendor/nginx-1.4.4/src/core/ngx_string.c) vendor/nginx-1.4.7/src/core/ngx_string.h (from vendor/nginx-1.4.4/src/core/ngx_string.h) vendor/nginx-1.4.7/src/core/ngx_times.c (from vendor/nginx-1.4.4/src/core/ngx_times.c) vendor/nginx-1.4.7/src/core/ngx_times.h (from vendor/nginx-1.4.4/src/core/ngx_times.h) vendor/nginx-1.4.7/src/event/modules/ngx_aio_module.c (from vendor/nginx-1.4.4/src/event/modules/ngx_aio_module.c) vendor/nginx-1.4.7/src/event/modules/ngx_devpoll_module.c (from vendor/nginx-1.4.4/src/event/modules/ngx_devpoll_module.c) vendor/nginx-1.4.7/src/event/modules/ngx_epoll_module.c (from vendor/nginx-1.4.4/src/event/modules/ngx_epoll_module.c) vendor/nginx-1.4.7/src/event/modules/ngx_eventport_module.c (from vendor/nginx-1.4.4/src/event/modules/ngx_eventport_module.c) vendor/nginx-1.4.7/src/event/modules/ngx_kqueue_module.c (from vendor/nginx-1.4.4/src/event/modules/ngx_kqueue_module.c) vendor/nginx-1.4.7/src/event/modules/ngx_poll_module.c (from vendor/nginx-1.4.4/src/event/modules/ngx_poll_module.c) vendor/nginx-1.4.7/src/event/modules/ngx_rtsig_module.c (from vendor/nginx-1.4.4/src/event/modules/ngx_rtsig_module.c) vendor/nginx-1.4.7/src/event/modules/ngx_select_module.c (from vendor/nginx-1.4.4/src/event/modules/ngx_select_module.c) vendor/nginx-1.4.7/src/event/modules/ngx_win32_select_module.c (from vendor/nginx-1.4.4/src/event/modules/ngx_win32_select_module.c) vendor/nginx-1.4.7/src/event/ngx_event.c (from vendor/nginx-1.4.4/src/event/ngx_event.c) vendor/nginx-1.4.7/src/event/ngx_event.h (from vendor/nginx-1.4.4/src/event/ngx_event.h) vendor/nginx-1.4.7/src/event/ngx_event_accept.c (from vendor/nginx-1.4.4/src/event/ngx_event_accept.c) vendor/nginx-1.4.7/src/event/ngx_event_busy_lock.c (from vendor/nginx-1.4.4/src/event/ngx_event_busy_lock.c) vendor/nginx-1.4.7/src/event/ngx_event_busy_lock.h (from vendor/nginx-1.4.4/src/event/ngx_event_busy_lock.h) vendor/nginx-1.4.7/src/event/ngx_event_connect.c (from vendor/nginx-1.4.4/src/event/ngx_event_connect.c) vendor/nginx-1.4.7/src/event/ngx_event_connect.h (from vendor/nginx-1.4.4/src/event/ngx_event_connect.h) vendor/nginx-1.4.7/src/event/ngx_event_mutex.c (from vendor/nginx-1.4.4/src/event/ngx_event_mutex.c) vendor/nginx-1.4.7/src/event/ngx_event_openssl.c (from vendor/nginx-1.4.4/src/event/ngx_event_openssl.c) vendor/nginx-1.4.7/src/event/ngx_event_openssl.h (from vendor/nginx-1.4.4/src/event/ngx_event_openssl.h) vendor/nginx-1.4.7/src/event/ngx_event_openssl_stapling.c (from vendor/nginx-1.4.4/src/event/ngx_event_openssl_stapling.c) vendor/nginx-1.4.7/src/event/ngx_event_pipe.c (from vendor/nginx-1.4.4/src/event/ngx_event_pipe.c) vendor/nginx-1.4.7/src/event/ngx_event_pipe.h (from vendor/nginx-1.4.4/src/event/ngx_event_pipe.h) vendor/nginx-1.4.7/src/event/ngx_event_posted.c (from vendor/nginx-1.4.4/src/event/ngx_event_posted.c) vendor/nginx-1.4.7/src/event/ngx_event_posted.h (from vendor/nginx-1.4.4/src/event/ngx_event_posted.h) vendor/nginx-1.4.7/src/event/ngx_event_timer.c (from vendor/nginx-1.4.4/src/event/ngx_event_timer.c) vendor/nginx-1.4.7/src/event/ngx_event_timer.h (from vendor/nginx-1.4.4/src/event/ngx_event_timer.h) vendor/nginx-1.4.7/src/http/modules/ngx_http_access_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_access_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_addition_filter_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_addition_filter_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_auth_basic_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_auth_basic_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_autoindex_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_autoindex_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_browser_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_browser_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_charset_filter_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_charset_filter_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_chunked_filter_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_chunked_filter_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_dav_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_dav_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_degradation_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_degradation_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_empty_gif_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_empty_gif_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_fastcgi_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_fastcgi_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_flv_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_flv_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_geo_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_geo_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_geoip_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_geoip_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_gunzip_filter_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_gunzip_filter_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_gzip_filter_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_gzip_filter_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_gzip_static_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_gzip_static_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_headers_filter_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_headers_filter_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_image_filter_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_image_filter_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_index_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_index_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_limit_conn_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_limit_conn_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_limit_req_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_limit_req_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_log_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_log_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_map_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_map_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_memcached_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_memcached_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_mp4_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_mp4_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_not_modified_filter_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_not_modified_filter_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_proxy_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_proxy_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_random_index_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_random_index_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_range_filter_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_range_filter_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_realip_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_realip_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_referer_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_referer_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_rewrite_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_rewrite_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_scgi_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_scgi_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_secure_link_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_secure_link_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_split_clients_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_split_clients_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_ssi_filter_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_ssi_filter_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_ssi_filter_module.h (from vendor/nginx-1.4.4/src/http/modules/ngx_http_ssi_filter_module.h) vendor/nginx-1.4.7/src/http/modules/ngx_http_ssl_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_ssl_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_ssl_module.h (from vendor/nginx-1.4.4/src/http/modules/ngx_http_ssl_module.h) vendor/nginx-1.4.7/src/http/modules/ngx_http_static_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_static_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_stub_status_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_stub_status_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_sub_filter_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_sub_filter_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_upstream_ip_hash_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_upstream_ip_hash_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_upstream_keepalive_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_upstream_keepalive_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_upstream_least_conn_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_upstream_least_conn_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_userid_filter_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_userid_filter_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_uwsgi_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_uwsgi_module.c) vendor/nginx-1.4.7/src/http/modules/ngx_http_xslt_filter_module.c (from vendor/nginx-1.4.4/src/http/modules/ngx_http_xslt_filter_module.c) vendor/nginx-1.4.7/src/http/modules/perl/Makefile.PL (from vendor/nginx-1.4.4/src/http/modules/perl/Makefile.PL) vendor/nginx-1.4.7/src/http/modules/perl/nginx.pm (from vendor/nginx-1.4.4/src/http/modules/perl/nginx.pm) vendor/nginx-1.4.7/src/http/modules/perl/nginx.xs (from vendor/nginx-1.4.4/src/http/modules/perl/nginx.xs) vendor/nginx-1.4.7/src/http/modules/perl/ngx_http_perl_module.c (from vendor/nginx-1.4.4/src/http/modules/perl/ngx_http_perl_module.c) vendor/nginx-1.4.7/src/http/modules/perl/ngx_http_perl_module.h (from vendor/nginx-1.4.4/src/http/modules/perl/ngx_http_perl_module.h) vendor/nginx-1.4.7/src/http/modules/perl/typemap (from vendor/nginx-1.4.4/src/http/modules/perl/typemap) vendor/nginx-1.4.7/src/http/ngx_http.c (from vendor/nginx-1.4.4/src/http/ngx_http.c) vendor/nginx-1.4.7/src/http/ngx_http.h (from vendor/nginx-1.4.4/src/http/ngx_http.h) vendor/nginx-1.4.7/src/http/ngx_http_busy_lock.c (from vendor/nginx-1.4.4/src/http/ngx_http_busy_lock.c) vendor/nginx-1.4.7/src/http/ngx_http_busy_lock.h (from vendor/nginx-1.4.4/src/http/ngx_http_busy_lock.h) vendor/nginx-1.4.7/src/http/ngx_http_cache.h (from vendor/nginx-1.4.4/src/http/ngx_http_cache.h) vendor/nginx-1.4.7/src/http/ngx_http_config.h (from vendor/nginx-1.4.4/src/http/ngx_http_config.h) vendor/nginx-1.4.7/src/http/ngx_http_copy_filter_module.c (from vendor/nginx-1.4.4/src/http/ngx_http_copy_filter_module.c) vendor/nginx-1.4.7/src/http/ngx_http_core_module.c (from vendor/nginx-1.4.4/src/http/ngx_http_core_module.c) vendor/nginx-1.4.7/src/http/ngx_http_core_module.h (from vendor/nginx-1.4.4/src/http/ngx_http_core_module.h) vendor/nginx-1.4.7/src/http/ngx_http_file_cache.c (from vendor/nginx-1.4.4/src/http/ngx_http_file_cache.c) vendor/nginx-1.4.7/src/http/ngx_http_header_filter_module.c (from vendor/nginx-1.4.4/src/http/ngx_http_header_filter_module.c) vendor/nginx-1.4.7/src/http/ngx_http_parse.c (from vendor/nginx-1.4.4/src/http/ngx_http_parse.c) vendor/nginx-1.4.7/src/http/ngx_http_parse_time.c (from vendor/nginx-1.4.4/src/http/ngx_http_parse_time.c) vendor/nginx-1.4.7/src/http/ngx_http_postpone_filter_module.c (from vendor/nginx-1.4.4/src/http/ngx_http_postpone_filter_module.c) vendor/nginx-1.4.7/src/http/ngx_http_request.c (from vendor/nginx-1.4.4/src/http/ngx_http_request.c) vendor/nginx-1.4.7/src/http/ngx_http_request.h (from vendor/nginx-1.4.4/src/http/ngx_http_request.h) vendor/nginx-1.4.7/src/http/ngx_http_request_body.c (from vendor/nginx-1.4.4/src/http/ngx_http_request_body.c) vendor/nginx-1.4.7/src/http/ngx_http_script.c (from vendor/nginx-1.4.4/src/http/ngx_http_script.c) vendor/nginx-1.4.7/src/http/ngx_http_script.h (from vendor/nginx-1.4.4/src/http/ngx_http_script.h) vendor/nginx-1.4.7/src/http/ngx_http_spdy.c (from vendor/nginx-1.4.4/src/http/ngx_http_spdy.c) vendor/nginx-1.4.7/src/http/ngx_http_spdy.h (from vendor/nginx-1.4.4/src/http/ngx_http_spdy.h) vendor/nginx-1.4.7/src/http/ngx_http_spdy_filter_module.c (from vendor/nginx-1.4.4/src/http/ngx_http_spdy_filter_module.c) vendor/nginx-1.4.7/src/http/ngx_http_spdy_module.c (from vendor/nginx-1.4.4/src/http/ngx_http_spdy_module.c) vendor/nginx-1.4.7/src/http/ngx_http_spdy_module.h (from vendor/nginx-1.4.4/src/http/ngx_http_spdy_module.h) vendor/nginx-1.4.7/src/http/ngx_http_special_response.c (from vendor/nginx-1.4.4/src/http/ngx_http_special_response.c) vendor/nginx-1.4.7/src/http/ngx_http_upstream.c (from vendor/nginx-1.4.4/src/http/ngx_http_upstream.c) vendor/nginx-1.4.7/src/http/ngx_http_upstream.h (from vendor/nginx-1.4.4/src/http/ngx_http_upstream.h) vendor/nginx-1.4.7/src/http/ngx_http_upstream_round_robin.c (from vendor/nginx-1.4.4/src/http/ngx_http_upstream_round_robin.c) vendor/nginx-1.4.7/src/http/ngx_http_upstream_round_robin.h (from vendor/nginx-1.4.4/src/http/ngx_http_upstream_round_robin.h) vendor/nginx-1.4.7/src/http/ngx_http_variables.c (from vendor/nginx-1.4.4/src/http/ngx_http_variables.c) vendor/nginx-1.4.7/src/http/ngx_http_variables.h (from vendor/nginx-1.4.4/src/http/ngx_http_variables.h) vendor/nginx-1.4.7/src/http/ngx_http_write_filter_module.c (from vendor/nginx-1.4.4/src/http/ngx_http_write_filter_module.c) vendor/nginx-1.4.7/src/mail/ngx_mail.c (from vendor/nginx-1.4.4/src/mail/ngx_mail.c) vendor/nginx-1.4.7/src/mail/ngx_mail.h (from vendor/nginx-1.4.4/src/mail/ngx_mail.h) vendor/nginx-1.4.7/src/mail/ngx_mail_auth_http_module.c (from vendor/nginx-1.4.4/src/mail/ngx_mail_auth_http_module.c) vendor/nginx-1.4.7/src/mail/ngx_mail_core_module.c (from vendor/nginx-1.4.4/src/mail/ngx_mail_core_module.c) vendor/nginx-1.4.7/src/mail/ngx_mail_handler.c (from vendor/nginx-1.4.4/src/mail/ngx_mail_handler.c) vendor/nginx-1.4.7/src/mail/ngx_mail_imap_handler.c (from vendor/nginx-1.4.4/src/mail/ngx_mail_imap_handler.c) vendor/nginx-1.4.7/src/mail/ngx_mail_imap_module.c (from vendor/nginx-1.4.4/src/mail/ngx_mail_imap_module.c) vendor/nginx-1.4.7/src/mail/ngx_mail_imap_module.h (from vendor/nginx-1.4.4/src/mail/ngx_mail_imap_module.h) vendor/nginx-1.4.7/src/mail/ngx_mail_parse.c (from vendor/nginx-1.4.4/src/mail/ngx_mail_parse.c) vendor/nginx-1.4.7/src/mail/ngx_mail_pop3_handler.c (from vendor/nginx-1.4.4/src/mail/ngx_mail_pop3_handler.c) vendor/nginx-1.4.7/src/mail/ngx_mail_pop3_module.c (from vendor/nginx-1.4.4/src/mail/ngx_mail_pop3_module.c) vendor/nginx-1.4.7/src/mail/ngx_mail_pop3_module.h (from vendor/nginx-1.4.4/src/mail/ngx_mail_pop3_module.h) vendor/nginx-1.4.7/src/mail/ngx_mail_proxy_module.c (from vendor/nginx-1.4.4/src/mail/ngx_mail_proxy_module.c) vendor/nginx-1.4.7/src/mail/ngx_mail_smtp_handler.c (from vendor/nginx-1.4.4/src/mail/ngx_mail_smtp_handler.c) vendor/nginx-1.4.7/src/mail/ngx_mail_smtp_module.c (from vendor/nginx-1.4.4/src/mail/ngx_mail_smtp_module.c) vendor/nginx-1.4.7/src/mail/ngx_mail_smtp_module.h (from vendor/nginx-1.4.4/src/mail/ngx_mail_smtp_module.h) vendor/nginx-1.4.7/src/mail/ngx_mail_ssl_module.c (from vendor/nginx-1.4.4/src/mail/ngx_mail_ssl_module.c) vendor/nginx-1.4.7/src/mail/ngx_mail_ssl_module.h (from vendor/nginx-1.4.4/src/mail/ngx_mail_ssl_module.h) vendor/nginx-1.4.7/src/misc/ngx_cpp_test_module.cpp (from vendor/nginx-1.4.4/src/misc/ngx_cpp_test_module.cpp) vendor/nginx-1.4.7/src/misc/ngx_google_perftools_module.c (from vendor/nginx-1.4.4/src/misc/ngx_google_perftools_module.c) vendor/nginx-1.4.7/src/os/unix/ngx_aio_read.c (from vendor/nginx-1.4.4/src/os/unix/ngx_aio_read.c) vendor/nginx-1.4.7/src/os/unix/ngx_aio_read_chain.c (from vendor/nginx-1.4.4/src/os/unix/ngx_aio_read_chain.c) vendor/nginx-1.4.7/src/os/unix/ngx_aio_write.c (from vendor/nginx-1.4.4/src/os/unix/ngx_aio_write.c) vendor/nginx-1.4.7/src/os/unix/ngx_aio_write_chain.c (from vendor/nginx-1.4.4/src/os/unix/ngx_aio_write_chain.c) vendor/nginx-1.4.7/src/os/unix/ngx_alloc.c (from vendor/nginx-1.4.4/src/os/unix/ngx_alloc.c) vendor/nginx-1.4.7/src/os/unix/ngx_alloc.h (from vendor/nginx-1.4.4/src/os/unix/ngx_alloc.h) vendor/nginx-1.4.7/src/os/unix/ngx_atomic.h (from vendor/nginx-1.4.4/src/os/unix/ngx_atomic.h) vendor/nginx-1.4.7/src/os/unix/ngx_channel.c (from vendor/nginx-1.4.4/src/os/unix/ngx_channel.c) vendor/nginx-1.4.7/src/os/unix/ngx_channel.h (from vendor/nginx-1.4.4/src/os/unix/ngx_channel.h) vendor/nginx-1.4.7/src/os/unix/ngx_daemon.c (from vendor/nginx-1.4.4/src/os/unix/ngx_daemon.c) vendor/nginx-1.4.7/src/os/unix/ngx_darwin.h (from vendor/nginx-1.4.4/src/os/unix/ngx_darwin.h) vendor/nginx-1.4.7/src/os/unix/ngx_darwin_config.h (from vendor/nginx-1.4.4/src/os/unix/ngx_darwin_config.h) vendor/nginx-1.4.7/src/os/unix/ngx_darwin_init.c (from vendor/nginx-1.4.4/src/os/unix/ngx_darwin_init.c) vendor/nginx-1.4.7/src/os/unix/ngx_darwin_sendfile_chain.c (from vendor/nginx-1.4.4/src/os/unix/ngx_darwin_sendfile_chain.c) vendor/nginx-1.4.7/src/os/unix/ngx_errno.c (from vendor/nginx-1.4.4/src/os/unix/ngx_errno.c) vendor/nginx-1.4.7/src/os/unix/ngx_errno.h (from vendor/nginx-1.4.4/src/os/unix/ngx_errno.h) vendor/nginx-1.4.7/src/os/unix/ngx_file_aio_read.c (from vendor/nginx-1.4.4/src/os/unix/ngx_file_aio_read.c) vendor/nginx-1.4.7/src/os/unix/ngx_files.c (from vendor/nginx-1.4.4/src/os/unix/ngx_files.c) vendor/nginx-1.4.7/src/os/unix/ngx_files.h (from vendor/nginx-1.4.4/src/os/unix/ngx_files.h) vendor/nginx-1.4.7/src/os/unix/ngx_freebsd.h (from vendor/nginx-1.4.4/src/os/unix/ngx_freebsd.h) vendor/nginx-1.4.7/src/os/unix/ngx_freebsd_config.h (from vendor/nginx-1.4.4/src/os/unix/ngx_freebsd_config.h) vendor/nginx-1.4.7/src/os/unix/ngx_freebsd_init.c (from vendor/nginx-1.4.4/src/os/unix/ngx_freebsd_init.c) vendor/nginx-1.4.7/src/os/unix/ngx_freebsd_rfork_thread.c (from vendor/nginx-1.4.4/src/os/unix/ngx_freebsd_rfork_thread.c) vendor/nginx-1.4.7/src/os/unix/ngx_freebsd_rfork_thread.h (from vendor/nginx-1.4.4/src/os/unix/ngx_freebsd_rfork_thread.h) vendor/nginx-1.4.7/src/os/unix/ngx_freebsd_sendfile_chain.c (from vendor/nginx-1.4.4/src/os/unix/ngx_freebsd_sendfile_chain.c) vendor/nginx-1.4.7/src/os/unix/ngx_gcc_atomic_amd64.h (from vendor/nginx-1.4.4/src/os/unix/ngx_gcc_atomic_amd64.h) vendor/nginx-1.4.7/src/os/unix/ngx_gcc_atomic_ppc.h (from vendor/nginx-1.4.4/src/os/unix/ngx_gcc_atomic_ppc.h) vendor/nginx-1.4.7/src/os/unix/ngx_gcc_atomic_sparc64.h (from vendor/nginx-1.4.4/src/os/unix/ngx_gcc_atomic_sparc64.h) vendor/nginx-1.4.7/src/os/unix/ngx_gcc_atomic_x86.h (from vendor/nginx-1.4.4/src/os/unix/ngx_gcc_atomic_x86.h) vendor/nginx-1.4.7/src/os/unix/ngx_linux.h (from vendor/nginx-1.4.4/src/os/unix/ngx_linux.h) vendor/nginx-1.4.7/src/os/unix/ngx_linux_aio_read.c (from vendor/nginx-1.4.4/src/os/unix/ngx_linux_aio_read.c) vendor/nginx-1.4.7/src/os/unix/ngx_linux_config.h (from vendor/nginx-1.4.4/src/os/unix/ngx_linux_config.h) vendor/nginx-1.4.7/src/os/unix/ngx_linux_init.c (from vendor/nginx-1.4.4/src/os/unix/ngx_linux_init.c) vendor/nginx-1.4.7/src/os/unix/ngx_linux_sendfile_chain.c (from vendor/nginx-1.4.4/src/os/unix/ngx_linux_sendfile_chain.c) vendor/nginx-1.4.7/src/os/unix/ngx_os.h (from vendor/nginx-1.4.4/src/os/unix/ngx_os.h) vendor/nginx-1.4.7/src/os/unix/ngx_posix_config.h (from vendor/nginx-1.4.4/src/os/unix/ngx_posix_config.h) vendor/nginx-1.4.7/src/os/unix/ngx_posix_init.c (from vendor/nginx-1.4.4/src/os/unix/ngx_posix_init.c) vendor/nginx-1.4.7/src/os/unix/ngx_process.c (from vendor/nginx-1.4.4/src/os/unix/ngx_process.c) vendor/nginx-1.4.7/src/os/unix/ngx_process.h (from vendor/nginx-1.4.4/src/os/unix/ngx_process.h) vendor/nginx-1.4.7/src/os/unix/ngx_process_cycle.c (from vendor/nginx-1.4.4/src/os/unix/ngx_process_cycle.c) vendor/nginx-1.4.7/src/os/unix/ngx_process_cycle.h (from vendor/nginx-1.4.4/src/os/unix/ngx_process_cycle.h) vendor/nginx-1.4.7/src/os/unix/ngx_pthread_thread.c (from vendor/nginx-1.4.4/src/os/unix/ngx_pthread_thread.c) vendor/nginx-1.4.7/src/os/unix/ngx_readv_chain.c (from vendor/nginx-1.4.4/src/os/unix/ngx_readv_chain.c) vendor/nginx-1.4.7/src/os/unix/ngx_recv.c (from vendor/nginx-1.4.4/src/os/unix/ngx_recv.c) vendor/nginx-1.4.7/src/os/unix/ngx_send.c (from vendor/nginx-1.4.4/src/os/unix/ngx_send.c) vendor/nginx-1.4.7/src/os/unix/ngx_setaffinity.c (from vendor/nginx-1.4.4/src/os/unix/ngx_setaffinity.c) vendor/nginx-1.4.7/src/os/unix/ngx_setaffinity.h (from vendor/nginx-1.4.4/src/os/unix/ngx_setaffinity.h) vendor/nginx-1.4.7/src/os/unix/ngx_setproctitle.c (from vendor/nginx-1.4.4/src/os/unix/ngx_setproctitle.c) vendor/nginx-1.4.7/src/os/unix/ngx_setproctitle.h (from vendor/nginx-1.4.4/src/os/unix/ngx_setproctitle.h) vendor/nginx-1.4.7/src/os/unix/ngx_shmem.c (from vendor/nginx-1.4.4/src/os/unix/ngx_shmem.c) vendor/nginx-1.4.7/src/os/unix/ngx_shmem.h (from vendor/nginx-1.4.4/src/os/unix/ngx_shmem.h) vendor/nginx-1.4.7/src/os/unix/ngx_socket.c (from vendor/nginx-1.4.4/src/os/unix/ngx_socket.c) vendor/nginx-1.4.7/src/os/unix/ngx_socket.h (from vendor/nginx-1.4.4/src/os/unix/ngx_socket.h) vendor/nginx-1.4.7/src/os/unix/ngx_solaris.h (from vendor/nginx-1.4.4/src/os/unix/ngx_solaris.h) vendor/nginx-1.4.7/src/os/unix/ngx_solaris_config.h (from vendor/nginx-1.4.4/src/os/unix/ngx_solaris_config.h) vendor/nginx-1.4.7/src/os/unix/ngx_solaris_init.c (from vendor/nginx-1.4.4/src/os/unix/ngx_solaris_init.c) vendor/nginx-1.4.7/src/os/unix/ngx_solaris_sendfilev_chain.c (from vendor/nginx-1.4.4/src/os/unix/ngx_solaris_sendfilev_chain.c) vendor/nginx-1.4.7/src/os/unix/ngx_sunpro_amd64.il (from vendor/nginx-1.4.4/src/os/unix/ngx_sunpro_amd64.il) vendor/nginx-1.4.7/src/os/unix/ngx_sunpro_atomic_sparc64.h (from vendor/nginx-1.4.4/src/os/unix/ngx_sunpro_atomic_sparc64.h) vendor/nginx-1.4.7/src/os/unix/ngx_sunpro_sparc64.il (from vendor/nginx-1.4.4/src/os/unix/ngx_sunpro_sparc64.il) vendor/nginx-1.4.7/src/os/unix/ngx_sunpro_x86.il (from vendor/nginx-1.4.4/src/os/unix/ngx_sunpro_x86.il) vendor/nginx-1.4.7/src/os/unix/ngx_thread.h (from vendor/nginx-1.4.4/src/os/unix/ngx_thread.h) vendor/nginx-1.4.7/src/os/unix/ngx_time.c (from vendor/nginx-1.4.4/src/os/unix/ngx_time.c) vendor/nginx-1.4.7/src/os/unix/ngx_time.h (from vendor/nginx-1.4.4/src/os/unix/ngx_time.h) vendor/nginx-1.4.7/src/os/unix/ngx_udp_recv.c (from vendor/nginx-1.4.4/src/os/unix/ngx_udp_recv.c) vendor/nginx-1.4.7/src/os/unix/ngx_user.c (from vendor/nginx-1.4.4/src/os/unix/ngx_user.c) vendor/nginx-1.4.7/src/os/unix/ngx_user.h (from vendor/nginx-1.4.4/src/os/unix/ngx_user.h) vendor/nginx-1.4.7/src/os/unix/ngx_writev_chain.c (from vendor/nginx-1.4.4/src/os/unix/ngx_writev_chain.c) vendor/nginx-1.4.7/src/os/unix/rfork_thread.S (from vendor/nginx-1.4.4/src/os/unix/rfork_thread.S) Modified: nginx_version (+1 -1) =================================================================== --- nginx_version 2014-03-26 00:11:33 +0900 (1c99cf0) +++ nginx_version 2014-03-26 11:37:10 +0900 (be05bba) @@ -1 +1 @@ -1.4.4 +1.4.7 Renamed: vendor/nginx-1.4.7/CHANGES (+48 -0) 99% =================================================================== --- vendor/nginx-1.4.4/CHANGES 2014-03-26 00:11:33 +0900 (4899a6d) +++ vendor/nginx-1.4.7/CHANGES 2014-03-26 11:37:10 +0900 (4d9e62a) @@ -1,4 +1,52 @@ +Changes with nginx 1.4.7 18 Mar 2014 + + *) Security: a heap memory buffer overflow might occur in a worker + process while handling a specially crafted request by + ngx_http_spdy_module, potentially resulting in arbitrary code + execution (CVE-2014-0133). + Thanks to Lucas Molas, researcher at Programa STIC, Fundación Dr. + Manuel Sadosky, Buenos Aires, Argentina. + + *) Bugfix: in the "fastcgi_next_upstream" directive. + Thanks to Lucas Molas. + + +Changes with nginx 1.4.6 04 Mar 2014 + + *) Bugfix: the "client_max_body_size" directive might not work when + reading a request body using chunked transfer encoding; the bug had + appeared in 1.3.9. + Thanks to Lucas Molas. + + *) Bugfix: a segmentation fault might occur in a worker process when + proxying WebSocket connections. + + +Changes with nginx 1.4.5 11 Feb 2014 + + *) Bugfix: the $ssl_session_id variable contained full session + serialized instead of just a session id. + Thanks to Ivan Ristić. + + *) Bugfix: client connections might be immediately closed if deferred + accept was used; the bug had appeared in 1.3.15. + + *) Bugfix: alerts "zero size buf in output" might appear in logs while + proxying; the bug had appeared in 1.3.9. + + *) Bugfix: a segmentation fault might occur in a worker process if the + ngx_http_spdy_module was used. + + *) Bugfix: proxied WebSocket connections might hang right after + handshake if the select, poll, or /dev/poll methods were used. + + *) Bugfix: a timeout might occur while reading client request body in an + SSL connection using chunked transfer encoding. + + *) Bugfix: memory leak in nginx/Windows. + + Changes with nginx 1.4.4 19 Nov 2013 *) Security: a character following an unescaped space in a request line Renamed: vendor/nginx-1.4.7/CHANGES.ru (+49 -0) 99% =================================================================== --- vendor/nginx-1.4.4/CHANGES.ru 2014-03-26 00:11:33 +0900 (2e12f09) +++ vendor/nginx-1.4.7/CHANGES.ru 2014-03-26 11:37:10 +0900 (2f9f301) @@ -1,4 +1,53 @@ +Изменения в nginx 1.4.7 18.03.2014 + + *) Безопасность: при обработке специально созданного запроса модулем + ngx_http_spdy_module могло происходить переполнение буфера в рабочем + процессе, что потенциально могло приводить к выполнению произвольного + кода (CVE-2014-0133). + Спасибо Lucas Molas из Programa STIC, Fundación Dr. Manuel Sadosky, + Buenos Aires, Argentina. + + *) Исправление: в директиве fastcgi_next_upstream. + Спасибо Lucas Molas. + + +Изменения в nginx 1.4.6 04.03.2014 + + *) Исправление: директива client_max_body_size могла не работать при + чтении тела запроса с использованием chunked transfer encoding; + ошибка появилась в 1.3.9. + Спасибо Lucas Molas. + + *) Исправление: при проксировании WebSocket-соединений в рабочем + процессе мог произойти segmentation fault. + + +Изменения в nginx 1.4.5 11.02.2014 + + *) Исправление: переменная $ssl_session_id содержала всю сессию в + сериализованном виде вместо её идентификатора. + Спасибо Ivan Ristić. + + *) Исправление: клиентские соединения могли сразу закрываться, если + использовался отложенный accept; ошибка появилась в 1.3.15. + + *) Исправление: при проксировании в логах могли появляться сообщения + "zero size buf in output"; ошибка появилась в 1.3.9. + + *) Исправление: в рабочем процессе мог произойти segmentation fault, + если использовался модуль ngx_http_spdy_module. + + *) Исправление: при использовании методов обработки соединений select, + poll и /dev/poll проксируемые WebSocket-соединения могли зависать + сразу после открытия. + + *) Исправление: при чтении тела запроса с использованием chunked + transfer encoding по SSL-соединению мог произойти таймаут. + + *) Исправление: утечки памяти в nginx/Windows. + + Изменения в nginx 1.4.4 19.11.2013 *) Безопасность: символ, следующий за незакодированным пробелом в строке Renamed: vendor/nginx-1.4.7/LICENSE (+2 -2) 94% =================================================================== --- vendor/nginx-1.4.4/LICENSE 2014-03-26 00:11:33 +0900 (5d80970) +++ vendor/nginx-1.4.7/LICENSE 2014-03-26 11:37:10 +0900 (4ed7a6f) @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2013 Igor Sysoev - * Copyright (C) 2011-2013 Nginx, Inc. + * Copyright (C) 2002-2014 Igor Sysoev + * Copyright (C) 2011-2014 Nginx, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without Renamed: vendor/nginx-1.4.7/README (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/cc/acc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/cc/bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/cc/ccc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/cc/clang (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/cc/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/cc/gcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/cc/icc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/cc/msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/cc/name (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/cc/owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/cc/sunc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/define (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/endianness (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/feature (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/have (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/have_headers (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/headers (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/include (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/init (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/install (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/lib/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/lib/geoip/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/lib/google-perftools/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/lib/libatomic/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/lib/libatomic/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/lib/libgd/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/lib/libxslt/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/lib/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/lib/md5/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/lib/md5/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/lib/md5/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/lib/md5/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/lib/md5/makefile.owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/lib/openssl/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/lib/openssl/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/lib/openssl/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/lib/openssl/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/lib/pcre/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/lib/pcre/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/lib/pcre/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/lib/pcre/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/lib/pcre/makefile.owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/lib/perl/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/lib/perl/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/lib/sha1/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/lib/sha1/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/lib/sha1/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/lib/sha1/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/lib/sha1/makefile.owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/lib/test (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/lib/zlib/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/lib/zlib/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/lib/zlib/makefile.bcc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/lib/zlib/makefile.msvc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/lib/zlib/makefile.owc (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/lib/zlib/patch.zlib.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/make (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/modules (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/nohave (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/options (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/os/conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/os/darwin (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/os/freebsd (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/os/linux (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/os/solaris (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/os/win32 (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/sources (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/stubs (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/summary (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/types/sizeof (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/types/typedef (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/types/uintptr_t (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/types/value (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/auto/unix (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/conf/fastcgi.conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/conf/fastcgi_params (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/conf/koi-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/conf/koi-win (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/conf/mime.types (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/conf/nginx.conf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/conf/scgi_params (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/conf/uwsgi_params (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/conf/win-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/configure (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/contrib/README (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/contrib/geo2nginx.pl (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/contrib/unicode2nginx/koi-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/contrib/unicode2nginx/unicode-to-nginx.pl (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/contrib/unicode2nginx/win-utf (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/html/50x.html (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/html/index.html (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/man/nginx.8 (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/nginx.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/nginx.h (+2 -2) 80% =================================================================== --- vendor/nginx-1.4.4/src/core/nginx.h 2014-03-26 00:11:33 +0900 (609bdaa) +++ vendor/nginx-1.4.7/src/core/nginx.h 2014-03-26 11:37:10 +0900 (77c88bf) @@ -9,8 +9,8 @@ #define _NGINX_H_INCLUDED_ -#define nginx_version 1004004 -#define NGINX_VERSION "1.4.4" +#define nginx_version 1004007 +#define NGINX_VERSION "1.4.7" #define NGINX_VER "nginx/" NGINX_VERSION #define NGINX_VAR "NGINX" Renamed: vendor/nginx-1.4.7/src/core/ngx_array.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_array.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_buf.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_buf.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_conf_file.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_conf_file.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_connection.c (+7 -1) 98% =================================================================== --- vendor/nginx-1.4.4/src/core/ngx_connection.c 2014-03-26 00:11:33 +0900 (7ed781e) +++ vendor/nginx-1.4.7/src/core/ngx_connection.c 2014-03-26 11:37:10 +0900 (986bf0d) @@ -647,7 +647,13 @@ ngx_configure_listening_sockets(ngx_cycle_t *cycle) if (ls[i].add_deferred || ls[i].delete_deferred) { if (ls[i].add_deferred) { - timeout = (int) (ls[i].post_accept_timeout / 1000); + /* + * There is no way to find out how long a connection was + * in queue (and a connection may bypass deferred queue at all + * if syncookies were used), hence we use 1 second timeout + * here. + */ + timeout = 1; } else { timeout = 0; Renamed: vendor/nginx-1.4.7/src/core/ngx_connection.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_core.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_cpuinfo.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_crc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_crc32.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_crc32.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_crypt.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_crypt.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_cycle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_cycle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_file.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_file.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_hash.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_hash.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_inet.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_inet.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_list.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_list.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_log.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_log.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_md5.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_md5.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_murmurhash.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_murmurhash.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_open_file_cache.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_open_file_cache.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_output_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_palloc.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_palloc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_parse.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_parse.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_queue.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_queue.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_radix_tree.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_radix_tree.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_rbtree.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_rbtree.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_regex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_regex.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_resolver.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_resolver.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_sha1.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_shmtx.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_shmtx.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_slab.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_slab.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_spinlock.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_string.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_string.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_times.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/core/ngx_times.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/event/modules/ngx_aio_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/event/modules/ngx_devpoll_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/event/modules/ngx_epoll_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/event/modules/ngx_eventport_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/event/modules/ngx_kqueue_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/event/modules/ngx_poll_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/event/modules/ngx_rtsig_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/event/modules/ngx_select_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/event/modules/ngx_win32_select_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/event/ngx_event.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/event/ngx_event.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/event/ngx_event_accept.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/event/ngx_event_busy_lock.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/event/ngx_event_busy_lock.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/event/ngx_event_connect.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/event/ngx_event_connect.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/event/ngx_event_mutex.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/event/ngx_event_openssl.c (+12 -13) 99% =================================================================== --- vendor/nginx-1.4.4/src/event/ngx_event_openssl.c 2014-03-26 00:11:33 +0900 (62ce12c) +++ vendor/nginx-1.4.7/src/event/ngx_event_openssl.c 2014-03-26 11:37:10 +0900 (915e604) @@ -965,6 +965,7 @@ ngx_ssl_recv(ngx_connection_t *c, u_char *buf, size_t size) size -= n; if (size == 0) { + c->read->ready = 1; return bytes; } @@ -974,6 +975,10 @@ ngx_ssl_recv(ngx_connection_t *c, u_char *buf, size_t size) } if (bytes) { + if (c->ssl->last != NGX_AGAIN) { + c->read->ready = 1; + } + return bytes; } @@ -2224,32 +2229,26 @@ ngx_int_t ngx_ssl_get_session_id(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s) { int len; - u_char *p, *buf; + u_char *buf; SSL_SESSION *sess; sess = SSL_get0_session(c->ssl->connection); - - len = i2d_SSL_SESSION(sess, NULL); - - buf = ngx_alloc(len, c->log); - if (buf == NULL) { - return NGX_ERROR; + if (sess == NULL) { + s->len = 0; + return NGX_OK; } + buf = sess->session_id; + len = sess->session_id_length; + s->len = 2 * len; s->data = ngx_pnalloc(pool, 2 * len); if (s->data == NULL) { - ngx_free(buf); return NGX_ERROR; } - p = buf; - i2d_SSL_SESSION(sess, &p); - ngx_hex_dump(s->data, buf, len); - ngx_free(buf); - return NGX_OK; } Renamed: vendor/nginx-1.4.7/src/event/ngx_event_openssl.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/event/ngx_event_openssl_stapling.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/event/ngx_event_pipe.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/event/ngx_event_pipe.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/event/ngx_event_posted.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/event/ngx_event_posted.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/event/ngx_event_timer.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/event/ngx_event_timer.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_access_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_addition_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_auth_basic_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_autoindex_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_browser_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_charset_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_chunked_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_dav_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_degradation_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_empty_gif_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_fastcgi_module.c (+11 -0) 99% =================================================================== --- vendor/nginx-1.4.4/src/http/modules/ngx_http_fastcgi_module.c 2014-03-26 00:11:33 +0900 (f386926) +++ vendor/nginx-1.4.7/src/http/modules/ngx_http_fastcgi_module.c 2014-03-26 11:37:10 +0900 (e2427b4) @@ -1195,6 +1195,10 @@ ngx_http_fastcgi_reinit_request(ngx_http_request_t *r) f->fastcgi_stdout = 0; f->large_stderr = 0; + if (f->split_parts) { + f->split_parts->nelts = 0; + } + r->state = 0; return NGX_OK; @@ -1475,6 +1479,13 @@ ngx_http_fastcgi_process_header(ngx_http_request_t *r) rc = ngx_http_parse_header_line(r, &buf, 1); + if (rc != NGX_OK) { + ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0, + "invalid header after joining " + "FastCGI records"); + return NGX_ERROR; + } + h->key.len = r->header_name_end - r->header_name_start; h->key.data = r->header_name_start; h->key.data[h->key.len] = '\0'; Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_flv_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_geo_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_geoip_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_gunzip_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_gzip_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_gzip_static_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_headers_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_image_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_index_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_limit_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_limit_req_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_log_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_map_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_memcached_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_mp4_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_not_modified_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_proxy_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_random_index_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_range_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_realip_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_referer_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_rewrite_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_scgi_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_secure_link_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_split_clients_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_ssi_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_ssi_filter_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_ssl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_ssl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_static_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_stub_status_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_sub_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_upstream_ip_hash_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_upstream_keepalive_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_upstream_least_conn_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_userid_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_uwsgi_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/ngx_http_xslt_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/perl/Makefile.PL (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/perl/nginx.pm (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/perl/nginx.xs (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/perl/ngx_http_perl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/perl/ngx_http_perl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/modules/perl/typemap (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/ngx_http.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/ngx_http.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/ngx_http_busy_lock.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/ngx_http_busy_lock.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/ngx_http_cache.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/ngx_http_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/ngx_http_copy_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/ngx_http_core_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/ngx_http_core_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/ngx_http_file_cache.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/ngx_http_header_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/ngx_http_parse.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/ngx_http_parse_time.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/ngx_http_postpone_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/ngx_http_request.c (+0 -23) 99% =================================================================== --- vendor/nginx-1.4.4/src/http/ngx_http_request.c 2014-03-26 00:11:33 +0900 (c8c5d15) +++ vendor/nginx-1.4.7/src/http/ngx_http_request.c 2014-03-26 11:37:10 +0900 (1be2d46) @@ -423,20 +423,6 @@ ngx_http_wait_request_handler(ngx_event_t *rev) if (n == NGX_AGAIN) { -#if (NGX_HAVE_DEFERRED_ACCEPT && defined TCP_DEFER_ACCEPT) - if (c->listening->deferred_accept -#if (NGX_HTTP_SSL) - && c->ssl == NULL -#endif - ) - { - ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, - "client timed out in deferred accept"); - ngx_http_close_connection(c); - return; - } -#endif - if (!rev->timer_set) { ngx_add_timer(rev, c->listening->post_accept_timeout); ngx_reusable_connection(c, 1); @@ -635,15 +621,6 @@ ngx_http_ssl_handshake(ngx_event_t *rev) if (n == -1) { if (err == NGX_EAGAIN) { -#if (NGX_HAVE_DEFERRED_ACCEPT && defined TCP_DEFER_ACCEPT) - if (c->listening->deferred_accept) { - ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, - "client timed out in deferred accept"); - ngx_http_close_connection(c); - return; - } -#endif - if (!rev->timer_set) { ngx_add_timer(rev, c->listening->post_accept_timeout); ngx_reusable_connection(c, 1); Renamed: vendor/nginx-1.4.7/src/http/ngx_http_request.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/ngx_http_request_body.c (+41 -24) 96% =================================================================== --- vendor/nginx-1.4.4/src/http/ngx_http_request_body.c 2014-03-26 00:11:33 +0900 (2c61231) +++ vendor/nginx-1.4.7/src/http/ngx_http_request_body.c 2014-03-26 11:37:10 +0900 (e9cf3e9) @@ -150,20 +150,27 @@ ngx_http_read_client_request_body(ngx_http_request_t *r, goto done; } - cl = ngx_chain_get_free_buf(r->pool, &rb->free); - if (cl == NULL) { - return NGX_HTTP_INTERNAL_SERVER_ERROR; - } + if (rb->temp_file->file.offset != 0) { - b = cl->buf; + cl = ngx_chain_get_free_buf(r->pool, &rb->free); + if (cl == NULL) { + rc = NGX_HTTP_INTERNAL_SERVER_ERROR; + goto done; + } - ngx_memzero(b, sizeof(ngx_buf_t)); + b = cl->buf; - b->in_file = 1; - b->file_last = rb->temp_file->file.offset; - b->file = &rb->temp_file->file; + ngx_memzero(b, sizeof(ngx_buf_t)); - rb->bufs = cl; + b->in_file = 1; + b->file_last = rb->temp_file->file.offset; + b->file = &rb->temp_file->file; + + rb->bufs = cl; + + } else { + rb->bufs = NULL; + } } post_handler(r); @@ -374,20 +381,26 @@ ngx_http_do_read_client_request_body(ngx_http_request_t *r) return NGX_HTTP_INTERNAL_SERVER_ERROR; } - cl = ngx_chain_get_free_buf(r->pool, &rb->free); - if (cl == NULL) { - return NGX_HTTP_INTERNAL_SERVER_ERROR; - } + if (rb->temp_file->file.offset != 0) { + + cl = ngx_chain_get_free_buf(r->pool, &rb->free); + if (cl == NULL) { + return NGX_HTTP_INTERNAL_SERVER_ERROR; + } - b = cl->buf; + b = cl->buf; - ngx_memzero(b, sizeof(ngx_buf_t)); + ngx_memzero(b, sizeof(ngx_buf_t)); + + b->in_file = 1; + b->file_last = rb->temp_file->file.offset; + b->file = &rb->temp_file->file; - b->in_file = 1; - b->file_last = rb->temp_file->file.offset; - b->file = &rb->temp_file->file; + rb->bufs = cl; - rb->bufs = cl; + } else { + rb->bufs = NULL; + } } r->read_event_handler = ngx_http_block_reading; @@ -842,6 +855,10 @@ ngx_http_request_body_length_filter(ngx_http_request_t *r, ngx_chain_t *in) for (cl = in; cl; cl = cl->next) { + if (rb->rest == 0) { + break; + } + tl = ngx_chain_get_free_buf(r->pool, &rb->free); if (tl == NULL) { return NGX_HTTP_INTERNAL_SERVER_ERROR; @@ -936,13 +953,13 @@ ngx_http_request_body_chunked_filter(ngx_http_request_t *r, ngx_chain_t *in) if (clcf->client_max_body_size && clcf->client_max_body_size - < r->headers_in.content_length_n + rb->chunked->size) + - r->headers_in.content_length_n < rb->chunked->size) { ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "client intended to send too large chunked " - "body: %O bytes", - r->headers_in.content_length_n - + rb->chunked->size); + "body: %O+%O bytes", + r->headers_in.content_length_n, + rb->chunked->size); r->lingering_close = 1; Renamed: vendor/nginx-1.4.7/src/http/ngx_http_script.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/ngx_http_script.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/ngx_http_spdy.c (+5 -1) 99% =================================================================== --- vendor/nginx-1.4.4/src/http/ngx_http_spdy.c 2014-03-26 00:11:33 +0900 (7c93dc4) +++ vendor/nginx-1.4.7/src/http/ngx_http_spdy.c 2014-03-26 11:37:10 +0900 (99afbfc) @@ -1465,7 +1465,7 @@ static u_char * ngx_http_spdy_state_save(ngx_http_spdy_connection_t *sc, u_char *pos, u_char *end, ngx_http_spdy_handler_pt handler) { -#if (NGX_DEBUG) +#if 1 if (end - pos > NGX_SPDY_STATE_BUFFER_SIZE) { ngx_log_error(NGX_LOG_ALERT, sc->connection->log, 0, "spdy state buffer overflow: " @@ -2626,6 +2626,10 @@ ngx_http_spdy_close_stream(ngx_http_spdy_stream_t *stream, ngx_int_t rc) } } + if (sc->stream == stream) { + sc->stream = NULL; + } + sscf = ngx_http_get_module_srv_conf(sc->http_connection->conf_ctx, ngx_http_spdy_module); Renamed: vendor/nginx-1.4.7/src/http/ngx_http_spdy.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/ngx_http_spdy_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/ngx_http_spdy_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/ngx_http_spdy_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/ngx_http_special_response.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/ngx_http_upstream.c (+3 -5) 99% =================================================================== --- vendor/nginx-1.4.4/src/http/ngx_http_upstream.c 2014-03-26 00:11:33 +0900 (45e2eb7) +++ vendor/nginx-1.4.7/src/http/ngx_http_upstream.c 2014-03-26 11:37:10 +0900 (d99d854) @@ -2456,14 +2456,12 @@ ngx_http_upstream_upgrade(ngx_http_request_t *r, ngx_http_upstream_t *u) if (u->peer.connection->read->ready || u->buffer.pos != u->buffer.last) { + ngx_post_event(c->read, &ngx_posted_events); ngx_http_upstream_process_upgraded(r, 1, 1); + return; } - if (c->read->ready - || r->header_in->pos != r->header_in->last) - { - ngx_http_upstream_process_upgraded(r, 0, 1); - } + ngx_http_upstream_process_upgraded(r, 0, 1); } Renamed: vendor/nginx-1.4.7/src/http/ngx_http_upstream.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/ngx_http_upstream_round_robin.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/ngx_http_upstream_round_robin.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/ngx_http_variables.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/ngx_http_variables.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/http/ngx_http_write_filter_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/mail/ngx_mail.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/mail/ngx_mail.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/mail/ngx_mail_auth_http_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/mail/ngx_mail_core_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/mail/ngx_mail_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/mail/ngx_mail_imap_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/mail/ngx_mail_imap_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/mail/ngx_mail_imap_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/mail/ngx_mail_parse.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/mail/ngx_mail_pop3_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/mail/ngx_mail_pop3_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/mail/ngx_mail_pop3_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/mail/ngx_mail_proxy_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/mail/ngx_mail_smtp_handler.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/mail/ngx_mail_smtp_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/mail/ngx_mail_smtp_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/mail/ngx_mail_ssl_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/mail/ngx_mail_ssl_module.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/misc/ngx_cpp_test_module.cpp (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/misc/ngx_google_perftools_module.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_aio_read.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_aio_read_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_aio_write.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_aio_write_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_alloc.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_alloc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_atomic.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_channel.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_channel.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_daemon.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_darwin.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_darwin_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_darwin_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_darwin_sendfile_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_errno.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_errno.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_file_aio_read.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_files.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_files.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_freebsd.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_freebsd_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_freebsd_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_freebsd_rfork_thread.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_freebsd_rfork_thread.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_freebsd_sendfile_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_gcc_atomic_amd64.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_gcc_atomic_ppc.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_gcc_atomic_sparc64.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_gcc_atomic_x86.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_linux.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_linux_aio_read.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_linux_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_linux_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_linux_sendfile_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_os.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_posix_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_posix_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_process.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_process.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_process_cycle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_process_cycle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_pthread_thread.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_readv_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_recv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_send.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_setaffinity.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_setaffinity.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_setproctitle.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_setproctitle.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_shmem.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_shmem.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_socket.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_socket.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_solaris.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_solaris_config.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_solaris_init.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_solaris_sendfilev_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_sunpro_amd64.il (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_sunpro_atomic_sparc64.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_sunpro_sparc64.il (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_sunpro_x86.il (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_thread.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_time.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_time.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_udp_recv.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_user.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_user.h (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/ngx_writev_chain.c (+0 -0) 100% =================================================================== Renamed: vendor/nginx-1.4.7/src/os/unix/rfork_thread.S (+0 -0) 100% ===================================================================
