Public Git Hosting - nginx-catap.git/commit

commit	e95fb9f6ebb1bc713bf627646038e293cfdfdfca
author	Kirill A. Korinskiy <catap@catap.ru>
	Fri, 11 Jun 2010 12:06:00 +0000 (11 16:06 +0400)
committer	Kirill A. Korinskiy <catap@catap.ru>
	Fri, 11 Jun 2010 12:06:00 +0000 (11 16:06 +0400)
tree	8b4e0196b3bd17418791259d20e9fb3352f57486	tree \| snapshot (tar.gz zip)
parent	c8487ec46c560f542b3f1a1a6433cafb241eca09	commit \| diff
parent	5fb026078a6e930bea88470a9f3ec73190a4b9f2	commit \| diff

Merge commit 'v0.8.40'

Conflicts:
CHANGES
CHANGES.ru
src/core/nginx.h
src/http/modules/ngx_http_ssi_filter_module.c
src/http/modules/perl/nginx.pm

35 files changed:

CHANGES	diff1 \|	diff2 \|	blob \| history
CHANGES.ru	diff1 \|	diff2 \|	blob \| history
auto/modules	diff1 \|	diff2 \|	blob \| history
auto/options	diff1 \|	diff2 \|	blob \| history
auto/sources	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
src/core/nginx.c	diff1 \|	diff2 \|	blob \| history
src/core/nginx.h	diff1 \|	diff2 \|	blob \| history
src/core/ngx_log.c	diff1 \|	diff2 \|	blob \| history
src/core/ngx_times.c	diff1 \|	diff2 \|	blob \| history
src/event/modules/ngx_select_module.c	diff1 \|	diff2 \|	blob \| history
src/event/ngx_event.c	diff1 \|	diff2 \|	blob \| history
src/http/modules/ngx_http_auth_basic_module.c	diff1 \|	diff2 \|	blob \| history
src/http/modules/ngx_http_empty_gif_module.c	diff1 \|	diff2 \|	blob \| history
src/http/modules/ngx_http_flv_module.c	diff1 \|	diff2 \|	blob \| history
src/http/modules/ngx_http_gzip_static_module.c	diff1 \|	diff2 \|	blob \| history
src/http/modules/ngx_http_range_filter_module.c	diff1 \|	diff2 \|	blob \| history
src/http/modules/ngx_http_rewrite_module.c	diff1 \|	diff2 \|	blob \| history
src/http/modules/ngx_http_ssi_filter_module.c	diff1 \|	diff2 \|	blob \| history
src/http/modules/ngx_http_static_module.c	diff1 \|	diff2 \|	blob \| history
src/http/modules/ngx_http_stub_status_module.c	diff1 \|	diff2 \|	blob \| history
src/http/modules/ngx_http_userid_filter_module.c	diff1 \|	diff2 \|	blob \| history
src/http/modules/ngx_http_xslt_filter_module.c	diff1 \|	diff2 \|	blob \| history
src/http/modules/perl/nginx.pm	diff1 \|	diff2 \|	blob \| history
src/http/ngx_http_core_module.c	diff1 \|	diff2 \|	blob \| history
src/http/ngx_http_core_module.h	diff1 \|	diff2 \|	blob \| history
src/http/ngx_http_header_filter_module.c	diff1 \|	diff2 \|	blob \| history
src/http/ngx_http_request.c	diff1 \|	diff2 \|	blob \| history
src/http/ngx_http_request.h	diff1 \|	diff2 \|	blob \| history
src/http/ngx_http_script.c	diff1 \|	diff2 \|	blob \| history
src/http/ngx_http_special_response.c	diff1 \|	diff2 \|	blob \| history
src/http/ngx_http_upstream.c	diff1 \|	diff2 \|	blob \| history
src/http/ngx_http_upstream.h	diff1 \|	diff2 \|	blob \| history
src/http/ngx_http_variables.c	diff1 \|	diff2 \|	blob \| history
src/os/unix/ngx_process_cycle.c	diff1 \|	diff2 \|	blob \| history

catap's nginx repository

RSS Atom

CHANGES	diff1 \|	diff2 \|	blob \| history
CHANGES.ru	diff1 \|	diff2 \|	blob \| history
auto/modules	diff1 \|	diff2 \|	blob \| history
auto/options	diff1 \|	diff2 \|	blob \| history
auto/sources	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
src/core/nginx.c	diff1 \|	diff2 \|	blob \| history
src/core/nginx.h	diff1 \|	diff2 \|	blob \| history
src/core/ngx_log.c	diff1 \|	diff2 \|	blob \| history
src/core/ngx_times.c	diff1 \|	diff2 \|	blob \| history
src/event/modules/ngx_select_module.c	diff1 \|	diff2 \|	blob \| history
src/event/ngx_event.c	diff1 \|	diff2 \|	blob \| history
src/http/modules/ngx_http_auth_basic_module.c	diff1 \|	diff2 \|	blob \| history
src/http/modules/ngx_http_empty_gif_module.c	diff1 \|	diff2 \|	blob \| history
src/http/modules/ngx_http_flv_module.c	diff1 \|	diff2 \|	blob \| history
src/http/modules/ngx_http_gzip_static_module.c	diff1 \|	diff2 \|	blob \| history
src/http/modules/ngx_http_range_filter_module.c	diff1 \|	diff2 \|	blob \| history
src/http/modules/ngx_http_rewrite_module.c	diff1 \|	diff2 \|	blob \| history
src/http/modules/ngx_http_ssi_filter_module.c	diff1 \|	diff2 \|	blob \| history
src/http/modules/ngx_http_static_module.c	diff1 \|	diff2 \|	blob \| history
src/http/modules/ngx_http_stub_status_module.c	diff1 \|	diff2 \|	blob \| history
src/http/modules/ngx_http_userid_filter_module.c	diff1 \|	diff2 \|	blob \| history
src/http/modules/ngx_http_xslt_filter_module.c	diff1 \|	diff2 \|	blob \| history
src/http/modules/perl/nginx.pm	diff1 \|	diff2 \|	blob \| history
src/http/ngx_http_core_module.c	diff1 \|	diff2 \|	blob \| history
src/http/ngx_http_core_module.h	diff1 \|	diff2 \|	blob \| history
src/http/ngx_http_header_filter_module.c	diff1 \|	diff2 \|	blob \| history
src/http/ngx_http_request.c	diff1 \|	diff2 \|	blob \| history
src/http/ngx_http_request.h	diff1 \|	diff2 \|	blob \| history
src/http/ngx_http_script.c	diff1 \|	diff2 \|	blob \| history
src/http/ngx_http_special_response.c	diff1 \|	diff2 \|	blob \| history
src/http/ngx_http_upstream.c	diff1 \|	diff2 \|	blob \| history
src/http/ngx_http_upstream.h	diff1 \|	diff2 \|	blob \| history
src/http/ngx_http_variables.c	diff1 \|	diff2 \|	blob \| history
src/os/unix/ngx_process_cycle.c	diff1 \|	diff2 \|	blob \| history