for merge
Merge branch 'master' of github.com:xdutaotao/u-nginx

Conflicts:
	pkg-src/auto/cc/conf
	pkg-src/auto/cc/gcc
	pkg-src/gen_make
	pkg-src/src/http/ngx_http_core_module.c
	pkg-src/src/http/ngx_http_request.c
	pkg-src/src/tcp/ngx_tcp_core_module.c
	pkg-src/src/tcp/ngx_tcp_upstream.c