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
|
2012-01-18 23:07:43 +08:00
|
|
|
* Copyright (C) Nginx, Inc.
|
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.3.8-RELEASE import
*) Security: nginx now checks URI got from a backend in
"X-Accel-Redirect" header line or in SSI file for the "/../" paths
and zeroes.
*) Change: nginx now does not treat the empty user name in the
"Authorization" header line as valid one.
*) Feature: the "ssl_session_timeout" directives of the
ngx_http_ssl_module and ngx_imap_ssl_module.
*) Feature: the "auth_http_header" directive of the
ngx_imap_auth_http_module.
*) Feature: the "add_header" directive.
*) Feature: the ngx_http_realip_module.
*) Feature: the new variables to use in the "log_format" directive:
$bytes_sent, $apache_bytes_sent, $status, $time_gmt, $uri,
$request_time, $request_length, $upstream_status,
$upstream_response_time, $gzip_ratio, $uid_got, $uid_set,
$connection, $pipe, and $msec. The parameters in the "%name" form
will be canceled soon.
*) Change: now the false variable values in the "if" directive are the
empty string "" and string starting with "0".
*) Bugfix: while using proxied or FastCGI-server nginx may leave
connections and temporary files with client requests in open state.
*) Bugfix: the worker processes did not flush the buffered logs on
graceful exit.
*) Bugfix: if the request URI was changes by the "rewrite" directive
and the request was proxied in location given by regular expression,
then the incorrect request was transferred to backend; the bug had
appeared in 0.2.6.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" header.
*) Bugfix: nginx may stop to accept requests if the "rtsig" method and
several worker processes were used.
*) Bugfix: the "\"" and "\'" escape symbols were incorrectly handled in
SSI commands.
*) Bugfix: if the response was ended just after the SSI command and
gzipping was used, then the response did not transferred complete or
did not transferred at all.
2005-11-10 01:25:55 +08:00
|
|
|
|
2006-08-10 03:59:45 +08:00
|
|
|
typedef ngx_int_t (*ngx_ssl_variable_handler_pt)(ngx_connection_t *c,
|
|
|
|
ngx_pool_t *pool, ngx_str_t *s);
|
2006-02-08 23:33:12 +08:00
|
|
|
|
|
|
|
|
2011-07-20 23:42:40 +08:00
|
|
|
#define NGX_DEFAULT_CIPHERS "HIGH:!aNULL:!MD5"
|
|
|
|
#define NGX_DEFAULT_ECDH_CURVE "prime256v1"
|
2004-07-08 23:17:47 +08:00
|
|
|
|
|
|
|
|
2006-08-10 03:59:45 +08:00
|
|
|
static ngx_int_t ngx_http_ssl_static_variable(ngx_http_request_t *r,
|
2006-05-07 00:28:56 +08:00
|
|
|
ngx_http_variable_value_t *v, uintptr_t data);
|
2006-08-10 03:59:45 +08:00
|
|
|
static ngx_int_t ngx_http_ssl_variable(ngx_http_request_t *r,
|
2006-05-07 00:28:56 +08:00
|
|
|
ngx_http_variable_value_t *v, uintptr_t data);
|
2006-02-08 23:33:12 +08:00
|
|
|
|
|
|
|
static ngx_int_t ngx_http_ssl_add_variables(ngx_conf_t *cf);
|
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
|
|
|
|
2008-09-01 22:19:01 +08:00
|
|
|
static char *ngx_http_ssl_enable(ngx_conf_t *cf, ngx_command_t *cmd,
|
|
|
|
void *conf);
|
2007-01-03 07:55:05 +08:00
|
|
|
static char *ngx_http_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd,
|
|
|
|
void *conf);
|
|
|
|
|
2004-07-08 23:17:47 +08:00
|
|
|
|
2005-09-30 22:41:25 +08:00
|
|
|
static ngx_conf_bitmask_t ngx_http_ssl_protocols[] = {
|
|
|
|
{ ngx_string("SSLv2"), NGX_SSL_SSLv2 },
|
|
|
|
{ ngx_string("SSLv3"), NGX_SSL_SSLv3 },
|
|
|
|
{ ngx_string("TLSv1"), NGX_SSL_TLSv1 },
|
2012-01-11 19:15:00 +08:00
|
|
|
{ ngx_string("TLSv1.1"), NGX_SSL_TLSv1_1 },
|
|
|
|
{ ngx_string("TLSv1.2"), NGX_SSL_TLSv1_2 },
|
2005-09-30 22:41:25 +08:00
|
|
|
{ ngx_null_string, 0 }
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2008-07-29 22:29:02 +08:00
|
|
|
static ngx_conf_enum_t ngx_http_ssl_verify[] = {
|
|
|
|
{ ngx_string("off"), 0 },
|
|
|
|
{ ngx_string("on"), 1 },
|
2009-07-23 01:41:42 +08:00
|
|
|
{ ngx_string("optional"), 2 },
|
2008-07-29 22:29:02 +08:00
|
|
|
{ ngx_null_string, 0 }
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2004-07-17 01:11:43 +08:00
|
|
|
static ngx_command_t ngx_http_ssl_commands[] = {
|
2004-07-08 23:17:47 +08:00
|
|
|
|
2004-07-16 00:35:51 +08:00
|
|
|
{ ngx_string("ssl"),
|
2006-01-16 22:56:53 +08:00
|
|
|
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
|
2008-09-01 22:19:01 +08:00
|
|
|
ngx_http_ssl_enable,
|
2004-07-08 23:17:47 +08:00
|
|
|
NGX_HTTP_SRV_CONF_OFFSET,
|
|
|
|
offsetof(ngx_http_ssl_srv_conf_t, enable),
|
|
|
|
NULL },
|
|
|
|
|
|
|
|
{ ngx_string("ssl_certificate"),
|
2006-01-16 22:56:53 +08:00
|
|
|
NGX_HTTP_MAIN_CONF|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"),
|
2006-01-16 22:56:53 +08:00
|
|
|
NGX_HTTP_MAIN_CONF|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 },
|
|
|
|
|
2008-06-16 13:51:32 +08:00
|
|
|
{ ngx_string("ssl_dhparam"),
|
|
|
|
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
|
|
|
|
ngx_conf_set_str_slot,
|
|
|
|
NGX_HTTP_SRV_CONF_OFFSET,
|
|
|
|
offsetof(ngx_http_ssl_srv_conf_t, dhparam),
|
|
|
|
NULL },
|
|
|
|
|
2011-07-20 23:42:40 +08:00
|
|
|
{ ngx_string("ssl_ecdh_curve"),
|
|
|
|
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
|
|
|
|
ngx_conf_set_str_slot,
|
|
|
|
NGX_HTTP_SRV_CONF_OFFSET,
|
|
|
|
offsetof(ngx_http_ssl_srv_conf_t, ecdh_curve),
|
|
|
|
NULL },
|
|
|
|
|
2005-09-30 22:41:25 +08:00
|
|
|
{ ngx_string("ssl_protocols"),
|
2005-10-19 20:33:58 +08:00
|
|
|
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_1MORE,
|
2005-09-30 22:41:25 +08:00
|
|
|
ngx_conf_set_bitmask_slot,
|
|
|
|
NGX_HTTP_SRV_CONF_OFFSET,
|
|
|
|
offsetof(ngx_http_ssl_srv_conf_t, protocols),
|
|
|
|
&ngx_http_ssl_protocols },
|
|
|
|
|
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"),
|
2005-10-19 20:33:58 +08:00
|
|
|
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
|
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_set_str_slot,
|
|
|
|
NGX_HTTP_SRV_CONF_OFFSET,
|
|
|
|
offsetof(ngx_http_ssl_srv_conf_t, ciphers),
|
|
|
|
NULL },
|
|
|
|
|
2006-05-07 00:28:56 +08:00
|
|
|
{ ngx_string("ssl_verify_client"),
|
2011-11-14 17:12:15 +08:00
|
|
|
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
|
2008-07-29 22:29:02 +08:00
|
|
|
ngx_conf_set_enum_slot,
|
2006-05-07 00:28:56 +08:00
|
|
|
NGX_HTTP_SRV_CONF_OFFSET,
|
|
|
|
offsetof(ngx_http_ssl_srv_conf_t, verify),
|
2008-07-29 22:29:02 +08:00
|
|
|
&ngx_http_ssl_verify },
|
2006-05-07 00:28:56 +08:00
|
|
|
|
|
|
|
{ ngx_string("ssl_verify_depth"),
|
|
|
|
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_1MORE,
|
|
|
|
ngx_conf_set_num_slot,
|
|
|
|
NGX_HTTP_SRV_CONF_OFFSET,
|
|
|
|
offsetof(ngx_http_ssl_srv_conf_t, verify_depth),
|
|
|
|
NULL },
|
|
|
|
|
|
|
|
{ ngx_string("ssl_client_certificate"),
|
|
|
|
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
|
|
|
|
ngx_conf_set_str_slot,
|
|
|
|
NGX_HTTP_SRV_CONF_OFFSET,
|
|
|
|
offsetof(ngx_http_ssl_srv_conf_t, client_certificate),
|
|
|
|
NULL },
|
|
|
|
|
2012-10-01 20:39:36 +08:00
|
|
|
{ ngx_string("ssl_trusted_certificate"),
|
|
|
|
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
|
|
|
|
ngx_conf_set_str_slot,
|
|
|
|
NGX_HTTP_SRV_CONF_OFFSET,
|
|
|
|
offsetof(ngx_http_ssl_srv_conf_t, trusted_certificate),
|
|
|
|
NULL },
|
|
|
|
|
2005-09-30 22:41:25 +08:00
|
|
|
{ ngx_string("ssl_prefer_server_ciphers"),
|
|
|
|
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
|
|
|
|
ngx_conf_set_flag_slot,
|
|
|
|
NGX_HTTP_SRV_CONF_OFFSET,
|
|
|
|
offsetof(ngx_http_ssl_srv_conf_t, prefer_server_ciphers),
|
|
|
|
NULL },
|
|
|
|
|
2007-01-03 07:55:05 +08:00
|
|
|
{ ngx_string("ssl_session_cache"),
|
|
|
|
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE12,
|
|
|
|
ngx_http_ssl_session_cache,
|
|
|
|
NGX_HTTP_SRV_CONF_OFFSET,
|
|
|
|
0,
|
|
|
|
NULL },
|
|
|
|
|
nginx-0.3.8-RELEASE import
*) Security: nginx now checks URI got from a backend in
"X-Accel-Redirect" header line or in SSI file for the "/../" paths
and zeroes.
*) Change: nginx now does not treat the empty user name in the
"Authorization" header line as valid one.
*) Feature: the "ssl_session_timeout" directives of the
ngx_http_ssl_module and ngx_imap_ssl_module.
*) Feature: the "auth_http_header" directive of the
ngx_imap_auth_http_module.
*) Feature: the "add_header" directive.
*) Feature: the ngx_http_realip_module.
*) Feature: the new variables to use in the "log_format" directive:
$bytes_sent, $apache_bytes_sent, $status, $time_gmt, $uri,
$request_time, $request_length, $upstream_status,
$upstream_response_time, $gzip_ratio, $uid_got, $uid_set,
$connection, $pipe, and $msec. The parameters in the "%name" form
will be canceled soon.
*) Change: now the false variable values in the "if" directive are the
empty string "" and string starting with "0".
*) Bugfix: while using proxied or FastCGI-server nginx may leave
connections and temporary files with client requests in open state.
*) Bugfix: the worker processes did not flush the buffered logs on
graceful exit.
*) Bugfix: if the request URI was changes by the "rewrite" directive
and the request was proxied in location given by regular expression,
then the incorrect request was transferred to backend; the bug had
appeared in 0.2.6.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" header.
*) Bugfix: nginx may stop to accept requests if the "rtsig" method and
several worker processes were used.
*) Bugfix: the "\"" and "\'" escape symbols were incorrectly handled in
SSI commands.
*) Bugfix: if the response was ended just after the SSI command and
gzipping was used, then the response did not transferred complete or
did not transferred at all.
2005-11-10 01:25:55 +08:00
|
|
|
{ ngx_string("ssl_session_timeout"),
|
|
|
|
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
|
|
|
|
ngx_conf_set_sec_slot,
|
|
|
|
NGX_HTTP_SRV_CONF_OFFSET,
|
|
|
|
offsetof(ngx_http_ssl_srv_conf_t, session_timeout),
|
|
|
|
NULL },
|
|
|
|
|
2009-07-23 20:21:26 +08:00
|
|
|
{ ngx_string("ssl_crl"),
|
|
|
|
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
|
|
|
|
ngx_conf_set_str_slot,
|
|
|
|
NGX_HTTP_SRV_CONF_OFFSET,
|
|
|
|
offsetof(ngx_http_ssl_srv_conf_t, crl),
|
|
|
|
NULL },
|
|
|
|
|
2012-10-01 20:41:08 +08:00
|
|
|
{ ngx_string("ssl_stapling"),
|
|
|
|
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
|
|
|
|
ngx_conf_set_flag_slot,
|
|
|
|
NGX_HTTP_SRV_CONF_OFFSET,
|
|
|
|
offsetof(ngx_http_ssl_srv_conf_t, stapling),
|
|
|
|
NULL },
|
|
|
|
|
|
|
|
{ ngx_string("ssl_stapling_file"),
|
|
|
|
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
|
|
|
|
ngx_conf_set_str_slot,
|
|
|
|
NGX_HTTP_SRV_CONF_OFFSET,
|
|
|
|
offsetof(ngx_http_ssl_srv_conf_t, stapling_file),
|
|
|
|
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 = {
|
2006-02-08 23:33:12 +08:00
|
|
|
ngx_http_ssl_add_variables, /* preconfiguration */
|
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, /* postconfiguration */
|
2004-07-08 23:17:47 +08:00
|
|
|
|
2005-09-08 22:36:09 +08:00
|
|
|
NULL, /* create main configuration */
|
|
|
|
NULL, /* 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 */
|
2005-09-08 22:36:09 +08:00
|
|
|
NULL, /* init master */
|
2004-07-16 00:35:51 +08:00
|
|
|
NULL, /* init module */
|
2005-09-08 22:36:09 +08:00
|
|
|
NULL, /* init process */
|
|
|
|
NULL, /* init thread */
|
|
|
|
NULL, /* exit thread */
|
|
|
|
NULL, /* exit process */
|
|
|
|
NULL, /* exit master */
|
|
|
|
NGX_MODULE_V1_PADDING
|
2004-07-08 23:17:47 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2006-02-08 23:33:12 +08:00
|
|
|
static ngx_http_variable_t ngx_http_ssl_vars[] = {
|
|
|
|
|
2006-08-10 03:59:45 +08:00
|
|
|
{ ngx_string("ssl_protocol"), NULL, ngx_http_ssl_static_variable,
|
2007-10-15 02:56:15 +08:00
|
|
|
(uintptr_t) ngx_ssl_get_protocol, NGX_HTTP_VAR_CHANGEABLE, 0 },
|
2006-02-08 23:33:12 +08:00
|
|
|
|
2006-08-10 03:59:45 +08:00
|
|
|
{ ngx_string("ssl_cipher"), NULL, ngx_http_ssl_static_variable,
|
2007-10-15 02:56:15 +08:00
|
|
|
(uintptr_t) ngx_ssl_get_cipher_name, NGX_HTTP_VAR_CHANGEABLE, 0 },
|
2006-02-08 23:33:12 +08:00
|
|
|
|
2009-09-24 22:45:28 +08:00
|
|
|
{ ngx_string("ssl_session_id"), NULL, ngx_http_ssl_variable,
|
|
|
|
(uintptr_t) ngx_ssl_get_session_id, NGX_HTTP_VAR_CHANGEABLE, 0 },
|
|
|
|
|
2008-06-16 13:54:18 +08:00
|
|
|
{ ngx_string("ssl_client_cert"), NULL, ngx_http_ssl_variable,
|
|
|
|
(uintptr_t) ngx_ssl_get_certificate, NGX_HTTP_VAR_CHANGEABLE, 0 },
|
|
|
|
|
2008-07-29 22:29:02 +08:00
|
|
|
{ ngx_string("ssl_client_raw_cert"), NULL, ngx_http_ssl_variable,
|
|
|
|
(uintptr_t) ngx_ssl_get_raw_certificate,
|
|
|
|
NGX_HTTP_VAR_CHANGEABLE, 0 },
|
|
|
|
|
2006-08-10 03:59:45 +08:00
|
|
|
{ ngx_string("ssl_client_s_dn"), NULL, ngx_http_ssl_variable,
|
2007-10-15 02:56:15 +08:00
|
|
|
(uintptr_t) ngx_ssl_get_subject_dn, NGX_HTTP_VAR_CHANGEABLE, 0 },
|
2006-05-07 00:28:56 +08:00
|
|
|
|
2006-08-10 03:59:45 +08:00
|
|
|
{ ngx_string("ssl_client_i_dn"), NULL, ngx_http_ssl_variable,
|
2007-10-15 02:56:15 +08:00
|
|
|
(uintptr_t) ngx_ssl_get_issuer_dn, NGX_HTTP_VAR_CHANGEABLE, 0 },
|
2006-08-10 03:59:45 +08:00
|
|
|
|
|
|
|
{ ngx_string("ssl_client_serial"), NULL, ngx_http_ssl_variable,
|
2007-10-15 02:56:15 +08:00
|
|
|
(uintptr_t) ngx_ssl_get_serial_number, NGX_HTTP_VAR_CHANGEABLE, 0 },
|
2006-05-07 00:28:56 +08:00
|
|
|
|
2009-07-23 01:41:42 +08:00
|
|
|
{ ngx_string("ssl_client_verify"), NULL, ngx_http_ssl_variable,
|
|
|
|
(uintptr_t) ngx_ssl_get_client_verify, NGX_HTTP_VAR_CHANGEABLE, 0 },
|
|
|
|
|
2006-04-19 23:30:56 +08:00
|
|
|
{ ngx_null_string, NULL, NULL, 0, 0, 0 }
|
2006-02-08 23:33:12 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2007-01-03 23:25:40 +08:00
|
|
|
static ngx_str_t ngx_http_ssl_sess_id_ctx = ngx_string("HTTP");
|
2007-01-03 07:55:05 +08:00
|
|
|
|
|
|
|
|
2006-02-08 23:33:12 +08:00
|
|
|
static ngx_int_t
|
2006-08-10 03:59:45 +08:00
|
|
|
ngx_http_ssl_static_variable(ngx_http_request_t *r,
|
2006-02-08 23:33:12 +08:00
|
|
|
ngx_http_variable_value_t *v, uintptr_t data)
|
|
|
|
{
|
2006-08-10 03:59:45 +08:00
|
|
|
ngx_ssl_variable_handler_pt handler = (ngx_ssl_variable_handler_pt) data;
|
2006-02-08 23:33:12 +08:00
|
|
|
|
2007-07-17 17:23:23 +08:00
|
|
|
size_t len;
|
|
|
|
ngx_str_t s;
|
2006-02-08 23:33:12 +08:00
|
|
|
|
|
|
|
if (r->connection->ssl) {
|
|
|
|
|
2007-07-17 17:23:23 +08:00
|
|
|
(void) handler(r->connection, NULL, &s);
|
|
|
|
|
|
|
|
v->data = s.data;
|
2006-02-08 23:33:12 +08:00
|
|
|
|
2006-08-10 03:59:45 +08:00
|
|
|
for (len = 0; v->data[len]; len++) { /* void */ }
|
2006-02-08 23:33:12 +08:00
|
|
|
|
|
|
|
v->len = len;
|
|
|
|
v->valid = 1;
|
2007-10-15 02:56:15 +08:00
|
|
|
v->no_cacheable = 0;
|
2006-02-08 23:33:12 +08:00
|
|
|
v->not_found = 0;
|
|
|
|
|
|
|
|
return NGX_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
v->not_found = 1;
|
|
|
|
|
|
|
|
return NGX_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-05-07 00:28:56 +08:00
|
|
|
static ngx_int_t
|
2006-08-10 03:59:45 +08:00
|
|
|
ngx_http_ssl_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v,
|
2006-05-07 00:28:56 +08:00
|
|
|
uintptr_t data)
|
|
|
|
{
|
2006-08-10 03:59:45 +08:00
|
|
|
ngx_ssl_variable_handler_pt handler = (ngx_ssl_variable_handler_pt) data;
|
2006-05-07 00:28:56 +08:00
|
|
|
|
2007-07-17 17:23:23 +08:00
|
|
|
ngx_str_t s;
|
|
|
|
|
2006-05-07 00:28:56 +08:00
|
|
|
if (r->connection->ssl) {
|
2007-07-17 17:23:23 +08:00
|
|
|
|
|
|
|
if (handler(r->connection, r->pool, &s) != NGX_OK) {
|
2006-05-07 00:28:56 +08:00
|
|
|
return NGX_ERROR;
|
|
|
|
}
|
|
|
|
|
2007-07-17 17:23:23 +08:00
|
|
|
v->len = s.len;
|
|
|
|
v->data = s.data;
|
|
|
|
|
2006-05-07 00:28:56 +08:00
|
|
|
if (v->len) {
|
|
|
|
v->valid = 1;
|
2007-10-15 02:56:15 +08:00
|
|
|
v->no_cacheable = 0;
|
2006-05-07 00:28:56 +08:00
|
|
|
v->not_found = 0;
|
|
|
|
|
|
|
|
return NGX_OK;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
v->not_found = 1;
|
|
|
|
|
|
|
|
return NGX_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-02-08 23:33:12 +08:00
|
|
|
static ngx_int_t
|
|
|
|
ngx_http_ssl_add_variables(ngx_conf_t *cf)
|
|
|
|
{
|
|
|
|
ngx_http_variable_t *var, *v;
|
|
|
|
|
|
|
|
for (v = ngx_http_ssl_vars; v->name.len; v++) {
|
|
|
|
var = ngx_http_add_variable(cf, &v->name, v->flags);
|
|
|
|
if (var == NULL) {
|
|
|
|
return NGX_ERROR;
|
|
|
|
}
|
|
|
|
|
2006-04-19 23:30:56 +08:00
|
|
|
var->get_handler = v->get_handler;
|
2006-02-08 23:33:12 +08:00
|
|
|
var->data = v->data;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NGX_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
|
|
|
{
|
2007-01-03 07:50:10 +08:00
|
|
|
ngx_http_ssl_srv_conf_t *sscf;
|
2004-07-08 23:17:47 +08:00
|
|
|
|
2007-01-03 07:50:10 +08:00
|
|
|
sscf = ngx_pcalloc(cf->pool, sizeof(ngx_http_ssl_srv_conf_t));
|
|
|
|
if (sscf == NULL) {
|
2009-06-03 00:09:44 +08:00
|
|
|
return NULL;
|
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
|
|
|
/*
|
|
|
|
* set by ngx_pcalloc():
|
|
|
|
*
|
2007-01-03 07:50:10 +08:00
|
|
|
* sscf->protocols = 0;
|
2008-06-16 13:51:32 +08:00
|
|
|
* sscf->certificate = { 0, NULL };
|
|
|
|
* sscf->certificate_key = { 0, NULL };
|
|
|
|
* sscf->dhparam = { 0, NULL };
|
2011-07-20 23:42:40 +08:00
|
|
|
* sscf->ecdh_curve = { 0, NULL };
|
2008-06-16 13:51:32 +08:00
|
|
|
* sscf->client_certificate = { 0, NULL };
|
2012-10-01 20:39:36 +08:00
|
|
|
* sscf->trusted_certificate = { 0, NULL };
|
2009-07-23 20:21:26 +08:00
|
|
|
* sscf->crl = { 0, NULL };
|
2010-05-14 17:56:37 +08:00
|
|
|
* sscf->ciphers = { 0, NULL };
|
2007-01-03 07:55:05 +08:00
|
|
|
* sscf->shm_zone = NULL;
|
2012-10-01 20:41:08 +08:00
|
|
|
* sscf->stapling_file = { 0, 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
|
|
|
*/
|
|
|
|
|
2007-01-03 07:50:10 +08:00
|
|
|
sscf->enable = NGX_CONF_UNSET;
|
2008-07-29 22:29:02 +08:00
|
|
|
sscf->prefer_server_ciphers = NGX_CONF_UNSET;
|
2009-04-16 03:28:10 +08:00
|
|
|
sscf->verify = NGX_CONF_UNSET_UINT;
|
|
|
|
sscf->verify_depth = NGX_CONF_UNSET_UINT;
|
2007-01-03 07:55:05 +08:00
|
|
|
sscf->builtin_session_cache = NGX_CONF_UNSET;
|
|
|
|
sscf->session_timeout = NGX_CONF_UNSET;
|
2012-10-01 20:41:08 +08:00
|
|
|
sscf->stapling = NGX_CONF_UNSET;
|
2004-07-08 23:17:47 +08:00
|
|
|
|
2007-01-03 07:50:10 +08:00
|
|
|
return sscf;
|
2004-07-08 23:17:47 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
2005-10-19 20:33:58 +08:00
|
|
|
ngx_pool_cleanup_t *cln;
|
|
|
|
|
2011-10-31 17:57:14 +08:00
|
|
|
if (conf->enable == NGX_CONF_UNSET) {
|
|
|
|
if (prev->enable == NGX_CONF_UNSET) {
|
|
|
|
conf->enable = 0;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
conf->enable = prev->enable;
|
|
|
|
conf->file = prev->file;
|
|
|
|
conf->line = prev->line;
|
|
|
|
}
|
|
|
|
}
|
2004-07-08 23:17:47 +08:00
|
|
|
|
nginx-0.3.8-RELEASE import
*) Security: nginx now checks URI got from a backend in
"X-Accel-Redirect" header line or in SSI file for the "/../" paths
and zeroes.
*) Change: nginx now does not treat the empty user name in the
"Authorization" header line as valid one.
*) Feature: the "ssl_session_timeout" directives of the
ngx_http_ssl_module and ngx_imap_ssl_module.
*) Feature: the "auth_http_header" directive of the
ngx_imap_auth_http_module.
*) Feature: the "add_header" directive.
*) Feature: the ngx_http_realip_module.
*) Feature: the new variables to use in the "log_format" directive:
$bytes_sent, $apache_bytes_sent, $status, $time_gmt, $uri,
$request_time, $request_length, $upstream_status,
$upstream_response_time, $gzip_ratio, $uid_got, $uid_set,
$connection, $pipe, and $msec. The parameters in the "%name" form
will be canceled soon.
*) Change: now the false variable values in the "if" directive are the
empty string "" and string starting with "0".
*) Bugfix: while using proxied or FastCGI-server nginx may leave
connections and temporary files with client requests in open state.
*) Bugfix: the worker processes did not flush the buffered logs on
graceful exit.
*) Bugfix: if the request URI was changes by the "rewrite" directive
and the request was proxied in location given by regular expression,
then the incorrect request was transferred to backend; the bug had
appeared in 0.2.6.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" header.
*) Bugfix: nginx may stop to accept requests if the "rtsig" method and
several worker processes were used.
*) Bugfix: the "\"" and "\'" escape symbols were incorrectly handled in
SSI commands.
*) Bugfix: if the response was ended just after the SSI command and
gzipping was used, then the response did not transferred complete or
did not transferred at all.
2005-11-10 01:25:55 +08:00
|
|
|
ngx_conf_merge_value(conf->session_timeout,
|
|
|
|
prev->session_timeout, 300);
|
|
|
|
|
2005-09-30 22:41:25 +08:00
|
|
|
ngx_conf_merge_value(conf->prefer_server_ciphers,
|
|
|
|
prev->prefer_server_ciphers, 0);
|
|
|
|
|
|
|
|
ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols,
|
2012-01-11 19:15:00 +08:00
|
|
|
(NGX_CONF_BITMASK_SET|NGX_SSL_SSLv3|NGX_SSL_TLSv1
|
|
|
|
|NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2));
|
2005-09-30 22:41:25 +08:00
|
|
|
|
2008-07-29 22:29:02 +08:00
|
|
|
ngx_conf_merge_uint_value(conf->verify, prev->verify, 0);
|
|
|
|
ngx_conf_merge_uint_value(conf->verify_depth, prev->verify_depth, 1);
|
2006-05-07 00:28:56 +08:00
|
|
|
|
2008-09-01 22:19:01 +08:00
|
|
|
ngx_conf_merge_str_value(conf->certificate, prev->certificate, "");
|
|
|
|
ngx_conf_merge_str_value(conf->certificate_key, prev->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
|
|
|
|
2008-06-16 13:51:32 +08:00
|
|
|
ngx_conf_merge_str_value(conf->dhparam, prev->dhparam, "");
|
|
|
|
|
2006-05-07 00:28:56 +08:00
|
|
|
ngx_conf_merge_str_value(conf->client_certificate, prev->client_certificate,
|
|
|
|
"");
|
2012-10-01 20:39:36 +08:00
|
|
|
ngx_conf_merge_str_value(conf->trusted_certificate,
|
|
|
|
prev->trusted_certificate, "");
|
2009-07-23 20:21:26 +08:00
|
|
|
ngx_conf_merge_str_value(conf->crl, prev->crl, "");
|
2006-05-07 00:28:56 +08:00
|
|
|
|
2011-07-20 23:42:40 +08:00
|
|
|
ngx_conf_merge_str_value(conf->ecdh_curve, prev->ecdh_curve,
|
|
|
|
NGX_DEFAULT_ECDH_CURVE);
|
|
|
|
|
2008-07-29 22:31:03 +08:00
|
|
|
ngx_conf_merge_str_value(conf->ciphers, prev->ciphers, NGX_DEFAULT_CIPHERS);
|
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
|
|
|
|
2012-10-01 20:41:08 +08:00
|
|
|
ngx_conf_merge_value(conf->stapling, prev->stapling, 0);
|
|
|
|
ngx_conf_merge_str_value(conf->stapling_file, prev->stapling_file, "");
|
2004-07-12 05:03:47 +08:00
|
|
|
|
2005-09-30 22:41:25 +08:00
|
|
|
conf->ssl.log = cf->log;
|
2004-07-12 05:03:47 +08:00
|
|
|
|
2008-09-01 22:19:01 +08:00
|
|
|
if (conf->enable) {
|
|
|
|
|
|
|
|
if (conf->certificate.len == 0) {
|
|
|
|
ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
|
|
|
|
"no \"ssl_certificate\" is defined for "
|
|
|
|
"the \"ssl\" directive in %s:%ui",
|
|
|
|
conf->file, conf->line);
|
|
|
|
return NGX_CONF_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (conf->certificate_key.len == 0) {
|
|
|
|
ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
|
|
|
|
"no \"ssl_certificate_key\" is defined for "
|
|
|
|
"the \"ssl\" directive in %s:%ui",
|
|
|
|
conf->file, conf->line);
|
|
|
|
return NGX_CONF_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
if (conf->certificate.len == 0) {
|
|
|
|
return NGX_CONF_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (conf->certificate_key.len == 0) {
|
|
|
|
ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
|
|
|
|
"no \"ssl_certificate_key\" is defined "
|
|
|
|
"for certificate \"%V\"", &conf->certificate);
|
|
|
|
return NGX_CONF_ERROR;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-01-03 07:37:25 +08:00
|
|
|
if (ngx_ssl_create(&conf->ssl, conf->protocols, conf) != NGX_OK) {
|
2004-07-12 05:03:47 +08:00
|
|
|
return NGX_CONF_ERROR;
|
|
|
|
}
|
|
|
|
|
2007-05-29 23:21:09 +08:00
|
|
|
#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
|
|
|
|
|
|
|
|
if (SSL_CTX_set_tlsext_servername_callback(conf->ssl.ctx,
|
|
|
|
ngx_http_ssl_servername)
|
|
|
|
== 0)
|
|
|
|
{
|
2009-09-18 17:10:16 +08:00
|
|
|
ngx_log_error(NGX_LOG_WARN, cf->log, 0,
|
2009-10-19 20:33:09 +08:00
|
|
|
"nginx was built with SNI support, however, now it is linked "
|
2009-09-18 17:10:16 +08:00
|
|
|
"dynamically to an OpenSSL library which has no tlsext support, "
|
|
|
|
"therefore SNI is not available");
|
2007-05-29 23:21:09 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
2005-10-19 20:33:58 +08:00
|
|
|
cln = ngx_pool_cleanup_add(cf->pool, 0);
|
|
|
|
if (cln == NULL) {
|
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
|
|
|
return NGX_CONF_ERROR;
|
|
|
|
}
|
|
|
|
|
2005-10-19 20:33:58 +08:00
|
|
|
cln->handler = ngx_ssl_cleanup_ctx;
|
|
|
|
cln->data = &conf->ssl;
|
|
|
|
|
|
|
|
if (ngx_ssl_certificate(cf, &conf->ssl, &conf->certificate,
|
2007-01-03 07:41:54 +08:00
|
|
|
&conf->certificate_key)
|
|
|
|
!= NGX_OK)
|
2005-07-14 20:51:53 +08:00
|
|
|
{
|
2004-07-12 05:03:47 +08:00
|
|
|
return NGX_CONF_ERROR;
|
|
|
|
}
|
|
|
|
|
2005-09-30 22:41:25 +08:00
|
|
|
if (SSL_CTX_set_cipher_list(conf->ssl.ctx,
|
2005-10-19 20:33:58 +08:00
|
|
|
(const char *) conf->ciphers.data)
|
|
|
|
== 0)
|
2005-07-14 20:51:53 +08:00
|
|
|
{
|
2004-07-17 01:11:43 +08:00
|
|
|
ngx_ssl_error(NGX_LOG_EMERG, cf->log, 0,
|
2005-09-30 22:41:25 +08:00
|
|
|
"SSL_CTX_set_cipher_list(\"%V\") failed",
|
|
|
|
&conf->ciphers);
|
2004-07-12 05:03:47 +08:00
|
|
|
}
|
|
|
|
|
2006-05-07 00:28:56 +08:00
|
|
|
if (conf->verify) {
|
2008-07-29 22:29:02 +08:00
|
|
|
|
|
|
|
if (conf->client_certificate.len == 0) {
|
|
|
|
ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
|
|
|
|
"no ssl_client_certificate for ssl_client_verify");
|
|
|
|
return NGX_CONF_ERROR;
|
|
|
|
}
|
|
|
|
|
2006-08-10 03:59:45 +08:00
|
|
|
if (ngx_ssl_client_certificate(cf, &conf->ssl,
|
2007-01-03 07:41:54 +08:00
|
|
|
&conf->client_certificate,
|
|
|
|
conf->verify_depth)
|
2006-08-10 03:59:45 +08:00
|
|
|
!= NGX_OK)
|
|
|
|
{
|
|
|
|
return NGX_CONF_ERROR;
|
2006-05-07 00:28:56 +08:00
|
|
|
}
|
2012-10-01 20:39:36 +08:00
|
|
|
}
|
2009-07-23 20:21:26 +08:00
|
|
|
|
2012-10-01 20:39:36 +08:00
|
|
|
if (ngx_ssl_trusted_certificate(cf, &conf->ssl,
|
|
|
|
&conf->trusted_certificate,
|
|
|
|
conf->verify_depth)
|
|
|
|
!= NGX_OK)
|
|
|
|
{
|
|
|
|
return NGX_CONF_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ngx_ssl_crl(cf, &conf->ssl, &conf->crl) != NGX_OK) {
|
|
|
|
return NGX_CONF_ERROR;
|
2006-05-07 00:28:56 +08:00
|
|
|
}
|
|
|
|
|
2005-09-30 22:41:25 +08:00
|
|
|
if (conf->prefer_server_ciphers) {
|
|
|
|
SSL_CTX_set_options(conf->ssl.ctx, SSL_OP_CIPHER_SERVER_PREFERENCE);
|
|
|
|
}
|
2005-09-23 19:02:22 +08:00
|
|
|
|
2005-09-30 22:41:25 +08:00
|
|
|
/* a temporary 512-bit RSA key is required for export versions of MSIE */
|
2011-07-20 20:59:24 +08:00
|
|
|
SSL_CTX_set_tmp_rsa_callback(conf->ssl.ctx, ngx_ssl_rsa512_key_callback);
|
2005-09-23 19:02:22 +08:00
|
|
|
|
2008-06-16 13:51:32 +08:00
|
|
|
if (ngx_ssl_dhparam(cf, &conf->ssl, &conf->dhparam) != NGX_OK) {
|
|
|
|
return NGX_CONF_ERROR;
|
|
|
|
}
|
|
|
|
|
2011-07-20 23:42:40 +08:00
|
|
|
if (ngx_ssl_ecdh_curve(cf, &conf->ssl, &conf->ecdh_curve) != NGX_OK) {
|
|
|
|
return NGX_CONF_ERROR;
|
|
|
|
}
|
|
|
|
|
2007-01-03 07:55:05 +08:00
|
|
|
ngx_conf_merge_value(conf->builtin_session_cache,
|
2008-05-26 15:14:13 +08:00
|
|
|
prev->builtin_session_cache, NGX_SSL_NONE_SCACHE);
|
2007-01-03 07:55:05 +08:00
|
|
|
|
|
|
|
if (conf->shm_zone == NULL) {
|
|
|
|
conf->shm_zone = prev->shm_zone;
|
|
|
|
}
|
|
|
|
|
2007-01-03 23:25:40 +08:00
|
|
|
if (ngx_ssl_session_cache(&conf->ssl, &ngx_http_ssl_sess_id_ctx,
|
|
|
|
conf->builtin_session_cache,
|
|
|
|
conf->shm_zone, conf->session_timeout)
|
|
|
|
!= NGX_OK)
|
2007-01-03 07:55:05 +08:00
|
|
|
{
|
2007-01-03 23:25:40 +08:00
|
|
|
return NGX_CONF_ERROR;
|
2007-01-03 07:55:05 +08:00
|
|
|
}
|
|
|
|
|
2012-10-01 20:41:08 +08:00
|
|
|
if (conf->stapling
|
|
|
|
&& ngx_ssl_stapling(cf, &conf->ssl, &conf->stapling_file) != NGX_OK)
|
|
|
|
{
|
|
|
|
return NGX_CONF_ERROR;
|
|
|
|
}
|
|
|
|
|
2007-01-03 07:55:05 +08:00
|
|
|
return NGX_CONF_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-09-01 22:19:01 +08:00
|
|
|
static char *
|
|
|
|
ngx_http_ssl_enable(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
|
|
|
|
{
|
|
|
|
ngx_http_ssl_srv_conf_t *sscf = conf;
|
|
|
|
|
|
|
|
char *rv;
|
|
|
|
|
|
|
|
rv = ngx_conf_set_flag_slot(cf, cmd, conf);
|
|
|
|
|
|
|
|
if (rv != NGX_CONF_OK) {
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
sscf->file = cf->conf_file->file.name.data;
|
|
|
|
sscf->line = cf->conf_file->line;
|
|
|
|
|
|
|
|
return NGX_CONF_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-01-03 07:55:05 +08:00
|
|
|
static char *
|
|
|
|
ngx_http_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
|
|
|
|
{
|
|
|
|
ngx_http_ssl_srv_conf_t *sscf = conf;
|
|
|
|
|
|
|
|
size_t len;
|
|
|
|
ngx_str_t *value, name, size;
|
|
|
|
ngx_int_t n;
|
|
|
|
ngx_uint_t i, j;
|
|
|
|
|
|
|
|
value = cf->args->elts;
|
|
|
|
|
|
|
|
for (i = 1; i < cf->args->nelts; i++) {
|
|
|
|
|
2007-12-27 04:27:22 +08:00
|
|
|
if (ngx_strcmp(value[i].data, "off") == 0) {
|
|
|
|
sscf->builtin_session_cache = NGX_SSL_NO_SCACHE;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2008-05-26 15:14:13 +08:00
|
|
|
if (ngx_strcmp(value[i].data, "none") == 0) {
|
|
|
|
sscf->builtin_session_cache = NGX_SSL_NONE_SCACHE;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2007-01-03 07:55:05 +08:00
|
|
|
if (ngx_strcmp(value[i].data, "builtin") == 0) {
|
2007-01-03 23:25:40 +08:00
|
|
|
sscf->builtin_session_cache = NGX_SSL_DFLT_BUILTIN_SCACHE;
|
2007-01-03 07:55:05 +08:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (value[i].len > sizeof("builtin:") - 1
|
|
|
|
&& ngx_strncmp(value[i].data, "builtin:", sizeof("builtin:") - 1)
|
|
|
|
== 0)
|
|
|
|
{
|
|
|
|
n = ngx_atoi(value[i].data + sizeof("builtin:") - 1,
|
|
|
|
value[i].len - (sizeof("builtin:") - 1));
|
|
|
|
|
|
|
|
if (n == NGX_ERROR) {
|
|
|
|
goto invalid;
|
|
|
|
}
|
|
|
|
|
|
|
|
sscf->builtin_session_cache = n;
|
|
|
|
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (value[i].len > sizeof("shared:") - 1
|
|
|
|
&& ngx_strncmp(value[i].data, "shared:", sizeof("shared:") - 1)
|
|
|
|
== 0)
|
|
|
|
{
|
|
|
|
len = 0;
|
|
|
|
|
|
|
|
for (j = sizeof("shared:") - 1; j < value[i].len; j++) {
|
|
|
|
if (value[i].data[j] == ':') {
|
2009-04-17 03:25:09 +08:00
|
|
|
value[i].data[j] = '\0';
|
2007-01-03 07:55:05 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
len++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (len == 0) {
|
|
|
|
goto invalid;
|
|
|
|
}
|
|
|
|
|
|
|
|
name.len = len;
|
|
|
|
name.data = value[i].data + sizeof("shared:") - 1;
|
|
|
|
|
|
|
|
size.len = value[i].len - j - 1;
|
|
|
|
size.data = name.data + len + 1;
|
|
|
|
|
|
|
|
n = ngx_parse_size(&size);
|
|
|
|
|
|
|
|
if (n == NGX_ERROR) {
|
|
|
|
goto invalid;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (n < (ngx_int_t) (8 * ngx_pagesize)) {
|
|
|
|
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
|
2007-01-03 23:25:40 +08:00
|
|
|
"session cache \"%V\" is too small",
|
2007-01-03 07:55:05 +08:00
|
|
|
&value[i]);
|
|
|
|
|
|
|
|
return NGX_CONF_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
sscf->shm_zone = ngx_shared_memory_add(cf, &name, n,
|
|
|
|
&ngx_http_ssl_module);
|
|
|
|
if (sscf->shm_zone == NULL) {
|
|
|
|
return NGX_CONF_ERROR;
|
|
|
|
}
|
|
|
|
|
2011-09-27 20:06:07 +08:00
|
|
|
sscf->shm_zone->init = ngx_ssl_session_cache_init;
|
|
|
|
|
2007-01-03 07:55:05 +08:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
goto invalid;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (sscf->shm_zone && sscf->builtin_session_cache == NGX_CONF_UNSET) {
|
2007-01-03 23:25:40 +08:00
|
|
|
sscf->builtin_session_cache = NGX_SSL_NO_BUILTIN_SCACHE;
|
2007-01-03 07:55:05 +08:00
|
|
|
}
|
nginx-0.3.8-RELEASE import
*) Security: nginx now checks URI got from a backend in
"X-Accel-Redirect" header line or in SSI file for the "/../" paths
and zeroes.
*) Change: nginx now does not treat the empty user name in the
"Authorization" header line as valid one.
*) Feature: the "ssl_session_timeout" directives of the
ngx_http_ssl_module and ngx_imap_ssl_module.
*) Feature: the "auth_http_header" directive of the
ngx_imap_auth_http_module.
*) Feature: the "add_header" directive.
*) Feature: the ngx_http_realip_module.
*) Feature: the new variables to use in the "log_format" directive:
$bytes_sent, $apache_bytes_sent, $status, $time_gmt, $uri,
$request_time, $request_length, $upstream_status,
$upstream_response_time, $gzip_ratio, $uid_got, $uid_set,
$connection, $pipe, and $msec. The parameters in the "%name" form
will be canceled soon.
*) Change: now the false variable values in the "if" directive are the
empty string "" and string starting with "0".
*) Bugfix: while using proxied or FastCGI-server nginx may leave
connections and temporary files with client requests in open state.
*) Bugfix: the worker processes did not flush the buffered logs on
graceful exit.
*) Bugfix: if the request URI was changes by the "rewrite" directive
and the request was proxied in location given by regular expression,
then the incorrect request was transferred to backend; the bug had
appeared in 0.2.6.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" header.
*) Bugfix: nginx may stop to accept requests if the "rtsig" method and
several worker processes were used.
*) Bugfix: the "\"" and "\'" escape symbols were incorrectly handled in
SSI commands.
*) Bugfix: if the response was ended just after the SSI command and
gzipping was used, then the response did not transferred complete or
did not transferred at all.
2005-11-10 01:25:55 +08:00
|
|
|
|
2004-07-08 23:17:47 +08:00
|
|
|
return NGX_CONF_OK;
|
2007-01-03 07:55:05 +08:00
|
|
|
|
|
|
|
invalid:
|
|
|
|
|
|
|
|
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
|
|
|
|
"invalid session cache \"%V\"", &value[i]);
|
|
|
|
|
|
|
|
return NGX_CONF_ERROR;
|
2004-07-08 23:17:47 +08:00
|
|
|
}
|