Public Git Hosting - nginx-catap.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: b34c96e c3a9217)

commit	ad1dcd03611a0586e3e51d378c318d3446eb3dd8
author	Kirill A. Korinskiy <catap@catap.ru>
	Mon, 22 Jun 2009 12:47:02 +0000 (22 16:47 +0400)
committer	Kirill A. Korinskiy <catap@catap.ru>
	Mon, 22 Jun 2009 13:11:58 +0000 (22 17:11 +0400)
tree	dfb01577f6fcb1395a068007c4faf58e613ec9ca	tree \| snapshot (tar.gz zip)
parent	b34c96ee1fd9ea13d5c6c076a732002f01a64059	commit \| diff
parent	c3a9217aab03e50efe504d9ffa610632a4666405	commit \| diff

Merge commit 'v0.8.4'

Conflicts:
CHANGES
CHANGES.ru
src/core/nginx.h
src/event/ngx_event_accept.c
src/http/modules/perl/nginx.pm
src/http/ngx_http_request.c
src/mail/ngx_mail_handler.c

CHANGES	diff1 \|	diff2 \|	blob \| history
CHANGES.ru	diff1 \|	diff2 \|	blob \| history
src/core/nginx.h	diff1 \|	diff2 \|	blob \| history
src/event/ngx_event_accept.c	diff1 \|	diff2 \|	blob \| history
src/http/modules/perl/nginx.pm	diff1 \|	diff2 \|	blob \| history
src/http/ngx_http_request.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/mail/ngx_mail_handler.c	diff1 \|	diff2 \|	blob \| history

catap's nginx repository