← Back to branch summary

~nginx/nginx/debian

~nginx/nginx/debian

Viewing all changes in revision 91.

Committer: Kartik Mistry
Date: 2012-12-12 09:52:06 UTC
mfrom: (1.1.5)
Revision ID: git-v1:569749e6c51a3367788bf37b409aec1d2e41e29f

git commit: 569749e6c51a3367788bf37b409aec1d2e41e29f

Merge tag 'upstream/1.2.6'

Upstream version 1.2.6

files modified:
CHANGES

CHANGES.ru

src/core/nginx.h

src/core/ngx_connection.c

src/core/ngx_cycle.c

src/core/ngx_shmtx.c

src/http/modules/ngx_http_dav_module.c

src/http/modules/perl/nginx.pm

src/http/ngx_http_header_filter_module.c

src/http/ngx_http_request_body.c

src/http/ngx_http_special_response.c

src/http/ngx_http_upstream.c

src/http/ngx_http_upstream_round_robin.c

src/http/ngx_http_variables.c

src/os/unix/ngx_files.c

src/os/unix/ngx_process_cycle.c

Show diffs side-by-side

added added

removed removed

src/core/nginx.h

src/core/ngx_connection.c

src/core/ngx_cycle.c

src/core/ngx_shmtx.c

src/http/modules/ngx_http_dav_module.c

src/http/modules/perl/nginx.pm

src/http/ngx_http_header_filter_module.c

src/http/ngx_http_request_body.c

src/http/ngx_http_special_response.c

src/http/ngx_http_upstream.c

src/http/ngx_http_upstream_round_robin.c

src/http/ngx_http_variables.c

src/os/unix/ngx_files.c

src/os/unix/ngx_process_cycle.c