Public Git Hosting - nginx-catap.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 2e2fea5 6f42cd5)

commit	0c1c549d618b681449747007812e6c58ee209ad5
author	Kirill A. Korinskiy <catap@catap.ru>
	Wed, 16 Jun 2010 06:25:21 +0000 (16 10:25 +0400)
committer	Kirill A. Korinskiy <catap@catap.ru>
	Wed, 16 Jun 2010 06:25:21 +0000 (16 10:25 +0400)
tree	124b97830a878496324bdf85b50276105a25a2cf	tree \| snapshot (tar.gz zip)
parent	2e2fea506554e7955d75aadc681ea88c90e63fb1	commit \| diff
parent	6f42cd5f46ca7eef16e4e36c845d8265b9899452	commit \| diff

Merge commit 'v0.8.41'

Conflicts:
src/core/nginx.h
src/http/modules/perl/nginx.pm
src/http/ngx_http_header_filter_module.c

CHANGES	diff1 \|	diff2 \|	blob \| history
CHANGES.ru	diff1 \|	diff2 \|	blob \| history
src/core/nginx.h	diff1 \|	diff2 \|	blob \| history
src/http/modules/perl/nginx.pm	diff1 \|	diff2 \|	blob \| history
src/http/ngx_http.c	diff1 \|	diff2 \|	blob \| history
src/http/ngx_http_core_module.c	diff1 \|	diff2 \|	blob \| history
src/http/ngx_http_parse.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

catap's nginx repository