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-12-28 00:22:50 +08:00
|
|
|
#ifndef _NGX_HTTP_CONF_FILE_H_INCLUDED_
|
|
|
|
#define _NGX_HTTP_CONF_FILE_H_INCLUDED_
|
2002-12-19 15:08:55 +08:00
|
|
|
|
|
|
|
|
|
|
|
#include <ngx_config.h>
|
2003-06-03 23:42:58 +08:00
|
|
|
#include <ngx_core.h>
|
2002-12-19 15:08:55 +08:00
|
|
|
|
2002-12-26 15:24:21 +08:00
|
|
|
|
2003-05-15 01:13:13 +08:00
|
|
|
/*
|
2003-05-15 23:42:53 +08:00
|
|
|
* AAAA number of agruments
|
|
|
|
* FF command flags
|
|
|
|
* TT command type, i.e. HTTP "location" or "server" command
|
2003-05-15 01:13:13 +08:00
|
|
|
*/
|
|
|
|
|
2003-05-16 23:27:48 +08:00
|
|
|
#define NGX_CONF_NOARGS 0x00000001
|
|
|
|
#define NGX_CONF_TAKE1 0x00000002
|
|
|
|
#define NGX_CONF_TAKE2 0x00000004
|
2003-10-23 00:38:26 +08:00
|
|
|
#define NGX_CONF_TAKE3 0x00000008
|
|
|
|
#define NGX_CONF_TAKE4 0x00000010
|
|
|
|
#define NGX_CONF_TAKE5 0x00000020
|
|
|
|
#define NGX_CONF_TAKE6 0x00000040
|
|
|
|
#define NGX_CONF_TAKE7 0x00000080
|
|
|
|
|
2005-05-15 02:42:03 +08:00
|
|
|
#define NGX_CONF_MAX_ARGS 8
|
|
|
|
|
2003-11-10 04:03:38 +08:00
|
|
|
#define NGX_CONF_TAKE12 (NGX_CONF_TAKE1|NGX_CONF_TAKE2)
|
|
|
|
#define NGX_CONF_TAKE13 (NGX_CONF_TAKE1|NGX_CONF_TAKE3)
|
|
|
|
|
2003-12-26 04:26:58 +08:00
|
|
|
#define NGX_CONF_TAKE23 (NGX_CONF_TAKE2|NGX_CONF_TAKE3)
|
|
|
|
|
2003-10-23 00:38:26 +08:00
|
|
|
#define NGX_CONF_TAKE1234 (NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3 \
|
|
|
|
|NGX_CONF_TAKE4)
|
|
|
|
|
2004-04-13 00:38:09 +08:00
|
|
|
#define NGX_CONF_ARGS_NUMBER 0x000000ff
|
|
|
|
#define NGX_CONF_BLOCK 0x00000100
|
|
|
|
#define NGX_CONF_FLAG 0x00000200
|
|
|
|
#define NGX_CONF_ANY 0x00000400
|
|
|
|
#define NGX_CONF_1MORE 0x00000800
|
|
|
|
#define NGX_CONF_2MORE 0x00001000
|
2002-12-19 15:08:55 +08:00
|
|
|
|
2004-04-13 00:38:09 +08:00
|
|
|
#define NGX_DIRECT_CONF 0x00010000
|
2004-05-18 23:29:08 +08:00
|
|
|
|
2003-05-16 23:27:48 +08:00
|
|
|
#define NGX_MAIN_CONF 0x01000000
|
2004-05-18 23:29:08 +08:00
|
|
|
#define NGX_ANY_CONF 0x0F000000
|
2003-05-15 01:13:13 +08:00
|
|
|
|
|
|
|
|
2002-12-19 15:08:55 +08:00
|
|
|
|
2002-12-28 00:22:50 +08:00
|
|
|
#define NGX_CONF_UNSET -1
|
2004-04-14 13:57:36 +08:00
|
|
|
#define NGX_CONF_UNSET_UINT (ngx_uint_t) -1
|
2004-07-08 23:17:47 +08:00
|
|
|
#define NGX_CONF_UNSET_PTR (void *) -1
|
2004-03-16 15:10:12 +08:00
|
|
|
#define NGX_CONF_UNSET_SIZE (size_t) -1
|
|
|
|
#define NGX_CONF_UNSET_MSEC (ngx_msec_t) -1
|
2002-12-19 15:08:55 +08:00
|
|
|
|
|
|
|
|
2003-01-09 13:36:00 +08:00
|
|
|
#define NGX_CONF_OK NULL
|
2004-10-11 23:07:03 +08:00
|
|
|
#define NGX_CONF_ERROR (char *) -1
|
2002-12-28 00:22:50 +08:00
|
|
|
|
2004-11-11 22:07:14 +08:00
|
|
|
#define NGX_CONF_BLOCK_START 1
|
|
|
|
#define NGX_CONF_BLOCK_DONE 2
|
|
|
|
#define NGX_CONF_FILE_DONE 3
|
2002-12-26 15:24:21 +08:00
|
|
|
|
2003-05-27 20:18:54 +08:00
|
|
|
#define NGX_CORE_MODULE 0x45524F43 /* "CORE" */
|
|
|
|
#define NGX_CONF_MODULE 0x464E4F43 /* "CONF" */
|
|
|
|
|
|
|
|
|
2003-11-26 04:44:56 +08:00
|
|
|
#define NGX_MAX_CONF_ERRSTR 256
|
|
|
|
|
|
|
|
|
2002-12-27 00:26:23 +08:00
|
|
|
struct ngx_command_s {
|
2005-04-08 23:18:55 +08:00
|
|
|
ngx_str_t name;
|
|
|
|
ngx_uint_t type;
|
|
|
|
char *(*set)(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
|
|
|
|
ngx_uint_t conf;
|
|
|
|
ngx_uint_t offset;
|
|
|
|
void *post;
|
2002-12-27 00:26:23 +08:00
|
|
|
};
|
2002-12-26 15:24:21 +08:00
|
|
|
|
2003-10-23 14:13:16 +08:00
|
|
|
#define ngx_null_command { ngx_null_string, 0, NULL, 0, 0, NULL }
|
2002-12-26 15:24:21 +08:00
|
|
|
|
2003-06-03 23:42:58 +08:00
|
|
|
|
2003-07-02 22:41:17 +08:00
|
|
|
struct ngx_open_file_s {
|
2005-04-08 23:18:55 +08:00
|
|
|
ngx_fd_t fd;
|
|
|
|
ngx_str_t name;
|
2003-07-21 05:15:59 +08:00
|
|
|
#if 0
|
|
|
|
/* e.g. append mode, error_log */
|
2005-04-08 23:18:55 +08:00
|
|
|
ngx_uint_t flags;
|
2003-07-21 05:15:59 +08:00
|
|
|
/* e.g. reopen db file */
|
2005-04-08 23:18:55 +08:00
|
|
|
ngx_uint_t (*handler)(void *data, ngx_open_file_t *file);
|
|
|
|
void *data;
|
2003-07-21 05:15:59 +08:00
|
|
|
#endif
|
2003-07-02 22:41:17 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2005-09-23 22:43:49 +08:00
|
|
|
#define NGX_MODULE_V1 0, 0, 0, 0, 0, 0, 1
|
2005-09-08 22:36:09 +08:00
|
|
|
#define NGX_MODULE_V1_PADDING 0, 0, 0, 0, 0, 0, 0, 0
|
|
|
|
|
2003-06-03 23:42:58 +08:00
|
|
|
struct ngx_module_s {
|
2005-04-08 23:18:55 +08:00
|
|
|
ngx_uint_t ctx_index;
|
|
|
|
ngx_uint_t index;
|
2005-09-08 22:36:09 +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
|
|
|
ngx_uint_t spare0;
|
|
|
|
ngx_uint_t spare1;
|
2005-09-08 22:36:09 +08:00
|
|
|
ngx_uint_t spare2;
|
|
|
|
ngx_uint_t spare3;
|
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
|
|
|
|
2005-09-23 22:43:49 +08:00
|
|
|
ngx_uint_t version;
|
|
|
|
|
2005-04-08 23:18:55 +08:00
|
|
|
void *ctx;
|
|
|
|
ngx_command_t *commands;
|
|
|
|
ngx_uint_t type;
|
2005-09-08 22:36:09 +08:00
|
|
|
|
|
|
|
ngx_int_t (*init_master)(ngx_log_t *log);
|
|
|
|
|
2005-04-08 23:18:55 +08:00
|
|
|
ngx_int_t (*init_module)(ngx_cycle_t *cycle);
|
2005-09-08 22:36:09 +08:00
|
|
|
|
2005-04-08 23:18:55 +08:00
|
|
|
ngx_int_t (*init_process)(ngx_cycle_t *cycle);
|
|
|
|
ngx_int_t (*init_thread)(ngx_cycle_t *cycle);
|
2005-09-08 22:36:09 +08:00
|
|
|
ngx_int_t (*exit_thread)(ngx_cycle_t *cycle);
|
|
|
|
ngx_int_t (*exit_process)(ngx_cycle_t *cycle);
|
|
|
|
|
|
|
|
ngx_int_t (*exit_master)(ngx_cycle_t *cycle);
|
|
|
|
|
|
|
|
uintptr_t spare_hook0;
|
|
|
|
uintptr_t spare_hook1;
|
|
|
|
uintptr_t spare_hook2;
|
|
|
|
uintptr_t spare_hook3;
|
|
|
|
uintptr_t spare_hook4;
|
|
|
|
uintptr_t spare_hook5;
|
|
|
|
uintptr_t spare_hook6;
|
|
|
|
uintptr_t spare_hook7;
|
2003-06-03 23:42:58 +08:00
|
|
|
};
|
2002-12-23 14:29:22 +08:00
|
|
|
|
|
|
|
|
2004-04-13 00:38:09 +08:00
|
|
|
typedef struct {
|
2005-04-08 23:18:55 +08:00
|
|
|
ngx_str_t name;
|
|
|
|
void *(*create_conf)(ngx_cycle_t *cycle);
|
|
|
|
char *(*init_conf)(ngx_cycle_t *cycle, void *conf);
|
2004-04-13 00:38:09 +08:00
|
|
|
} ngx_core_module_t;
|
|
|
|
|
|
|
|
|
2002-12-19 15:08:55 +08:00
|
|
|
typedef struct {
|
2005-04-08 23:18:55 +08:00
|
|
|
ngx_file_t file;
|
|
|
|
ngx_buf_t *buffer;
|
|
|
|
ngx_uint_t line;
|
2002-12-19 15:08:55 +08:00
|
|
|
} ngx_conf_file_t;
|
|
|
|
|
2002-12-26 15:24:21 +08:00
|
|
|
|
2003-05-15 01:13:13 +08:00
|
|
|
typedef char *(*ngx_conf_handler_pt)(ngx_conf_t *cf,
|
2005-04-08 23:18:55 +08:00
|
|
|
ngx_command_t *dummy, void *conf);
|
2003-05-15 01:13:13 +08:00
|
|
|
|
|
|
|
|
2002-12-19 15:08:55 +08:00
|
|
|
struct ngx_conf_s {
|
2003-05-15 01:13:13 +08:00
|
|
|
char *name;
|
|
|
|
ngx_array_t *args;
|
2002-12-19 15:08:55 +08:00
|
|
|
|
2003-07-01 23:00:03 +08:00
|
|
|
ngx_cycle_t *cycle;
|
2003-05-15 01:13:13 +08:00
|
|
|
ngx_pool_t *pool;
|
|
|
|
ngx_conf_file_t *conf_file;
|
|
|
|
ngx_log_t *log;
|
2002-12-19 15:08:55 +08:00
|
|
|
|
2003-05-15 01:13:13 +08:00
|
|
|
void *ctx;
|
2004-06-16 23:32:11 +08:00
|
|
|
ngx_uint_t module_type;
|
|
|
|
ngx_uint_t cmd_type;
|
2003-05-15 01:13:13 +08:00
|
|
|
|
|
|
|
ngx_conf_handler_pt handler;
|
|
|
|
char *handler_conf;
|
2002-12-19 15:08:55 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2003-10-24 14:53:41 +08:00
|
|
|
typedef char *(*ngx_conf_post_handler_pt) (ngx_conf_t *cf,
|
2005-03-23 00:02:46 +08:00
|
|
|
void *data, void *conf);
|
2003-10-24 14:53:41 +08:00
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
ngx_conf_post_handler_pt post_handler;
|
|
|
|
} ngx_conf_post_t;
|
|
|
|
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
ngx_conf_post_handler_pt post_handler;
|
2005-04-08 23:18:55 +08:00
|
|
|
ngx_int_t low;
|
|
|
|
ngx_int_t high;
|
2003-10-24 14:53:41 +08:00
|
|
|
} ngx_conf_num_bounds_t;
|
|
|
|
|
|
|
|
|
2004-04-14 13:57:36 +08:00
|
|
|
typedef struct {
|
2005-04-08 23:18:55 +08:00
|
|
|
ngx_str_t name;
|
|
|
|
ngx_uint_t value;
|
2004-04-14 13:57:36 +08:00
|
|
|
} ngx_conf_enum_t;
|
|
|
|
|
|
|
|
|
2003-11-03 06:56:18 +08:00
|
|
|
#define NGX_CONF_BITMASK_SET 1
|
|
|
|
|
2003-10-30 16:51:06 +08:00
|
|
|
typedef struct {
|
2005-04-08 23:18:55 +08:00
|
|
|
ngx_str_t name;
|
|
|
|
ngx_uint_t mask;
|
2003-10-30 16:51:06 +08:00
|
|
|
} ngx_conf_bitmask_t;
|
|
|
|
|
|
|
|
|
2003-10-24 14:53:41 +08:00
|
|
|
char *ngx_conf_check_num_bounds(ngx_conf_t *cf, void *post, void *data);
|
|
|
|
|
|
|
|
|
2003-07-04 23:10:33 +08:00
|
|
|
#define ngx_get_conf(conf_ctx, module) conf_ctx[module.index]
|
2003-05-20 00:39:14 +08:00
|
|
|
|
|
|
|
|
2003-07-18 22:44:05 +08:00
|
|
|
|
2003-05-20 00:39:14 +08:00
|
|
|
#define ngx_conf_init_value(conf, default) \
|
|
|
|
if (conf == NGX_CONF_UNSET) { \
|
|
|
|
conf = default; \
|
|
|
|
}
|
|
|
|
|
2003-12-09 23:08:11 +08:00
|
|
|
#define ngx_conf_init_ptr_value(conf, default) \
|
2004-07-08 23:17:47 +08:00
|
|
|
if (conf == NGX_CONF_UNSET_PTR) { \
|
2003-12-09 23:08:11 +08:00
|
|
|
conf = default; \
|
|
|
|
}
|
|
|
|
|
2003-06-16 02:32:13 +08:00
|
|
|
#define ngx_conf_init_unsigned_value(conf, default) \
|
|
|
|
if (conf == (unsigned) NGX_CONF_UNSET) { \
|
|
|
|
conf = default; \
|
|
|
|
}
|
|
|
|
|
2003-05-20 00:39:14 +08:00
|
|
|
#define ngx_conf_init_size_value(conf, default) \
|
2004-04-05 04:32:09 +08:00
|
|
|
if (conf == NGX_CONF_UNSET_SIZE) { \
|
2003-05-20 00:39:14 +08:00
|
|
|
conf = default; \
|
|
|
|
}
|
|
|
|
|
|
|
|
#define ngx_conf_init_msec_value(conf, default) \
|
2004-04-05 04:32:09 +08:00
|
|
|
if (conf == NGX_CONF_UNSET_MSEC) { \
|
2003-05-20 00:39:14 +08:00
|
|
|
conf = default; \
|
|
|
|
}
|
|
|
|
|
|
|
|
#define ngx_conf_merge_value(conf, prev, default) \
|
2003-01-09 13:36:00 +08:00
|
|
|
if (conf == NGX_CONF_UNSET) { \
|
|
|
|
conf = (prev == NGX_CONF_UNSET) ? default : prev; \
|
|
|
|
}
|
2002-12-25 01:30:59 +08:00
|
|
|
|
2004-07-08 23:17:47 +08:00
|
|
|
#define ngx_conf_merge_ptr_value(conf, prev, default) \
|
|
|
|
if (conf == NULL) { \
|
|
|
|
conf = (prev == NULL) ? default : prev; \
|
|
|
|
}
|
|
|
|
|
2004-04-14 13:57:36 +08:00
|
|
|
#define ngx_conf_merge_unsigned_value(conf, prev, default) \
|
|
|
|
if (conf == NGX_CONF_UNSET_UINT) { \
|
|
|
|
conf = (prev == NGX_CONF_UNSET_UINT) ? default : prev; \
|
|
|
|
}
|
|
|
|
|
2003-05-20 00:39:14 +08:00
|
|
|
#define ngx_conf_merge_msec_value(conf, prev, default) \
|
2004-03-16 15:10:12 +08:00
|
|
|
if (conf == NGX_CONF_UNSET_MSEC) { \
|
|
|
|
conf = (prev == NGX_CONF_UNSET_MSEC) ? default : prev; \
|
2003-05-15 01:13:13 +08:00
|
|
|
}
|
2002-12-25 01:30:59 +08:00
|
|
|
|
2003-11-04 06:20:44 +08:00
|
|
|
#define ngx_conf_merge_sec_value(conf, prev, default) \
|
|
|
|
if (conf == NGX_CONF_UNSET) { \
|
|
|
|
conf = (prev == NGX_CONF_UNSET) ? default : prev; \
|
|
|
|
}
|
|
|
|
|
2003-05-20 00:39:14 +08:00
|
|
|
#define ngx_conf_merge_size_value(conf, prev, default) \
|
2004-03-16 15:10:12 +08:00
|
|
|
if (conf == NGX_CONF_UNSET_SIZE) { \
|
|
|
|
conf = (prev == NGX_CONF_UNSET_SIZE) ? default : prev; \
|
2003-02-07 01:21:13 +08:00
|
|
|
}
|
|
|
|
|
2003-05-27 20:18:54 +08:00
|
|
|
#define ngx_conf_merge_str_value(conf, prev, default) \
|
nginx-0.1.14-RELEASE import
*) Feature: the autoconfiguration directives:
--http-client-body-temp-path=PATH, --http-proxy-temp-path=PATH, and
--http-fastcgi-temp-path=PATH
*) Change: the directory name for the temporary files with the client
request body is specified by directive client_body_temp_path, by
default it is <prefix>/client_body_temp.
*) Feature: the ngx_http_fastcgi_module and the directives:
fastcgi_pass, fastcgi_root, fastcgi_index, fastcgi_params,
fastcgi_connect_timeout, fastcgi_send_timeout, fastcgi_read_timeout,
fastcgi_send_lowat, fastcgi_header_buffer_size, fastcgi_buffers,
fastcgi_busy_buffers_size, fastcgi_temp_path,
fastcgi_max_temp_file_size, fastcgi_temp_file_write_size,
fastcgi_next_upstream, and fastcgi_x_powered_by.
*) Bugfix: the "[alert] zero size buf" error; the bug had appeared in
0.1.3.
*) Change: the URI must be specified after the host name in the
proxy_pass directive.
*) Change: the %3F symbol in the URI was considered as the argument
string start.
*) Feature: the unix domain sockets support in the
ngx_http_proxy_module.
*) Feature: the ssl_engine and ssl_ciphers directives.
Thanks to Sergey Skvortsov for SSL-accelerator.
2005-01-18 21:03:58 +08:00
|
|
|
if (conf.data == NULL) { \
|
|
|
|
if (prev.data) { \
|
2003-05-27 20:18:54 +08:00
|
|
|
conf.len = prev.len; \
|
|
|
|
conf.data = prev.data; \
|
|
|
|
} else { \
|
|
|
|
conf.len = sizeof(default) - 1; \
|
2004-03-17 05:26:01 +08:00
|
|
|
conf.data = (u_char *) default; \
|
2003-05-27 20:18:54 +08:00
|
|
|
} \
|
|
|
|
}
|
|
|
|
|
2003-10-08 23:32:54 +08:00
|
|
|
#define ngx_conf_merge_bufs_value(conf, prev, default_num, default_size) \
|
|
|
|
if (conf.num == 0) { \
|
|
|
|
if (prev.num) { \
|
|
|
|
conf.num = prev.num; \
|
|
|
|
conf.size = prev.size; \
|
|
|
|
} else { \
|
|
|
|
conf.num = default_num; \
|
|
|
|
conf.size = default_size; \
|
|
|
|
} \
|
|
|
|
}
|
|
|
|
|
2003-10-30 16:51:06 +08:00
|
|
|
#define ngx_conf_merge_bitmask_value(conf, prev, default) \
|
|
|
|
if (conf == 0) { \
|
|
|
|
conf = (prev == 0) ? default : prev; \
|
|
|
|
}
|
|
|
|
|
2003-02-07 01:21:13 +08:00
|
|
|
|
2003-03-04 14:33:48 +08:00
|
|
|
#define addressof(addr) ((int) &addr)
|
|
|
|
|
2003-01-09 13:36:00 +08:00
|
|
|
|
|
|
|
char *ngx_conf_parse(ngx_conf_t *cf, ngx_str_t *filename);
|
|
|
|
|
|
|
|
|
2004-09-28 00:03:21 +08:00
|
|
|
ngx_int_t ngx_conf_full_name(ngx_cycle_t *cycle, ngx_str_t *name);
|
2003-07-21 05:15:59 +08:00
|
|
|
ngx_open_file_t *ngx_conf_open_file(ngx_cycle_t *cycle, ngx_str_t *name);
|
2005-03-23 00:02:46 +08:00
|
|
|
void ngx_cdecl ngx_conf_log_error(ngx_uint_t level, ngx_conf_t *cf,
|
|
|
|
ngx_err_t err, char *fmt, ...);
|
2003-07-18 22:44:05 +08:00
|
|
|
|
|
|
|
|
2003-05-27 20:18:54 +08:00
|
|
|
char *ngx_conf_set_flag_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
|
|
|
|
char *ngx_conf_set_str_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *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
|
|
|
char *ngx_conf_set_table_elt_slot(ngx_conf_t *cf, ngx_command_t *cmd,
|
|
|
|
void *conf);
|
2003-05-27 20:18:54 +08:00
|
|
|
char *ngx_conf_set_num_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
|
|
|
|
char *ngx_conf_set_size_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
|
|
|
|
char *ngx_conf_set_msec_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
|
2003-11-04 06:20:44 +08:00
|
|
|
char *ngx_conf_set_sec_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
|
2003-10-08 23:32:54 +08:00
|
|
|
char *ngx_conf_set_bufs_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
|
2004-04-14 13:57:36 +08:00
|
|
|
char *ngx_conf_set_enum_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
|
2003-10-30 16:51:06 +08:00
|
|
|
char *ngx_conf_set_bitmask_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
|
2002-12-27 00:26:23 +08:00
|
|
|
|
2003-07-21 05:15:59 +08:00
|
|
|
|
2004-04-26 04:13:21 +08:00
|
|
|
extern ngx_uint_t ngx_max_module;
|
2004-01-06 04:55:48 +08:00
|
|
|
extern ngx_module_t *ngx_modules[];
|
2002-12-19 15:08:55 +08:00
|
|
|
|
2003-07-21 05:15:59 +08:00
|
|
|
|
2003-02-07 01:21:13 +08:00
|
|
|
#endif /* _NGX_HTTP_CONF_FILE_H_INCLUDED_ */
|