2004-07-08 23:17:47 +08:00
|
|
|
|
2004-09-28 16:34:51 +08:00
|
|
|
/*
|
2004-09-30 00:00:49 +08:00
|
|
|
* Copyright (C) Igor Sysoev
|
2004-09-28 16:34:51 +08:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
2004-07-08 23:17:47 +08:00
|
|
|
#include <ngx_config.h>
|
|
|
|
|
#include <ngx_core.h>
|
|
|
|
|
#include <ngx_http.h>
|
|
|
|
|
|
nginx-0.1.14-RELEASE import
*) Feature: the autoconfiguration directives:
--http-client-body-temp-path=PATH, --http-proxy-temp-path=PATH, and
--http-fastcgi-temp-path=PATH
*) Change: the directory name for the temporary files with the client
request body is specified by directive client_body_temp_path, by
default it is <prefix>/client_body_temp.
*) Feature: the ngx_http_fastcgi_module and the directives:
fastcgi_pass, fastcgi_root, fastcgi_index, fastcgi_params,
fastcgi_connect_timeout, fastcgi_send_timeout, fastcgi_read_timeout,
fastcgi_send_lowat, fastcgi_header_buffer_size, fastcgi_buffers,
fastcgi_busy_buffers_size, fastcgi_temp_path,
fastcgi_max_temp_file_size, fastcgi_temp_file_write_size,
fastcgi_next_upstream, and fastcgi_x_powered_by.
*) Bugfix: the "[alert] zero size buf" error; the bug had appeared in
0.1.3.
*) Change: the URI must be specified after the host name in the
proxy_pass directive.
*) Change: the %3F symbol in the URI was considered as the argument
string start.
*) Feature: the unix domain sockets support in the
ngx_http_proxy_module.
*) Feature: the ssl_engine and ssl_ciphers directives.
Thanks to Sergey Skvortsov for SSL-accelerator.
2005-01-18 21:03:58 +08:00
|
|
|
#include <openssl/engine.h>
|
|
|
|
|
|
2004-07-08 23:17:47 +08:00
|
|
|
|
|
|
|
|
#define NGX_DEFLAUT_CERTIFICATE "cert.pem"
|
|
|
|
|
#define NGX_DEFLAUT_CERTIFICATE_KEY "cert.pem"
|
|
|
|
|
|
|
|
|
|
|
nginx-0.1.14-RELEASE import
*) Feature: the autoconfiguration directives:
--http-client-body-temp-path=PATH, --http-proxy-temp-path=PATH, and
--http-fastcgi-temp-path=PATH
*) Change: the directory name for the temporary files with the client
request body is specified by directive client_body_temp_path, by
default it is <prefix>/client_body_temp.
*) Feature: the ngx_http_fastcgi_module and the directives:
fastcgi_pass, fastcgi_root, fastcgi_index, fastcgi_params,
fastcgi_connect_timeout, fastcgi_send_timeout, fastcgi_read_timeout,
fastcgi_send_lowat, fastcgi_header_buffer_size, fastcgi_buffers,
fastcgi_busy_buffers_size, fastcgi_temp_path,
fastcgi_max_temp_file_size, fastcgi_temp_file_write_size,
fastcgi_next_upstream, and fastcgi_x_powered_by.
*) Bugfix: the "[alert] zero size buf" error; the bug had appeared in
0.1.3.
*) Change: the URI must be specified after the host name in the
proxy_pass directive.
*) Change: the %3F symbol in the URI was considered as the argument
string start.
*) Feature: the unix domain sockets support in the
ngx_http_proxy_module.
*) Feature: the ssl_engine and ssl_ciphers directives.
Thanks to Sergey Skvortsov for SSL-accelerator.
2005-01-18 21:03:58 +08:00
|
|
|
static void *ngx_http_ssl_create_main_conf(ngx_conf_t *cf);
|
|
|
|
|
static char *ngx_http_ssl_init_main_conf(ngx_conf_t *cf, void *conf);
|
2004-07-08 23:17:47 +08:00
|
|
|
static void *ngx_http_ssl_create_srv_conf(ngx_conf_t *cf);
|
|
|
|
|
static char *ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf,
|
2005-03-19 20:38:37 +08:00
|
|
|
void *parent, void *child);
|
2004-07-08 23:17:47 +08:00
|
|
|
|
|
|
|
|
|
2004-07-17 01:11:43 +08:00
|
|
|
static ngx_command_t ngx_http_ssl_commands[] = {
|
2004-07-08 23:17:47 +08:00
|
|
|
|
nginx-0.1.14-RELEASE import
*) Feature: the autoconfiguration directives:
--http-client-body-temp-path=PATH, --http-proxy-temp-path=PATH, and
--http-fastcgi-temp-path=PATH
*) Change: the directory name for the temporary files with the client
request body is specified by directive client_body_temp_path, by
default it is <prefix>/client_body_temp.
*) Feature: the ngx_http_fastcgi_module and the directives:
fastcgi_pass, fastcgi_root, fastcgi_index, fastcgi_params,
fastcgi_connect_timeout, fastcgi_send_timeout, fastcgi_read_timeout,
fastcgi_send_lowat, fastcgi_header_buffer_size, fastcgi_buffers,
fastcgi_busy_buffers_size, fastcgi_temp_path,
fastcgi_max_temp_file_size, fastcgi_temp_file_write_size,
fastcgi_next_upstream, and fastcgi_x_powered_by.
*) Bugfix: the "[alert] zero size buf" error; the bug had appeared in
0.1.3.
*) Change: the URI must be specified after the host name in the
proxy_pass directive.
*) Change: the %3F symbol in the URI was considered as the argument
string start.
*) Feature: the unix domain sockets support in the
ngx_http_proxy_module.
*) Feature: the ssl_engine and ssl_ciphers directives.
Thanks to Sergey Skvortsov for SSL-accelerator.
2005-01-18 21:03:58 +08:00
|
|
|
{ ngx_string("ssl_engine"),
|
|
|
|
|
NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
|
|
|
|
|
ngx_conf_set_str_slot,
|
|
|
|
|
NGX_HTTP_MAIN_CONF_OFFSET,
|
|
|
|
|
offsetof(ngx_http_ssl_main_conf_t, engine),
|
|
|
|
|
NULL },
|
|
|
|
|
|
2004-07-16 00:35:51 +08:00
|
|
|
{ ngx_string("ssl"),
|
|
|
|
|
NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
|
2004-07-08 23:17:47 +08:00
|
|
|
ngx_conf_set_flag_slot,
|
|
|
|
|
NGX_HTTP_SRV_CONF_OFFSET,
|
|
|
|
|
offsetof(ngx_http_ssl_srv_conf_t, enable),
|
|
|
|
|
NULL },
|
|
|
|
|
|
|
|
|
|
{ ngx_string("ssl_certificate"),
|
2004-07-16 00:35:51 +08:00
|
|
|
NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
|
2004-07-08 23:17:47 +08:00
|
|
|
ngx_conf_set_str_slot,
|
|
|
|
|
NGX_HTTP_SRV_CONF_OFFSET,
|
|
|
|
|
offsetof(ngx_http_ssl_srv_conf_t, certificate),
|
|
|
|
|
NULL },
|
|
|
|
|
|
|
|
|
|
{ ngx_string("ssl_certificate_key"),
|
2004-07-16 00:35:51 +08:00
|
|
|
NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
|
2004-07-08 23:17:47 +08:00
|
|
|
ngx_conf_set_str_slot,
|
|
|
|
|
NGX_HTTP_SRV_CONF_OFFSET,
|
|
|
|
|
offsetof(ngx_http_ssl_srv_conf_t, certificate_key),
|
|
|
|
|
NULL },
|
|
|
|
|
|
nginx-0.1.14-RELEASE import
*) Feature: the autoconfiguration directives:
--http-client-body-temp-path=PATH, --http-proxy-temp-path=PATH, and
--http-fastcgi-temp-path=PATH
*) Change: the directory name for the temporary files with the client
request body is specified by directive client_body_temp_path, by
default it is <prefix>/client_body_temp.
*) Feature: the ngx_http_fastcgi_module and the directives:
fastcgi_pass, fastcgi_root, fastcgi_index, fastcgi_params,
fastcgi_connect_timeout, fastcgi_send_timeout, fastcgi_read_timeout,
fastcgi_send_lowat, fastcgi_header_buffer_size, fastcgi_buffers,
fastcgi_busy_buffers_size, fastcgi_temp_path,
fastcgi_max_temp_file_size, fastcgi_temp_file_write_size,
fastcgi_next_upstream, and fastcgi_x_powered_by.
*) Bugfix: the "[alert] zero size buf" error; the bug had appeared in
0.1.3.
*) Change: the URI must be specified after the host name in the
proxy_pass directive.
*) Change: the %3F symbol in the URI was considered as the argument
string start.
*) Feature: the unix domain sockets support in the
ngx_http_proxy_module.
*) Feature: the ssl_engine and ssl_ciphers directives.
Thanks to Sergey Skvortsov for SSL-accelerator.
2005-01-18 21:03:58 +08:00
|
|
|
{ ngx_string("ssl_ciphers"),
|
|
|
|
|
NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
|
|
|
|
|
ngx_conf_set_str_slot,
|
|
|
|
|
NGX_HTTP_SRV_CONF_OFFSET,
|
|
|
|
|
offsetof(ngx_http_ssl_srv_conf_t, ciphers),
|
|
|
|
|
NULL },
|
|
|
|
|
|
2004-07-08 23:17:47 +08:00
|
|
|
ngx_null_command
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2004-07-17 01:11:43 +08:00
|
|
|
static ngx_http_module_t ngx_http_ssl_module_ctx = {
|
nginx-0.1.29-RELEASE import
*) Feature: the ngx_http_ssi_module supports "include virtual" command.
*) Feature: the ngx_http_ssi_module supports the condition command like
'if expr="$NAME"' and "else" and "endif" commands. Only one nested
level is supported.
*) Feature: the ngx_http_ssi_module supports the DATE_LOCAL and
DATE_GMT variables and "config timefmt" command.
*) Feature: the "ssi_ignore_recycled_buffers" directive.
*) Bugfix: the "echo" command did not show the default value for the
empty QUERY_STRING variable.
*) Change: the ngx_http_proxy_module was rewritten.
*) Feature: the "proxy_redirect", "proxy_pass_request_headers",
"proxy_pass_request_body", and "proxy_method" directives.
*) Feature: the "proxy_set_header" directive. The "proxy_x_var" was
canceled and must be replaced with the proxy_set_header directive.
*) Change: the "proxy_preserve_host" is canceled and must be replaced
with the "proxy_set_header Host $host" and the "proxy_redirect off"
directives, the "proxy_set_header Host $host:$proxy_port" directive
and the appropriate proxy_redirect directives.
*) Change: the "proxy_set_x_real_ip" is canceled and must be replaced
with the "proxy_set_header X-Real-IP $remote_addr" directive.
*) Change: the "proxy_add_x_forwarded_for" is canceled and must be
replaced with
the "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for"
directive.
*) Change: the "proxy_set_x_url" is canceled and must be replaced with
the "proxy_set_header X-URL http://$host:$server_port$request_uri"
directive.
*) Feature: the "fastcgi_param" directive.
*) Change: the "fastcgi_root", "fastcgi_set_var" and "fastcgi_params"
directive are canceled and must be replaced with the fastcgi_param
directives.
*) Feature: the "index" directive can use the variables.
*) Feature: the "index" directive can be used at http and server levels.
*) Change: the last index only in the "index" directive can be absolute.
*) Feature: the "rewrite" directive can use the variables.
*) Feature: the "internal" directive.
*) Feature: the CONTENT_LENGTH, CONTENT_TYPE, REMOTE_PORT, SERVER_ADDR,
SERVER_PORT, SERVER_PROTOCOL, DOCUMENT_ROOT, SERVER_NAME,
REQUEST_METHOD, REQUEST_URI, and REMOTE_USER variables.
*) Change: nginx now passes the invalid lines in a client request
headers or a backend response header.
*) Bugfix: if the backend did not transfer response for a long time and
the "send_timeout" was less than "proxy_read_timeout", then nginx
returned the 408 response.
*) Bugfix: the segmentation fault was occurred if the backend sent an
invalid line in response header; the bug had appeared in 0.1.26.
*) Bugfix: the segmentation fault may occurred in FastCGI fault
tolerance configuration.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" and "Cache-Control" headers.
*) Bugfix: nginx did not take into account trailing dot in "Host"
header line.
*) Bugfix: the ngx_http_auth_module did not work under Linux.
*) Bugfix: the rewrite directive worked incorrectly, if the arguments
were in a request.
*) Bugfix: nginx could not be built on MacOS X.
2005-05-12 22:58:06 +08:00
|
|
|
NULL, /* preconfiguration */
|
|
|
|
|
NULL, /* postconfiguration */
|
2004-07-08 23:17:47 +08:00
|
|
|
|
nginx-0.1.14-RELEASE import
*) Feature: the autoconfiguration directives:
--http-client-body-temp-path=PATH, --http-proxy-temp-path=PATH, and
--http-fastcgi-temp-path=PATH
*) Change: the directory name for the temporary files with the client
request body is specified by directive client_body_temp_path, by
default it is <prefix>/client_body_temp.
*) Feature: the ngx_http_fastcgi_module and the directives:
fastcgi_pass, fastcgi_root, fastcgi_index, fastcgi_params,
fastcgi_connect_timeout, fastcgi_send_timeout, fastcgi_read_timeout,
fastcgi_send_lowat, fastcgi_header_buffer_size, fastcgi_buffers,
fastcgi_busy_buffers_size, fastcgi_temp_path,
fastcgi_max_temp_file_size, fastcgi_temp_file_write_size,
fastcgi_next_upstream, and fastcgi_x_powered_by.
*) Bugfix: the "[alert] zero size buf" error; the bug had appeared in
0.1.3.
*) Change: the URI must be specified after the host name in the
proxy_pass directive.
*) Change: the %3F symbol in the URI was considered as the argument
string start.
*) Feature: the unix domain sockets support in the
ngx_http_proxy_module.
*) Feature: the ssl_engine and ssl_ciphers directives.
Thanks to Sergey Skvortsov for SSL-accelerator.
2005-01-18 21:03:58 +08:00
|
|
|
ngx_http_ssl_create_main_conf, /* create main configuration */
|
|
|
|
|
ngx_http_ssl_init_main_conf, /* init main configuration */
|
2004-07-08 23:17:47 +08:00
|
|
|
|
|
|
|
|
ngx_http_ssl_create_srv_conf, /* create server configuration */
|
|
|
|
|
ngx_http_ssl_merge_srv_conf, /* merge server configuration */
|
|
|
|
|
|
|
|
|
|
NULL, /* create location configuration */
|
2005-02-04 03:33:37 +08:00
|
|
|
NULL /* merge location configuration */
|
2004-07-08 23:17:47 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2004-07-17 01:11:43 +08:00
|
|
|
ngx_module_t ngx_http_ssl_module = {
|
nginx-0.1.29-RELEASE import
*) Feature: the ngx_http_ssi_module supports "include virtual" command.
*) Feature: the ngx_http_ssi_module supports the condition command like
'if expr="$NAME"' and "else" and "endif" commands. Only one nested
level is supported.
*) Feature: the ngx_http_ssi_module supports the DATE_LOCAL and
DATE_GMT variables and "config timefmt" command.
*) Feature: the "ssi_ignore_recycled_buffers" directive.
*) Bugfix: the "echo" command did not show the default value for the
empty QUERY_STRING variable.
*) Change: the ngx_http_proxy_module was rewritten.
*) Feature: the "proxy_redirect", "proxy_pass_request_headers",
"proxy_pass_request_body", and "proxy_method" directives.
*) Feature: the "proxy_set_header" directive. The "proxy_x_var" was
canceled and must be replaced with the proxy_set_header directive.
*) Change: the "proxy_preserve_host" is canceled and must be replaced
with the "proxy_set_header Host $host" and the "proxy_redirect off"
directives, the "proxy_set_header Host $host:$proxy_port" directive
and the appropriate proxy_redirect directives.
*) Change: the "proxy_set_x_real_ip" is canceled and must be replaced
with the "proxy_set_header X-Real-IP $remote_addr" directive.
*) Change: the "proxy_add_x_forwarded_for" is canceled and must be
replaced with
the "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for"
directive.
*) Change: the "proxy_set_x_url" is canceled and must be replaced with
the "proxy_set_header X-URL http://$host:$server_port$request_uri"
directive.
*) Feature: the "fastcgi_param" directive.
*) Change: the "fastcgi_root", "fastcgi_set_var" and "fastcgi_params"
directive are canceled and must be replaced with the fastcgi_param
directives.
*) Feature: the "index" directive can use the variables.
*) Feature: the "index" directive can be used at http and server levels.
*) Change: the last index only in the "index" directive can be absolute.
*) Feature: the "rewrite" directive can use the variables.
*) Feature: the "internal" directive.
*) Feature: the CONTENT_LENGTH, CONTENT_TYPE, REMOTE_PORT, SERVER_ADDR,
SERVER_PORT, SERVER_PROTOCOL, DOCUMENT_ROOT, SERVER_NAME,
REQUEST_METHOD, REQUEST_URI, and REMOTE_USER variables.
*) Change: nginx now passes the invalid lines in a client request
headers or a backend response header.
*) Bugfix: if the backend did not transfer response for a long time and
the "send_timeout" was less than "proxy_read_timeout", then nginx
returned the 408 response.
*) Bugfix: the segmentation fault was occurred if the backend sent an
invalid line in response header; the bug had appeared in 0.1.26.
*) Bugfix: the segmentation fault may occurred in FastCGI fault
tolerance configuration.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" and "Cache-Control" headers.
*) Bugfix: nginx did not take into account trailing dot in "Host"
header line.
*) Bugfix: the ngx_http_auth_module did not work under Linux.
*) Bugfix: the rewrite directive worked incorrectly, if the arguments
were in a request.
*) Bugfix: nginx could not be built on MacOS X.
2005-05-12 22:58:06 +08:00
|
|
|
NGX_MODULE_V1,
|
2004-07-17 01:11:43 +08:00
|
|
|
&ngx_http_ssl_module_ctx, /* module context */
|
|
|
|
|
ngx_http_ssl_commands, /* module directives */
|
2004-07-08 23:17:47 +08:00
|
|
|
NGX_HTTP_MODULE, /* module type */
|
2004-07-16 00:35:51 +08:00
|
|
|
NULL, /* init module */
|
2004-07-17 01:11:43 +08:00
|
|
|
NULL /* init process */
|
2004-07-08 23:17:47 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
static void *
|
|
|
|
|
ngx_http_ssl_create_main_conf(ngx_conf_t *cf)
|
nginx-0.1.14-RELEASE import
*) Feature: the autoconfiguration directives:
--http-client-body-temp-path=PATH, --http-proxy-temp-path=PATH, and
--http-fastcgi-temp-path=PATH
*) Change: the directory name for the temporary files with the client
request body is specified by directive client_body_temp_path, by
default it is <prefix>/client_body_temp.
*) Feature: the ngx_http_fastcgi_module and the directives:
fastcgi_pass, fastcgi_root, fastcgi_index, fastcgi_params,
fastcgi_connect_timeout, fastcgi_send_timeout, fastcgi_read_timeout,
fastcgi_send_lowat, fastcgi_header_buffer_size, fastcgi_buffers,
fastcgi_busy_buffers_size, fastcgi_temp_path,
fastcgi_max_temp_file_size, fastcgi_temp_file_write_size,
fastcgi_next_upstream, and fastcgi_x_powered_by.
*) Bugfix: the "[alert] zero size buf" error; the bug had appeared in
0.1.3.
*) Change: the URI must be specified after the host name in the
proxy_pass directive.
*) Change: the %3F symbol in the URI was considered as the argument
string start.
*) Feature: the unix domain sockets support in the
ngx_http_proxy_module.
*) Feature: the ssl_engine and ssl_ciphers directives.
Thanks to Sergey Skvortsov for SSL-accelerator.
2005-01-18 21:03:58 +08:00
|
|
|
{
|
|
|
|
|
ngx_http_ssl_main_conf_t *mcf;
|
|
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
mcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_ssl_main_conf_t));
|
|
|
|
|
if (mcf == NULL) {
|
nginx-0.1.14-RELEASE import
*) Feature: the autoconfiguration directives:
--http-client-body-temp-path=PATH, --http-proxy-temp-path=PATH, and
--http-fastcgi-temp-path=PATH
*) Change: the directory name for the temporary files with the client
request body is specified by directive client_body_temp_path, by
default it is <prefix>/client_body_temp.
*) Feature: the ngx_http_fastcgi_module and the directives:
fastcgi_pass, fastcgi_root, fastcgi_index, fastcgi_params,
fastcgi_connect_timeout, fastcgi_send_timeout, fastcgi_read_timeout,
fastcgi_send_lowat, fastcgi_header_buffer_size, fastcgi_buffers,
fastcgi_busy_buffers_size, fastcgi_temp_path,
fastcgi_max_temp_file_size, fastcgi_temp_file_write_size,
fastcgi_next_upstream, and fastcgi_x_powered_by.
*) Bugfix: the "[alert] zero size buf" error; the bug had appeared in
0.1.3.
*) Change: the URI must be specified after the host name in the
proxy_pass directive.
*) Change: the %3F symbol in the URI was considered as the argument
string start.
*) Feature: the unix domain sockets support in the
ngx_http_proxy_module.
*) Feature: the ssl_engine and ssl_ciphers directives.
Thanks to Sergey Skvortsov for SSL-accelerator.
2005-01-18 21:03:58 +08:00
|
|
|
return NGX_CONF_ERROR;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* set by ngx_pcalloc():
|
|
|
|
|
*
|
|
|
|
|
* mcf->engine.len = 0;
|
|
|
|
|
* mcf->engine.data = NULL;
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
return mcf;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
static char *
|
|
|
|
|
ngx_http_ssl_init_main_conf(ngx_conf_t *cf, void *conf)
|
nginx-0.1.14-RELEASE import
*) Feature: the autoconfiguration directives:
--http-client-body-temp-path=PATH, --http-proxy-temp-path=PATH, and
--http-fastcgi-temp-path=PATH
*) Change: the directory name for the temporary files with the client
request body is specified by directive client_body_temp_path, by
default it is <prefix>/client_body_temp.
*) Feature: the ngx_http_fastcgi_module and the directives:
fastcgi_pass, fastcgi_root, fastcgi_index, fastcgi_params,
fastcgi_connect_timeout, fastcgi_send_timeout, fastcgi_read_timeout,
fastcgi_send_lowat, fastcgi_header_buffer_size, fastcgi_buffers,
fastcgi_busy_buffers_size, fastcgi_temp_path,
fastcgi_max_temp_file_size, fastcgi_temp_file_write_size,
fastcgi_next_upstream, and fastcgi_x_powered_by.
*) Bugfix: the "[alert] zero size buf" error; the bug had appeared in
0.1.3.
*) Change: the URI must be specified after the host name in the
proxy_pass directive.
*) Change: the %3F symbol in the URI was considered as the argument
string start.
*) Feature: the unix domain sockets support in the
ngx_http_proxy_module.
*) Feature: the ssl_engine and ssl_ciphers directives.
Thanks to Sergey Skvortsov for SSL-accelerator.
2005-01-18 21:03:58 +08:00
|
|
|
{
|
|
|
|
|
ngx_http_ssl_main_conf_t *mcf = conf;
|
|
|
|
|
|
|
|
|
|
ENGINE *engine;
|
|
|
|
|
|
|
|
|
|
if (mcf->engine.len == 0) {
|
|
|
|
|
return NGX_CONF_OK;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
engine = ENGINE_by_id((const char *) mcf->engine.data);
|
|
|
|
|
|
|
|
|
|
if (engine == NULL) {
|
|
|
|
|
ngx_ssl_error(NGX_LOG_WARN, cf->log, 0,
|
|
|
|
|
"ENGINE_by_id(\"%V\") failed", &mcf->engine);
|
|
|
|
|
return NGX_CONF_ERROR;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (ENGINE_set_default(engine, ENGINE_METHOD_ALL) == 0) {
|
|
|
|
|
ngx_ssl_error(NGX_LOG_WARN, cf->log, 0,
|
|
|
|
|
"ENGINE_set_default(\"%V\", ENGINE_METHOD_ALL) failed",
|
|
|
|
|
&mcf->engine);
|
|
|
|
|
return NGX_CONF_ERROR;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ENGINE_free(engine);
|
|
|
|
|
|
|
|
|
|
return NGX_CONF_OK;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
static void *
|
|
|
|
|
ngx_http_ssl_create_srv_conf(ngx_conf_t *cf)
|
2004-07-08 23:17:47 +08:00
|
|
|
{
|
|
|
|
|
ngx_http_ssl_srv_conf_t *scf;
|
|
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
scf = ngx_pcalloc(cf->pool, sizeof(ngx_http_ssl_srv_conf_t));
|
|
|
|
|
if (scf == NULL) {
|
2004-07-08 23:17:47 +08:00
|
|
|
return NGX_CONF_ERROR;
|
|
|
|
|
}
|
|
|
|
|
|
nginx-0.1.14-RELEASE import
*) Feature: the autoconfiguration directives:
--http-client-body-temp-path=PATH, --http-proxy-temp-path=PATH, and
--http-fastcgi-temp-path=PATH
*) Change: the directory name for the temporary files with the client
request body is specified by directive client_body_temp_path, by
default it is <prefix>/client_body_temp.
*) Feature: the ngx_http_fastcgi_module and the directives:
fastcgi_pass, fastcgi_root, fastcgi_index, fastcgi_params,
fastcgi_connect_timeout, fastcgi_send_timeout, fastcgi_read_timeout,
fastcgi_send_lowat, fastcgi_header_buffer_size, fastcgi_buffers,
fastcgi_busy_buffers_size, fastcgi_temp_path,
fastcgi_max_temp_file_size, fastcgi_temp_file_write_size,
fastcgi_next_upstream, and fastcgi_x_powered_by.
*) Bugfix: the "[alert] zero size buf" error; the bug had appeared in
0.1.3.
*) Change: the URI must be specified after the host name in the
proxy_pass directive.
*) Change: the %3F symbol in the URI was considered as the argument
string start.
*) Feature: the unix domain sockets support in the
ngx_http_proxy_module.
*) Feature: the ssl_engine and ssl_ciphers directives.
Thanks to Sergey Skvortsov for SSL-accelerator.
2005-01-18 21:03:58 +08:00
|
|
|
/*
|
|
|
|
|
* set by ngx_pcalloc():
|
|
|
|
|
*
|
|
|
|
|
* scf->certificate.len = 0;
|
|
|
|
|
* scf->certificate.data = NULL;
|
|
|
|
|
* scf->certificate_key.len = 0;
|
|
|
|
|
* scf->certificate_key.data = NULL;
|
|
|
|
|
* scf->ciphers.len = 0;
|
|
|
|
|
* scf->ciphers.data = NULL;
|
|
|
|
|
*/
|
|
|
|
|
|
2004-07-08 23:17:47 +08:00
|
|
|
scf->enable = NGX_CONF_UNSET;
|
|
|
|
|
|
|
|
|
|
return scf;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
static char *
|
|
|
|
|
ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
|
2004-07-08 23:17:47 +08:00
|
|
|
{
|
|
|
|
|
ngx_http_ssl_srv_conf_t *prev = parent;
|
|
|
|
|
ngx_http_ssl_srv_conf_t *conf = child;
|
|
|
|
|
|
|
|
|
|
ngx_conf_merge_value(conf->enable, prev->enable, 0);
|
|
|
|
|
|
2004-07-16 00:35:51 +08:00
|
|
|
if (conf->enable == 0) {
|
|
|
|
|
return NGX_CONF_OK;
|
|
|
|
|
}
|
|
|
|
|
|
2004-07-08 23:17:47 +08:00
|
|
|
ngx_conf_merge_str_value(conf->certificate, prev->certificate,
|
|
|
|
|
NGX_DEFLAUT_CERTIFICATE);
|
|
|
|
|
|
|
|
|
|
ngx_conf_merge_str_value(conf->certificate_key, prev->certificate_key,
|
|
|
|
|
NGX_DEFLAUT_CERTIFICATE_KEY);
|
|
|
|
|
|
nginx-0.1.14-RELEASE import
*) Feature: the autoconfiguration directives:
--http-client-body-temp-path=PATH, --http-proxy-temp-path=PATH, and
--http-fastcgi-temp-path=PATH
*) Change: the directory name for the temporary files with the client
request body is specified by directive client_body_temp_path, by
default it is <prefix>/client_body_temp.
*) Feature: the ngx_http_fastcgi_module and the directives:
fastcgi_pass, fastcgi_root, fastcgi_index, fastcgi_params,
fastcgi_connect_timeout, fastcgi_send_timeout, fastcgi_read_timeout,
fastcgi_send_lowat, fastcgi_header_buffer_size, fastcgi_buffers,
fastcgi_busy_buffers_size, fastcgi_temp_path,
fastcgi_max_temp_file_size, fastcgi_temp_file_write_size,
fastcgi_next_upstream, and fastcgi_x_powered_by.
*) Bugfix: the "[alert] zero size buf" error; the bug had appeared in
0.1.3.
*) Change: the URI must be specified after the host name in the
proxy_pass directive.
*) Change: the %3F symbol in the URI was considered as the argument
string start.
*) Feature: the unix domain sockets support in the
ngx_http_proxy_module.
*) Feature: the ssl_engine and ssl_ciphers directives.
Thanks to Sergey Skvortsov for SSL-accelerator.
2005-01-18 21:03:58 +08:00
|
|
|
ngx_conf_merge_str_value(conf->ciphers, prev->ciphers, "");
|
|
|
|
|
|
|
|
|
|
|
2004-07-12 05:03:47 +08:00
|
|
|
/* TODO: configure methods */
|
|
|
|
|
|
|
|
|
|
conf->ssl_ctx = SSL_CTX_new(SSLv23_server_method());
|
|
|
|
|
|
|
|
|
|
if (conf->ssl_ctx == NULL) {
|
2004-07-17 01:11:43 +08:00
|
|
|
ngx_ssl_error(NGX_LOG_EMERG, cf->log, 0, "SSL_CTX_new() failed");
|
2004-07-12 05:03:47 +08:00
|
|
|
return NGX_CONF_ERROR;
|
|
|
|
|
}
|
|
|
|
|
|
nginx-0.1.29-RELEASE import
*) Feature: the ngx_http_ssi_module supports "include virtual" command.
*) Feature: the ngx_http_ssi_module supports the condition command like
'if expr="$NAME"' and "else" and "endif" commands. Only one nested
level is supported.
*) Feature: the ngx_http_ssi_module supports the DATE_LOCAL and
DATE_GMT variables and "config timefmt" command.
*) Feature: the "ssi_ignore_recycled_buffers" directive.
*) Bugfix: the "echo" command did not show the default value for the
empty QUERY_STRING variable.
*) Change: the ngx_http_proxy_module was rewritten.
*) Feature: the "proxy_redirect", "proxy_pass_request_headers",
"proxy_pass_request_body", and "proxy_method" directives.
*) Feature: the "proxy_set_header" directive. The "proxy_x_var" was
canceled and must be replaced with the proxy_set_header directive.
*) Change: the "proxy_preserve_host" is canceled and must be replaced
with the "proxy_set_header Host $host" and the "proxy_redirect off"
directives, the "proxy_set_header Host $host:$proxy_port" directive
and the appropriate proxy_redirect directives.
*) Change: the "proxy_set_x_real_ip" is canceled and must be replaced
with the "proxy_set_header X-Real-IP $remote_addr" directive.
*) Change: the "proxy_add_x_forwarded_for" is canceled and must be
replaced with
the "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for"
directive.
*) Change: the "proxy_set_x_url" is canceled and must be replaced with
the "proxy_set_header X-URL http://$host:$server_port$request_uri"
directive.
*) Feature: the "fastcgi_param" directive.
*) Change: the "fastcgi_root", "fastcgi_set_var" and "fastcgi_params"
directive are canceled and must be replaced with the fastcgi_param
directives.
*) Feature: the "index" directive can use the variables.
*) Feature: the "index" directive can be used at http and server levels.
*) Change: the last index only in the "index" directive can be absolute.
*) Feature: the "rewrite" directive can use the variables.
*) Feature: the "internal" directive.
*) Feature: the CONTENT_LENGTH, CONTENT_TYPE, REMOTE_PORT, SERVER_ADDR,
SERVER_PORT, SERVER_PROTOCOL, DOCUMENT_ROOT, SERVER_NAME,
REQUEST_METHOD, REQUEST_URI, and REMOTE_USER variables.
*) Change: nginx now passes the invalid lines in a client request
headers or a backend response header.
*) Bugfix: if the backend did not transfer response for a long time and
the "send_timeout" was less than "proxy_read_timeout", then nginx
returned the 408 response.
*) Bugfix: the segmentation fault was occurred if the backend sent an
invalid line in response header; the bug had appeared in 0.1.26.
*) Bugfix: the segmentation fault may occurred in FastCGI fault
tolerance configuration.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" and "Cache-Control" headers.
*) Bugfix: nginx did not take into account trailing dot in "Host"
header line.
*) Bugfix: the ngx_http_auth_module did not work under Linux.
*) Bugfix: the rewrite directive worked incorrectly, if the arguments
were in a request.
*) Bugfix: nginx could not be built on MacOS X.
2005-05-12 22:58:06 +08:00
|
|
|
if (ngx_pool_cleanup_add(cf->pool, ngx_ssl_cleanup_ctx, conf->ssl_ctx)
|
|
|
|
|
== NULL)
|
|
|
|
|
{
|
|
|
|
|
return NGX_CONF_ERROR;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2005-04-08 23:18:55 +08:00
|
|
|
#if 0
|
|
|
|
|
SSL_CTX_set_options(conf->ssl_ctx, SSL_OP_ALL);
|
|
|
|
|
SSL_CTX_set_options(conf->ssl_ctx, SSL_OP_NO_SSLv3);
|
|
|
|
|
SSL_CTX_set_options(conf->ssl_ctx, SSL_OP_SINGLE_DH_USE);
|
|
|
|
|
#endif
|
|
|
|
|
|
nginx-0.1.14-RELEASE import
*) Feature: the autoconfiguration directives:
--http-client-body-temp-path=PATH, --http-proxy-temp-path=PATH, and
--http-fastcgi-temp-path=PATH
*) Change: the directory name for the temporary files with the client
request body is specified by directive client_body_temp_path, by
default it is <prefix>/client_body_temp.
*) Feature: the ngx_http_fastcgi_module and the directives:
fastcgi_pass, fastcgi_root, fastcgi_index, fastcgi_params,
fastcgi_connect_timeout, fastcgi_send_timeout, fastcgi_read_timeout,
fastcgi_send_lowat, fastcgi_header_buffer_size, fastcgi_buffers,
fastcgi_busy_buffers_size, fastcgi_temp_path,
fastcgi_max_temp_file_size, fastcgi_temp_file_write_size,
fastcgi_next_upstream, and fastcgi_x_powered_by.
*) Bugfix: the "[alert] zero size buf" error; the bug had appeared in
0.1.3.
*) Change: the URI must be specified after the host name in the
proxy_pass directive.
*) Change: the %3F symbol in the URI was considered as the argument
string start.
*) Feature: the unix domain sockets support in the
ngx_http_proxy_module.
*) Feature: the ssl_engine and ssl_ciphers directives.
Thanks to Sergey Skvortsov for SSL-accelerator.
2005-01-18 21:03:58 +08:00
|
|
|
if (conf->ciphers.len) {
|
|
|
|
|
if (SSL_CTX_set_cipher_list(conf->ssl_ctx,
|
|
|
|
|
(const char *) conf->ciphers.data) == 0)
|
|
|
|
|
{
|
|
|
|
|
ngx_ssl_error(NGX_LOG_EMERG, cf->log, 0,
|
|
|
|
|
"SSL_CTX_set_cipher_list(\"%V\") failed",
|
|
|
|
|
&conf->ciphers);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2004-07-19 03:11:20 +08:00
|
|
|
if (SSL_CTX_use_certificate_file(conf->ssl_ctx,
|
|
|
|
|
(char *) conf->certificate.data,
|
2004-07-12 05:03:47 +08:00
|
|
|
SSL_FILETYPE_PEM) == 0) {
|
2004-07-17 01:11:43 +08:00
|
|
|
ngx_ssl_error(NGX_LOG_EMERG, cf->log, 0,
|
2004-07-16 14:33:35 +08:00
|
|
|
"SSL_CTX_use_certificate_file(\"%s\") failed",
|
|
|
|
|
conf->certificate.data);
|
2004-07-12 05:03:47 +08:00
|
|
|
return NGX_CONF_ERROR;
|
|
|
|
|
}
|
|
|
|
|
|
2004-07-19 03:11:20 +08:00
|
|
|
if (SSL_CTX_use_PrivateKey_file(conf->ssl_ctx,
|
|
|
|
|
(char *) conf->certificate_key.data,
|
2004-07-12 05:03:47 +08:00
|
|
|
SSL_FILETYPE_PEM) == 0) {
|
2004-07-17 01:11:43 +08:00
|
|
|
ngx_ssl_error(NGX_LOG_EMERG, cf->log, 0,
|
2004-07-16 14:33:35 +08:00
|
|
|
"SSL_CTX_use_PrivateKey_file(\"%s\") failed",
|
|
|
|
|
conf->certificate_key.data);
|
2004-07-12 05:03:47 +08:00
|
|
|
return NGX_CONF_ERROR;
|
|
|
|
|
}
|
|
|
|
|
|
2004-07-08 23:17:47 +08:00
|
|
|
return NGX_CONF_OK;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2004-07-17 01:11:43 +08:00
|
|
|
#if 0
|
|
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
static ngx_int_t
|
|
|
|
|
ngx_http_ssl_init_process(ngx_cycle_t *cycle)
|
2004-07-08 23:17:47 +08:00
|
|
|
{
|
2004-07-16 00:35:51 +08:00
|
|
|
ngx_uint_t i;
|
|
|
|
|
ngx_http_ssl_srv_conf_t *sscf;
|
|
|
|
|
ngx_http_core_srv_conf_t **cscfp;
|
|
|
|
|
ngx_http_core_main_conf_t *cmcf;
|
|
|
|
|
|
|
|
|
|
cmcf = ngx_http_cycle_get_module_main_conf(cycle, ngx_http_core_module);
|
|
|
|
|
|
|
|
|
|
cscfp = cmcf->servers.elts;
|
2004-07-08 23:17:47 +08:00
|
|
|
|
2004-07-16 00:35:51 +08:00
|
|
|
for (i = 0; i < cmcf->servers.nelts; i++) {
|
2004-07-17 01:11:43 +08:00
|
|
|
sscf = cscfp[i]->ctx->srv_conf[ngx_http_ssl_module.ctx_index];
|
2004-07-16 00:35:51 +08:00
|
|
|
|
|
|
|
|
if (sscf->enable) {
|
|
|
|
|
cscfp[i]->recv = ngx_ssl_recv;
|
|
|
|
|
cscfp[i]->send_chain = ngx_ssl_send_chain;
|
|
|
|
|
}
|
|
|
|
|
}
|
2004-07-08 23:17:47 +08:00
|
|
|
|
|
|
|
|
return NGX_OK;
|
|
|
|
|
}
|
2004-07-17 01:11:43 +08:00
|
|
|
|
|
|
|
|
#endif
|