2002-08-16 01:20:26 +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
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
2002-08-16 01:20:26 +08:00
|
|
|
#include <ngx_config.h>
|
2003-05-14 00:02:32 +08:00
|
|
|
#include <ngx_core.h>
|
2002-08-20 22:48:28 +08:00
|
|
|
#include <ngx_http.h>
|
|
|
|
|
|
2002-08-16 01:20:26 +08:00
|
|
|
|
2003-12-01 04:03:18 +08:00
|
|
|
typedef struct {
|
|
|
|
|
ngx_http_cache_hash_t *redirect_cache;
|
|
|
|
|
} ngx_http_static_loc_conf_t;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static ngx_int_t ngx_http_static_handler(ngx_http_request_t *r);
|
|
|
|
|
static void *ngx_http_static_create_loc_conf(ngx_conf_t *cf);
|
|
|
|
|
static char *ngx_http_static_merge_loc_conf(ngx_conf_t *cf,
|
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
|
|
|
void *parent, void *child);
|
2006-08-30 18:39:17 +08:00
|
|
|
static ngx_int_t ngx_http_static_init(ngx_conf_t *cf);
|
2003-10-17 04:19:16 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
static ngx_command_t ngx_http_static_commands[] = {
|
|
|
|
|
|
2004-03-13 00:57:08 +08:00
|
|
|
#if (NGX_HTTP_CACHE)
|
|
|
|
|
|
2003-12-01 04:03:18 +08:00
|
|
|
{ ngx_string("redirect_cache"),
|
|
|
|
|
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE3,
|
|
|
|
|
ngx_http_set_cache_slot,
|
|
|
|
|
NGX_HTTP_LOC_CONF_OFFSET,
|
|
|
|
|
offsetof(ngx_http_static_loc_conf_t, redirect_cache),
|
|
|
|
|
NULL },
|
|
|
|
|
|
2004-03-13 00:57:08 +08:00
|
|
|
#endif
|
|
|
|
|
|
2003-12-01 04:03:18 +08:00
|
|
|
ngx_null_command
|
2003-10-17 04:19:16 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ngx_http_module_t ngx_http_static_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 */
|
2006-08-30 18:39:17 +08:00
|
|
|
ngx_http_static_init, /* postconfiguration */
|
2003-11-11 01:17:31 +08:00
|
|
|
|
2003-10-17 04:19:16 +08:00
|
|
|
NULL, /* create main configuration */
|
|
|
|
|
NULL, /* init main configuration */
|
2005-11-15 21:30:52 +08:00
|
|
|
|
2003-10-17 04:19:16 +08:00
|
|
|
NULL, /* create server configuration */
|
|
|
|
|
NULL, /* merge server configuration */
|
2005-11-15 21:30:52 +08:00
|
|
|
|
2003-12-01 04:03:18 +08:00
|
|
|
ngx_http_static_create_loc_conf, /* create location configuration */
|
|
|
|
|
ngx_http_static_merge_loc_conf /* merge location configuration */
|
2005-11-15 21:30:52 +08:00
|
|
|
};
|
2003-10-17 04:19:16 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
ngx_module_t ngx_http_static_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,
|
2003-10-17 04:19:16 +08:00
|
|
|
&ngx_http_static_module_ctx, /* module context */
|
|
|
|
|
ngx_http_static_commands, /* module directives */
|
|
|
|
|
NGX_HTTP_MODULE, /* module type */
|
2005-09-08 22:36:09 +08:00
|
|
|
NULL, /* init master */
|
2006-08-30 18:39:17 +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
|
2003-10-17 04:19:16 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
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
|
|
|
static ngx_int_t
|
|
|
|
|
ngx_http_static_handler(ngx_http_request_t *r)
|
2003-10-17 04:19:16 +08:00
|
|
|
{
|
2005-10-07 21:30:52 +08:00
|
|
|
u_char *last, *location;
|
2006-10-12 21:36:54 +08:00
|
|
|
size_t root;
|
2005-10-07 21:30:52 +08:00
|
|
|
ngx_fd_t fd;
|
|
|
|
|
ngx_int_t rc;
|
|
|
|
|
ngx_uint_t level;
|
|
|
|
|
ngx_str_t path;
|
|
|
|
|
ngx_err_t err;
|
|
|
|
|
ngx_log_t *log;
|
|
|
|
|
ngx_buf_t *b;
|
|
|
|
|
ngx_chain_t out;
|
|
|
|
|
ngx_file_info_t fi;
|
2005-10-19 20:33:58 +08:00
|
|
|
ngx_pool_cleanup_t *cln;
|
|
|
|
|
ngx_pool_cleanup_file_t *clnf;
|
2005-10-07 21:30:52 +08:00
|
|
|
ngx_http_core_loc_conf_t *clcf;
|
2003-12-01 04:03:18 +08:00
|
|
|
|
2006-05-04 23:32:46 +08:00
|
|
|
if (!(r->method & (NGX_HTTP_GET|NGX_HTTP_HEAD))) {
|
2006-04-21 20:06:44 +08:00
|
|
|
return NGX_HTTP_NOT_ALLOWED;
|
|
|
|
|
}
|
|
|
|
|
|
2003-12-01 04:03:18 +08:00
|
|
|
if (r->uri.data[r->uri.len - 1] == '/') {
|
|
|
|
|
return NGX_DECLINED;
|
|
|
|
|
}
|
2003-10-17 04:19:16 +08:00
|
|
|
|
2005-02-16 21:40:36 +08:00
|
|
|
/* TODO: Win32 */
|
|
|
|
|
if (r->zero_in_uri) {
|
|
|
|
|
return NGX_DECLINED;
|
|
|
|
|
}
|
|
|
|
|
|
2007-08-06 23:37:22 +08:00
|
|
|
rc = ngx_http_discard_request_body(r);
|
2003-12-01 04:03:18 +08:00
|
|
|
|
2004-03-23 14:01:52 +08:00
|
|
|
if (rc != NGX_OK && rc != NGX_AGAIN) {
|
2003-12-01 04:03:18 +08:00
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
log = r->connection->log;
|
|
|
|
|
|
|
|
|
|
/*
|
2005-10-07 21:30:52 +08:00
|
|
|
* ngx_http_map_uri_to_path() allocates memory for terminating '\0'
|
|
|
|
|
* so we do not need to reserve memory for '/' for possible redirect
|
2003-12-01 04:03:18 +08:00
|
|
|
*/
|
2003-11-29 01:41:47 +08:00
|
|
|
|
2006-10-12 21:36:54 +08:00
|
|
|
last = ngx_http_map_uri_to_path(r, &path, &root, 0);
|
2005-10-07 21:30:52 +08:00
|
|
|
if (last == NULL) {
|
|
|
|
|
return NGX_HTTP_INTERNAL_SERVER_ERROR;
|
2004-07-27 00:21:18 +08:00
|
|
|
}
|
2003-12-01 04:03:18 +08:00
|
|
|
|
|
|
|
|
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0,
|
2005-10-07 21:30:52 +08:00
|
|
|
"http filename: \"%s\"", path.data);
|
2003-10-17 04:19:16 +08:00
|
|
|
|
2005-10-19 20:33:58 +08:00
|
|
|
cln = ngx_pool_cleanup_add(r->pool, sizeof(ngx_pool_cleanup_file_t));
|
|
|
|
|
if (cln == NULL) {
|
|
|
|
|
return NGX_HTTP_INTERNAL_SERVER_ERROR;
|
|
|
|
|
}
|
|
|
|
|
|
2007-01-19 04:15:09 +08:00
|
|
|
fd = ngx_open_file(path.data, NGX_FILE_RDONLY, NGX_FILE_OPEN, 0);
|
2003-10-17 04:19:16 +08:00
|
|
|
|
2003-12-01 04:03:18 +08:00
|
|
|
if (fd == NGX_INVALID_FILE) {
|
2003-10-17 04:19:16 +08:00
|
|
|
err = ngx_errno;
|
|
|
|
|
|
2005-09-23 19:02:22 +08:00
|
|
|
if (err == NGX_ENOENT
|
|
|
|
|
|| err == NGX_ENOTDIR
|
|
|
|
|
|| err == NGX_ENAMETOOLONG)
|
|
|
|
|
{
|
2003-11-03 06:56:18 +08:00
|
|
|
level = NGX_LOG_ERR;
|
|
|
|
|
rc = NGX_HTTP_NOT_FOUND;
|
2003-10-17 04:19:16 +08:00
|
|
|
|
|
|
|
|
} else if (err == NGX_EACCES) {
|
2003-11-03 06:56:18 +08:00
|
|
|
level = NGX_LOG_ERR;
|
|
|
|
|
rc = NGX_HTTP_FORBIDDEN;
|
2003-10-17 04:19:16 +08:00
|
|
|
|
|
|
|
|
} else {
|
2003-11-03 06:56:18 +08:00
|
|
|
level = NGX_LOG_CRIT;
|
|
|
|
|
rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
|
2003-10-17 04:19:16 +08:00
|
|
|
}
|
2003-11-03 06:56:18 +08:00
|
|
|
|
2005-10-07 21:30:52 +08:00
|
|
|
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
|
|
|
|
|
|
2005-07-08 22:34:20 +08:00
|
|
|
if (rc != NGX_HTTP_NOT_FOUND || clcf->log_not_found) {
|
|
|
|
|
ngx_log_error(level, log, err,
|
2005-10-07 21:30:52 +08:00
|
|
|
ngx_open_file_n " \"%s\" failed", path.data);
|
2005-07-08 22:34:20 +08:00
|
|
|
}
|
2003-11-03 06:56:18 +08:00
|
|
|
|
|
|
|
|
return rc;
|
2003-10-17 04:19:16 +08:00
|
|
|
}
|
|
|
|
|
|
2003-12-01 04:03:18 +08:00
|
|
|
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0, "http static fd: %d", fd);
|
2003-10-17 04:19:16 +08:00
|
|
|
|
2003-12-01 04:03:18 +08:00
|
|
|
if (ngx_fd_info(fd, &fi) == NGX_FILE_ERROR) {
|
|
|
|
|
ngx_log_error(NGX_LOG_CRIT, log, ngx_errno,
|
2005-10-07 21:30:52 +08:00
|
|
|
ngx_fd_info_n " \"%s\" failed", path.data);
|
2003-10-17 04:19:16 +08:00
|
|
|
|
2003-12-01 04:03:18 +08:00
|
|
|
if (ngx_close_file(fd) == NGX_FILE_ERROR) {
|
|
|
|
|
ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
|
2005-10-07 21:30:52 +08:00
|
|
|
ngx_close_file_n " \"%s\" failed", path.data);
|
2003-10-17 04:19:16 +08:00
|
|
|
}
|
|
|
|
|
|
2003-12-01 04:03:18 +08:00
|
|
|
return NGX_HTTP_INTERNAL_SERVER_ERROR;
|
2003-10-17 04:19:16 +08:00
|
|
|
}
|
2003-10-27 16:53:49 +08:00
|
|
|
|
2003-12-01 04:03:18 +08:00
|
|
|
if (ngx_is_dir(&fi)) {
|
2003-11-27 15:45:22 +08:00
|
|
|
|
2003-12-01 04:03:18 +08:00
|
|
|
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, log, 0, "http dir");
|
2003-11-27 15:45:22 +08:00
|
|
|
|
2003-12-01 04:03:18 +08:00
|
|
|
if (ngx_close_file(fd) == NGX_FILE_ERROR) {
|
|
|
|
|
ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
|
2005-10-07 21:30:52 +08:00
|
|
|
ngx_close_file_n " \"%s\" failed", path.data);
|
2003-10-17 04:19:16 +08:00
|
|
|
}
|
|
|
|
|
|
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
|
|
|
r->headers_out.location = ngx_palloc(r->pool, sizeof(ngx_table_elt_t));
|
2004-09-07 02:45:00 +08:00
|
|
|
if (r->headers_out.location == NULL) {
|
2003-10-30 01:39:05 +08:00
|
|
|
return NGX_HTTP_INTERNAL_SERVER_ERROR;
|
|
|
|
|
}
|
2003-10-17 04:19:16 +08:00
|
|
|
|
2005-10-07 21:30:52 +08:00
|
|
|
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
|
|
|
|
|
|
2006-01-25 00:08:27 +08:00
|
|
|
if (!clcf->alias && clcf->root_lengths == NULL) {
|
2005-10-07 21:30:52 +08:00
|
|
|
location = path.data + clcf->root.len;
|
|
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
location = ngx_palloc(r->pool, r->uri.len + 1);
|
|
|
|
|
if (location == NULL) {
|
|
|
|
|
return NGX_HTTP_INTERNAL_SERVER_ERROR;
|
|
|
|
|
}
|
|
|
|
|
|
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
|
|
|
last = ngx_copy(location, r->uri.data, r->uri.len);
|
2005-10-07 21:30:52 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*last = '/';
|
|
|
|
|
|
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
|
|
|
/*
|
|
|
|
|
* we do not need to set the r->headers_out.location->hash and
|
|
|
|
|
* r->headers_out.location->key fields
|
|
|
|
|
*/
|
2003-10-17 04:19:16 +08:00
|
|
|
|
2005-10-07 21:30:52 +08:00
|
|
|
r->headers_out.location->value.len = r->uri.len + 1;
|
|
|
|
|
r->headers_out.location->value.data = location;
|
2004-03-13 00:57:08 +08:00
|
|
|
|
2003-12-01 04:03:18 +08:00
|
|
|
return NGX_HTTP_MOVED_PERMANENTLY;
|
|
|
|
|
}
|
2003-10-17 04:19:16 +08:00
|
|
|
|
2004-11-11 22:07:14 +08:00
|
|
|
#if !(NGX_WIN32) /* the not regular files are probably Unix specific */
|
2003-10-17 04:19:16 +08:00
|
|
|
|
2003-12-01 04:03:18 +08:00
|
|
|
if (!ngx_is_file(&fi)) {
|
|
|
|
|
ngx_log_error(NGX_LOG_CRIT, log, ngx_errno,
|
2005-10-07 21:30:52 +08:00
|
|
|
"\"%s\" is not a regular file", path.data);
|
2002-08-16 01:20:26 +08:00
|
|
|
|
2003-12-01 04:03:18 +08:00
|
|
|
if (ngx_close_file(fd) == NGX_FILE_ERROR) {
|
|
|
|
|
ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
|
2005-10-07 21:30:52 +08:00
|
|
|
ngx_close_file_n " \"%s\" failed", path.data);
|
2003-12-01 04:03:18 +08:00
|
|
|
}
|
2003-05-15 23:42:53 +08:00
|
|
|
|
2003-12-01 04:03:18 +08:00
|
|
|
return NGX_HTTP_NOT_FOUND;
|
2003-05-15 23:42:53 +08:00
|
|
|
}
|
|
|
|
|
|
2003-12-01 04:03:18 +08:00
|
|
|
#endif
|
2003-11-29 01:41:47 +08:00
|
|
|
|
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
|
|
|
log->action = "sending response to client";
|
2002-12-11 02:05:12 +08:00
|
|
|
|
2005-10-19 20:33:58 +08:00
|
|
|
cln->handler = ngx_pool_cleanup_file;
|
|
|
|
|
clnf = cln->data;
|
2003-05-15 01:13:13 +08:00
|
|
|
|
2005-10-19 20:33:58 +08:00
|
|
|
clnf->fd = fd;
|
|
|
|
|
clnf->name = path.data;
|
|
|
|
|
clnf->log = r->pool->log;
|
2003-05-15 01:13:13 +08:00
|
|
|
|
2003-12-01 04:03:18 +08:00
|
|
|
r->headers_out.status = NGX_HTTP_OK;
|
|
|
|
|
r->headers_out.content_length_n = ngx_file_size(&fi);
|
|
|
|
|
r->headers_out.last_modified_time = ngx_file_mtime(&fi);
|
2003-05-27 20:18:54 +08:00
|
|
|
|
2003-12-01 04:03:18 +08:00
|
|
|
if (ngx_http_set_content_type(r) != NGX_OK) {
|
|
|
|
|
return NGX_HTTP_INTERNAL_SERVER_ERROR;
|
2003-05-15 01:13:13 +08:00
|
|
|
}
|
2002-09-16 23:01:44 +08:00
|
|
|
|
2006-01-11 23:26:57 +08:00
|
|
|
if (r != r->main && ngx_file_size(&fi) == 0) {
|
2005-12-05 21:18:09 +08:00
|
|
|
return ngx_http_send_header(r);
|
|
|
|
|
}
|
|
|
|
|
|
2005-12-07 22:51:31 +08:00
|
|
|
r->allow_ranges = 1;
|
|
|
|
|
|
2005-11-15 21:30:52 +08:00
|
|
|
/* we need to allocate all before the header would be sent */
|
2002-09-02 22:48:24 +08:00
|
|
|
|
2005-11-15 21:30:52 +08:00
|
|
|
b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t));
|
|
|
|
|
if (b == NULL) {
|
|
|
|
|
return NGX_HTTP_INTERNAL_SERVER_ERROR;
|
|
|
|
|
}
|
2004-07-29 03:21:26 +08:00
|
|
|
|
2005-11-15 21:30:52 +08:00
|
|
|
b->file = ngx_pcalloc(r->pool, sizeof(ngx_file_t));
|
|
|
|
|
if (b->file == NULL) {
|
|
|
|
|
return NGX_HTTP_INTERNAL_SERVER_ERROR;
|
2003-12-01 04:03:18 +08:00
|
|
|
}
|
2002-08-16 01:20:26 +08:00
|
|
|
|
2003-05-27 20:18:54 +08:00
|
|
|
rc = ngx_http_send_header(r);
|
|
|
|
|
|
2005-12-06 00:59:05 +08:00
|
|
|
if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) {
|
2003-10-10 23:10:50 +08:00
|
|
|
return rc;
|
2003-05-27 20:18:54 +08:00
|
|
|
}
|
2002-08-16 01:20:26 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
b->file_pos = 0;
|
|
|
|
|
b->file_last = ngx_file_size(&fi);
|
2002-08-16 01:20:26 +08:00
|
|
|
|
2005-11-15 21:30:52 +08:00
|
|
|
b->in_file = b->file_last ? 1: 0;
|
2006-01-11 23:26:57 +08:00
|
|
|
b->last_buf = (r == r->main) ? 1: 0;
|
2005-11-15 21:30:52 +08:00
|
|
|
b->last_in_chain = 1;
|
|
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
b->file->fd = fd;
|
2005-10-07 21:30:52 +08:00
|
|
|
b->file->name = path;
|
2004-05-28 23:49:23 +08:00
|
|
|
b->file->log = log;
|
2002-08-16 01:20:26 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
out.buf = b;
|
2003-10-22 00:49:56 +08:00
|
|
|
out.next = NULL;
|
|
|
|
|
|
|
|
|
|
return ngx_http_output_filter(r, &out);
|
2002-08-16 01:20:26 +08:00
|
|
|
}
|
2003-10-17 04:19:16 +08:00
|
|
|
|
|
|
|
|
|
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
|
|
|
static void *
|
|
|
|
|
ngx_http_static_create_loc_conf(ngx_conf_t *cf)
|
2003-12-01 04:03:18 +08:00
|
|
|
{
|
|
|
|
|
ngx_http_static_loc_conf_t *conf;
|
|
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
conf = ngx_palloc(cf->pool, sizeof(ngx_http_static_loc_conf_t));
|
|
|
|
|
if (conf == NULL) {
|
2003-12-01 04:03:18 +08:00
|
|
|
return NGX_CONF_ERROR;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
conf->redirect_cache = NULL;
|
|
|
|
|
|
|
|
|
|
return conf;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
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
|
|
|
static char *
|
|
|
|
|
ngx_http_static_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
|
2003-12-01 04:03:18 +08:00
|
|
|
{
|
|
|
|
|
ngx_http_static_loc_conf_t *prev = parent;
|
|
|
|
|
ngx_http_static_loc_conf_t *conf = child;
|
|
|
|
|
|
|
|
|
|
if (conf->redirect_cache == NULL) {
|
|
|
|
|
conf->redirect_cache = prev->redirect_cache;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NGX_CONF_OK;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
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
|
|
|
static ngx_int_t
|
2006-08-30 18:39:17 +08:00
|
|
|
ngx_http_static_init(ngx_conf_t *cf)
|
2003-10-17 04:19:16 +08:00
|
|
|
{
|
|
|
|
|
ngx_http_handler_pt *h;
|
|
|
|
|
ngx_http_core_main_conf_t *cmcf;
|
2004-07-19 03:11:20 +08:00
|
|
|
|
2006-08-30 18:39:17 +08:00
|
|
|
cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
|
2005-11-15 21:30:52 +08:00
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
h = ngx_array_push(&cmcf->phases[NGX_HTTP_CONTENT_PHASE].handlers);
|
2003-12-01 04:03:18 +08:00
|
|
|
if (h == NULL) {
|
|
|
|
|
return NGX_ERROR;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*h = ngx_http_static_handler;
|
2003-10-17 04:19:16 +08:00
|
|
|
|
|
|
|
|
return NGX_OK;
|
|
|
|
|
}
|