Merged with the default branch.

diff --cc src/event/ngx_event_openssl.c
Simple merge

diff --cc src/http/ngx_http_parse.c
Simple merge

diff --cc src/http/ngx_http_request.c
Simple merge

diff --cc src/http/ngx_http_request.h
Simple merge