mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

nginx-0.0.7-2004-07-09-11:12:14 import

Browse Source
This commit is contained in:
Igor Sysoev 2004-07-09 07:12:14 +00:00
parent 7556945655
commit e739eb7281
4 changed files with 58 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/http/modules/ngx_http_ssl_filter.c
View File

@ -111,8 +111,30 @@ ngx_int_t ngx_http_ssl_read(ngx_http_request_t *r)
return NGX_AGAIN; return NGX_AGAIN;
} }
if (rc == SSL_ERROR_ZERO_RETURN) {
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
"client closed connection while SSL handshake");
ngx_http_ssl_close_request(ctx->ssl, SSL_RECEIVED_SHUTDOWN);
return NGX_ERROR;
}
if (ERR_GET_REASON(ERR_peek_error()) == SSL_R_HTTP_REQUEST) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"client sent HTTP request to HTTPS port");
ngx_http_ssl_close_request(ctx->ssl,
SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN);
return NGX_OK;
}
ngx_http_ssl_error(NGX_LOG_ALERT, r->connection->log, rc, ngx_http_ssl_error(NGX_LOG_ALERT, r->connection->log, rc,
"SSL_accept() failed"); "SSL_accept() failed");
ngx_http_ssl_close_request(ctx->ssl, SSL_RECEIVED_SHUTDOWN);
return NGX_ERROR; return NGX_ERROR;
} }
@ -174,6 +196,14 @@ static ngx_http_ssl_ctx_t *ngx_http_ssl_create_ctx(ngx_http_request_t *r)
} }
void ngx_http_ssl_close_request(SSL *ssl, int mode)
{
SSL_set_shutdown(ssl, mode);
SSL_smart_shutdown(ssl);
SSL_free(ssl);
}
static void ngx_http_ssl_error(ngx_uint_t level, ngx_log_t *log, int err, static void ngx_http_ssl_error(ngx_uint_t level, ngx_log_t *log, int err,
char *fmt, ...) char *fmt, ...)
{ {

3
src/http/modules/ngx_http_ssl_filter.h
View File

@ -6,8 +6,11 @@
#include <ngx_core.h> #include <ngx_core.h>
#include <ngx_http.h> #include <ngx_http.h>
#include <openssl/ssl.h>
ngx_int_t ngx_http_ssl_read(ngx_http_request_t *r); ngx_int_t ngx_http_ssl_read(ngx_http_request_t *r);
void ngx_http_ssl_close_request(SSL *ssl, int mode);
#endif /* _NGX_HTTP_SSL_FILTER_H_INCLUDED_ */ #endif /* _NGX_HTTP_SSL_FILTER_H_INCLUDED_ */

8
src/http/ngx_http_request.h
View File

@ -54,7 +54,13 @@
/* Our own HTTP codes */ /* Our own HTTP codes */
#define NGX_HTTP_NGX_CODES NGX_HTTP_INVALID_HOST #define NGX_HTTP_NGX_CODES NGX_HTTP_TO_HTTPS
/*
* We use the special code for the plain HTTP requests that are sent to
* HTTPS port to distinguish it from 4XX in an error page redirection
*/
#define NGX_HTTP_TO_HTTPS 497
/* /*
* We use the special code for the requests with invalid host name * We use the special code for the requests with invalid host name

20
src/http/ngx_http_special_response.c
View File

@ -102,6 +102,14 @@ static char error_416_page[] =
; ;
static char error_497_page[] =
"<html>" CRLF
"<head><title>The plain HTTP request was sent to HTTPS port</title></head>" CRLF
"<body bgcolor=\"white\">" CRLF
"<center><h1>The plain HTTP request was sent to HTTPS por</h1></center>" CRLF
;
static char error_500_page[] = static char error_500_page[] =
"<html>" CRLF "<html>" CRLF
"<head><title>500 Internal Server Error</title></head>" CRLF "<head><title>500 Internal Server Error</title></head>" CRLF
@ -166,8 +174,9 @@ static ngx_str_t error_pages[] = {
ngx_null_string, /* 415 */ ngx_null_string, /* 415 */
ngx_string(error_416_page), ngx_string(error_416_page),
ngx_string(error_404_page), /* 498 */ ngx_string(error_400_page), /* 497, http to https */
ngx_null_string, /* 499 */ ngx_string(error_404_page), /* 498, invalid host name */
ngx_null_string, /* 499, client closed connection */
ngx_string(error_500_page), ngx_string(error_500_page),
ngx_string(error_501_page), ngx_string(error_501_page),
@ -199,6 +208,7 @@ ngx_int_t ngx_http_special_response_handler(ngx_http_request_t *r, int error)
case NGX_HTTP_BAD_REQUEST: case NGX_HTTP_BAD_REQUEST:
case NGX_HTTP_REQUEST_ENTITY_TOO_LARGE: case NGX_HTTP_REQUEST_ENTITY_TOO_LARGE:
case NGX_HTTP_REQUEST_URI_TOO_LARGE: case NGX_HTTP_REQUEST_URI_TOO_LARGE:
case NGX_HTTP_TO_HTTPS:
case NGX_HTTP_INTERNAL_SERVER_ERROR: case NGX_HTTP_INTERNAL_SERVER_ERROR:
r->keepalive = 0; r->keepalive = 0;
} }
@ -207,6 +217,7 @@ ngx_int_t ngx_http_special_response_handler(ngx_http_request_t *r, int error)
if (r->lingering_close == 1) { if (r->lingering_close == 1) {
switch (error) { switch (error) {
case NGX_HTTP_BAD_REQUEST: case NGX_HTTP_BAD_REQUEST:
case NGX_HTTP_TO_HTTPS:
r->lingering_close = 0; r->lingering_close = 0;
} }
} }
@ -241,6 +252,11 @@ ngx_int_t ngx_http_special_response_handler(ngx_http_request_t *r, int error)
err = error - NGX_HTTP_NGX_CODES + 3 + 17; err = error - NGX_HTTP_NGX_CODES + 3 + 17;
switch (error) { switch (error) {
case NGX_HTTP_TO_HTTPS:
r->headers_out.status = NGX_HTTP_BAD_REQUEST;
error = NGX_HTTP_BAD_REQUEST;
break;
case NGX_HTTP_INVALID_HOST: case NGX_HTTP_INVALID_HOST:
r->headers_out.status = NGX_HTTP_NOT_FOUND; r->headers_out.status = NGX_HTTP_NOT_FOUND;
error = NGX_HTTP_NOT_FOUND; error = NGX_HTTP_NOT_FOUND;