Changes with nginx 1.5.8                                         17 Dec 2013

*) Feature: IPv6 support in resolver.

*) Feature: the "listen" directive supports the "fastopen" parameter.
Thanks to Mathew Rodley.

*) Feature: SSL support in the ngx_http_uwsgi_module.
Thanks to Roberto De Ioris.

*) Feature: vim syntax highlighting scripts were added to contrib.
Thanks to Evan Miller.

*) Bugfix: a timeout might occur while reading client request body in an
SSL connection using chunked transfer encoding.

*) Bugfix: the "master_process" directive did not work correctly in
nginx/Windows.

*) Bugfix: the "setfib" parameter of the "listen" directive might not
work.

*) Bugfix: in the ngx_http_spdy_module.
Merge tag 'v1.5.8'

Changes with nginx 1.5.8                                         17 Dec 2013

*) Feature: IPv6 support in resolver.

*) Feature: the "listen" directive supports the "fastopen" parameter.
Thanks to Mathew Rodley.

*) Feature: SSL support in the ngx_http_uwsgi_module.
Thanks to Roberto De Ioris.

*) Feature: vim syntax highlighting scripts were added to contrib.
Thanks to Evan Miller.

*) Bugfix: a timeout might occur while reading client request body in an
SSL connection using chunked transfer encoding.

*) Bugfix: the "master_process" directive did not work correctly in
nginx/Windows.

*) Bugfix: the "setfib" parameter of the "listen" directive might not
work.

*) Bugfix: in the ngx_http_spdy_module.

Conflicts:
	src/core/nginx.h

Signed-off-by: paulyang <y_y@neusoft.com>
fixed the compatible problem with nginx-1.5.8

Signed-off-by: paulyang <y_y@neusoft.com>
Merge branch 'master' of https://github.com/NeusoftSecurity/SEnginx