CVS: cvs.openbsd.org: src

[Stuart Henderson]

CVSROOT:        /cvs
Module name:    src
Changes by:     st...@cvs.openbsd.org   2012/03/15 10:49:25

Modified files:
        usr.sbin/nginx : CHANGES 
        usr.sbin/nginx/src/http: ngx_http_parse.c 
        usr.sbin/nginx/src/http/modules: ngx_http_fastcgi_module.c 
                                         ngx_http_proxy_module.c 
                                         ngx_http_scgi_module.c 
                                         ngx_http_uwsgi_module.c 
        usr.sbin/nginx/src/http/modules/perl: nginx.pm 

Log message:
resolve conflicts