mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-07-21 11:46:20 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

r1677 merge:

Browse Source 
do not allow plain 0.9 request to HTTPS
This commit is contained in:
Igor Sysoev 2007-12-12 21:09:17 +00:00
parent cde7ea838b
commit 3b8cfd03a8
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/http/ngx_http_request.c
View File

@ -1332,13 +1332,6 @@ ngx_http_process_request_header(ngx_http_request_t *r)
return NGX_ERROR; 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.connection_type == NGX_HTTP_CONNECTION_KEEP_ALIVE) {
if (r->headers_in.keep_alive) { if (r->headers_in.keep_alive) {
r->headers_in.keep_alive_n = r->headers_in.keep_alive_n =
@ -1406,6 +1399,13 @@ ngx_http_process_request(ngx_http_request_t *r)
c = r->connection; 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 (NGX_HTTP_SSL)
if (c->ssl) { if (c->ssl) {