mirror of
https://github.com/nginx/nginx.git
synced 2025-07-21 03:44:05 +08:00
r1677 merge:
do not allow plain 0.9 request to HTTPS
This commit is contained in:
parent
cde7ea838b
commit
3b8cfd03a8
@ -1332,13 +1332,6 @@ ngx_http_process_request_header(ngx_http_request_t *r)
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
||||
if (r->plain_http) {
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent plain HTTP request to HTTPS port");
|
||||
ngx_http_finalize_request(r, NGX_HTTP_TO_HTTPS);
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
||||
if (r->headers_in.connection_type == NGX_HTTP_CONNECTION_KEEP_ALIVE) {
|
||||
if (r->headers_in.keep_alive) {
|
||||
r->headers_in.keep_alive_n =
|
||||
@ -1406,6 +1399,13 @@ ngx_http_process_request(ngx_http_request_t *r)
|
||||
|
||||
c = r->connection;
|
||||
|
||||
if (r->plain_http) {
|
||||
ngx_log_error(NGX_LOG_INFO, c->log, 0,
|
||||
"client sent plain HTTP request to HTTPS port");
|
||||
ngx_http_finalize_request(r, NGX_HTTP_TO_HTTPS);
|
||||
return;
|
||||
}
|
||||
|
||||
#if (NGX_HTTP_SSL)
|
||||
|
||||
if (c->ssl) {
|
||||
|
Loading…
Reference in New Issue
Block a user