Public Git Hosting - nginx-catap.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 8bfe55c be83c01)

commit	a7d939e66fd68499ba8d69902eab741491587858
author	Kirill A. Korinskiy <catap@catap.ru>
	Wed, 3 Jun 2009 14:13:57 +0000 (3 18:13 +0400)
committer	Kirill A. Korinskiy <catap@catap.ru>
	Wed, 3 Jun 2009 14:13:57 +0000 (3 18:13 +0400)
tree	ac66fb1cff8f50d0f49aaa3e18c35a5f28ce9cc4	tree \| snapshot (tar.gz zip)
parent	8bfe55ca84ebaafb7df6bf23bf5b18cd29a238f5	commit \| diff
parent	be83c015f1796c0801ce6b08116c509a1eec23a4	commit \| diff

Merge commit 'v0.8.0'

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

19 files changed:

CHANGES	diff1 \|	diff2 \|	blob \| history
CHANGES.ru	diff1 \|	diff2 \|	blob \| history
auto/lib/conf	diff1 \|	diff2 \|	blob \| history
src/core/nginx.h	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_gzip_static_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_sub_filter_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_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_upstream.c	diff1 \|	diff2 \|	blob \| history

catap's nginx repository