CERBERUS/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2026-09-01 02:58:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nginx-0.3.2-RELEASE import

Browse source 
*) Feature: the Sun Studio 10 C compiler support.

    *) Feature: the "proxy_upstream_max_fails",
       "proxy_upstream_fail_timeout", "fastcgi_upstream_max_fails", and
       "fastcgi_upstream_fail_timeout" directives.
This commit is contained in:
Igor Sysoev 2005-10-12 13:50:36 +00:00
parent bbfe3033bc
commit 784522377e
53 changed files with 1097 additions and 646 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/http/modules/ngx_http_fastcgi_module.c
View file

@ -151,10 +151,6 @@ static ngx_str_t ngx_http_fastcgi_script_name =
static ngx_conf_post_t ngx_http_fastcgi_lowat_post =
{ ngx_http_fastcgi_lowat_check };
static ngx_conf_enum_t ngx_http_fastcgi_set_methods[] = {
{ ngx_string("get"), NGX_HTTP_GET },
{ ngx_null_string, 0 }
};
static ngx_conf_bitmask_t ngx_http_fastcgi_next_upstream_masks[] = {
{ ngx_string("error"), NGX_HTTP_UPSTREAM_FT_ERROR },
@ -210,13 +206,6 @@ static ngx_command_t ngx_http_fastcgi_commands[] = {
offsetof(ngx_http_fastcgi_loc_conf_t, upstream.header_buffer_size),
NULL },
{ ngx_string("fastcgi_method"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
ngx_conf_set_enum_slot,
NGX_HTTP_LOC_CONF_OFFSET,
offsetof(ngx_http_fastcgi_loc_conf_t, upstream.method),
ngx_http_fastcgi_set_methods },
{ ngx_string("fastcgi_pass_request_headers"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
ngx_conf_set_flag_slot,
@ -294,6 +283,20 @@ static ngx_command_t ngx_http_fastcgi_commands[] = {
offsetof(ngx_http_fastcgi_loc_conf_t, upstream.next_upstream),
&ngx_http_fastcgi_next_upstream_masks },
{ ngx_string("fastcgi_upstream_max_fails"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
ngx_conf_set_num_slot,
NGX_HTTP_LOC_CONF_OFFSET,
offsetof(ngx_http_fastcgi_loc_conf_t, upstream.max_fails),
NULL },
{ ngx_string("fastcgi_upstream_fail_timeout"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
ngx_conf_set_sec_slot,
NGX_HTTP_LOC_CONF_OFFSET,
offsetof(ngx_http_fastcgi_loc_conf_t, upstream.fail_timeout),
NULL },
{ ngx_string("fastcgi_param"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE2,
ngx_conf_set_table_elt_slot,
@ -1443,7 +1446,9 @@ ngx_http_fastcgi_create_loc_conf(ngx_conf_t *cf)
conf->upstream.max_temp_file_size_conf = NGX_CONF_UNSET_SIZE;
conf->upstream.temp_file_write_size_conf = NGX_CONF_UNSET_SIZE;
conf->upstream.method = NGX_CONF_UNSET_UINT;
conf->upstream.max_fails = NGX_CONF_UNSET_UINT;
conf->upstream.fail_timeout = NGX_CONF_UNSET;
conf->upstream.pass_request_headers = NGX_CONF_UNSET;
conf->upstream.pass_request_body = NGX_CONF_UNSET;
@ -1591,15 +1596,25 @@ ngx_http_fastcgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
|NGX_HTTP_UPSTREAM_FT_ERROR
|NGX_HTTP_UPSTREAM_FT_TIMEOUT));
ngx_conf_merge_unsigned_value(conf->upstream.max_fails,
prev->upstream.max_fails, 1);
ngx_conf_merge_sec_value(conf->upstream.fail_timeout,
prev->upstream.fail_timeout, 10);
if (conf->peers && conf->peers->number > 1) {
for (i = 0; i < conf->peers->number; i++) {
conf->peers->peer[i].weight = 1;
conf->peers->peer[i].max_fails = conf->upstream.max_fails;
conf->peers->peer[i].fail_timeout = conf->upstream.fail_timeout;
}
}
ngx_conf_merge_path_value(conf->upstream.temp_path,
prev->upstream.temp_path,
NGX_HTTP_FASTCGI_TEMP_PATH, 1, 2, 0,
ngx_garbage_collector_temp_handler, cf);
if (conf->upstream.method == NGX_CONF_UNSET_UINT) {
conf->upstream.method = prev->upstream.method;
}
ngx_conf_merge_value(conf->upstream.pass_request_headers,
prev->upstream.pass_request_headers, 1);
ngx_conf_merge_value(conf->upstream.pass_request_body,

93
src/http/modules/ngx_http_proxy_module.c
View file

@ -46,6 +46,7 @@ typedef struct {
ngx_array_t *redirects;
ngx_str_t method;
ngx_str_t host_header;
ngx_str_t port_text;
@ -100,10 +101,6 @@ static char *ngx_http_proxy_lowat_check(ngx_conf_t *cf, void *post, void *data);
static ngx_conf_post_t ngx_http_proxy_lowat_post =
{ ngx_http_proxy_lowat_check };
static ngx_conf_enum_t ngx_http_proxy_set_methods[] = {
{ ngx_string("get"), NGX_HTTP_GET },
{ ngx_null_string, 0 }
};
static ngx_conf_bitmask_t ngx_http_proxy_next_upstream_masks[] = {
{ ngx_string("error"), NGX_HTTP_UPSTREAM_FT_ERROR },
@ -168,10 +165,10 @@ static ngx_command_t ngx_http_proxy_commands[] = {
{ ngx_string("proxy_method"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
ngx_conf_set_enum_slot,
ngx_conf_set_str_slot,
NGX_HTTP_LOC_CONF_OFFSET,
offsetof(ngx_http_proxy_loc_conf_t, upstream.method),
ngx_http_proxy_set_methods },
offsetof(ngx_http_proxy_loc_conf_t, method),
NULL },
{ ngx_string("proxy_pass_request_headers"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
@ -243,6 +240,20 @@ static ngx_command_t ngx_http_proxy_commands[] = {
offsetof(ngx_http_proxy_loc_conf_t, upstream.next_upstream),
&ngx_http_proxy_next_upstream_masks },
{ ngx_string("proxy_upstream_max_fails"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
ngx_conf_set_num_slot,
NGX_HTTP_LOC_CONF_OFFSET,
offsetof(ngx_http_proxy_loc_conf_t, upstream.max_fails),
NULL },
{ ngx_string("proxy_upstream_fail_timeout"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
ngx_conf_set_sec_slot,
NGX_HTTP_LOC_CONF_OFFSET,
offsetof(ngx_http_proxy_loc_conf_t, upstream.fail_timeout),
NULL },
{ ngx_string("proxy_pass_x_powered_by"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
ngx_conf_set_flag_slot,
@ -299,13 +310,6 @@ ngx_module_t ngx_http_proxy_module = {
};
static ngx_str_t ngx_http_proxy_methods[] = {
ngx_string("GET "),
ngx_string("HEAD "),
ngx_string("POST ")
};
static char ngx_http_proxy_version[] = " HTTP/1.0" CRLF;
@ -394,7 +398,7 @@ ngx_http_proxy_create_request(ngx_http_request_t *r)
ngx_uint_t i, key;
uintptr_t escape;
ngx_buf_t *b;
ngx_str_t *hh;
ngx_str_t *hh, method;
ngx_chain_t *cl, *body;
ngx_list_part_t *part;
ngx_table_elt_t *header;
@ -410,12 +414,21 @@ ngx_http_proxy_create_request(ngx_http_request_t *r)
len = sizeof(ngx_http_proxy_version) - 1 + sizeof(CRLF) - 1;
if (u->method) {
len += ngx_http_proxy_methods[u->method - 1].len + u->conf->uri.len;
if (u->method.len) {
/* HEAD was changed to GET to cache response */
method = u->method;
method.len++;
} else if (plcf->method.len) {
method = plcf->method;
} else {
len += r->method_name.len + 1 + u->conf->uri.len;
method = r->method_name;
method.len++;
}
len += method.len + u->conf->uri.len;
escape = 0;
loc_len = r->valid_location ? u->conf->location->len : 0;
@ -493,14 +506,7 @@ ngx_http_proxy_create_request(ngx_http_request_t *r)
/* the request line */
if (u->method) {
b->last = ngx_cpymem(b->last,
ngx_http_proxy_methods[u->method - 1].data,
ngx_http_proxy_methods[u->method - 1].len);
} else {
b->last = ngx_cpymem(b->last, r->method_name.data,
r->method_name.len + 1);
}
b->last = ngx_cpymem(b->last, method.data, method.len);
u->uri.data = b->last;
@ -1288,6 +1294,7 @@ ngx_http_proxy_create_loc_conf(ngx_conf_t *cf)
* conf->upstream.uri = { 0, NULL };
* conf->upstream.location = NULL;
*
* conf->method = NULL;
* conf->headers_source = NULL;
* conf->headers_set_len = NULL;
* conf->headers_set = NULL;
@ -1306,10 +1313,12 @@ ngx_http_proxy_create_loc_conf(ngx_conf_t *cf)
conf->upstream.max_temp_file_size_conf = NGX_CONF_UNSET_SIZE;
conf->upstream.temp_file_write_size_conf = NGX_CONF_UNSET_SIZE;
conf->upstream.method = NGX_CONF_UNSET_UINT;
conf->upstream.max_fails = NGX_CONF_UNSET_UINT;
conf->upstream.fail_timeout = NGX_CONF_UNSET;
conf->upstream.pass_request_headers = NGX_CONF_UNSET;
conf->upstream.pass_request_body = NGX_CONF_UNSET;
conf->upstream.redirect_errors = NGX_CONF_UNSET;
/* "proxy_cyclic_temp_file" is disabled */
@ -1440,10 +1449,10 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
&& conf->upstream.max_temp_file_size < size)
{
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"\"fastcgi_max_temp_file_size\" must be equal to zero to disable "
"\"proxy_max_temp_file_size\" must be equal to zero to disable "
"the temporary files usage or must be equal or bigger than "
"maximum of the value of \"fastcgi_header_buffer_size\" and "
"one of the \"fastcgi_buffers\"");
"maximum of the value of \"proxy_header_buffer_size\" and "
"one of the \"proxy_buffers\"");
return NGX_CONF_ERROR;
}
@ -1455,13 +1464,31 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
|NGX_HTTP_UPSTREAM_FT_ERROR
|NGX_HTTP_UPSTREAM_FT_TIMEOUT));
ngx_conf_merge_unsigned_value(conf->upstream.max_fails,
prev->upstream.max_fails, 1);
ngx_conf_merge_sec_value(conf->upstream.fail_timeout,
prev->upstream.fail_timeout, 10);
if (conf->peers && conf->peers->number > 1) {
for (i = 0; i < conf->peers->number; i++) {
conf->peers->peer[i].weight = 1;
conf->peers->peer[i].max_fails = conf->upstream.max_fails;
conf->peers->peer[i].fail_timeout = conf->upstream.fail_timeout;
}
}
ngx_conf_merge_path_value(conf->upstream.temp_path,
prev->upstream.temp_path,
NGX_HTTP_PROXY_TEMP_PATH, 1, 2, 0,
ngx_garbage_collector_temp_handler, cf);
if (conf->upstream.method == NGX_CONF_UNSET_UINT) {
conf->upstream.method = prev->upstream.method;
if (conf->method.len == 0) {
conf->method = prev->method;
} else {
conf->method.data[conf->method.len] = ' ';
conf->method.len++;
}
ngx_conf_merge_value(conf->upstream.pass_request_headers,

4
src/http/ngx_http.c
View file

@ -721,10 +721,10 @@ ngx_http_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
}
}
#if (NGX_DEBUG)
#if (NGX_DEBUG0)
{
u_char address[20];
ngx_uint_t p, a, n;
ngx_uint_t p, a, nn;
in_port = in_ports.elts;
for (p = 0; p < in_ports.nelts; p++) {

34
src/http/ngx_http_request.c
View file

@ -174,13 +174,13 @@ ngx_http_init_connection(ngx_connection_t *c)
ngx_mutex_unlock(ngx_posted_events_mutex);
#if (NGX_STAT_STUB)
ngx_atomic_inc(ngx_stat_reading);
ngx_atomic_fetch_add(ngx_stat_reading, 1);
#endif
return;
}
#if (NGX_STAT_STUB)
ngx_atomic_inc(ngx_stat_reading);
ngx_atomic_fetch_add(ngx_stat_reading, 1);
#endif
ngx_http_init_request(rev);
@ -195,7 +195,7 @@ ngx_http_init_connection(ngx_connection_t *c)
}
#if (NGX_STAT_STUB)
ngx_atomic_inc(ngx_stat_reading);
ngx_atomic_fetch_add(ngx_stat_reading, 1);
#endif
}
@ -226,7 +226,7 @@ void ngx_http_init_request(ngx_event_t *rev)
ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, "client timed out");
#if (NGX_STAT_STUB)
ngx_atomic_dec(ngx_stat_reading);
ngx_atomic_fetch_add(ngx_stat_reading, -1);
#endif
ngx_http_close_connection(c);
@ -238,7 +238,7 @@ void ngx_http_init_request(ngx_event_t *rev)
if (hc) {
#if (NGX_STAT_STUB)
ngx_atomic_inc(ngx_stat_reading);
ngx_atomic_fetch_add(ngx_stat_reading, 1);
#endif
} else {
@ -246,7 +246,7 @@ void ngx_http_init_request(ngx_event_t *rev)
if (hc == NULL) {
#if (NGX_STAT_STUB)
ngx_atomic_dec(ngx_stat_reading);
ngx_atomic_fetch_add(ngx_stat_reading, -1);
#endif
ngx_http_close_connection(c);
@ -270,7 +270,7 @@ void ngx_http_init_request(ngx_event_t *rev)
if (r == NULL) {
#if (NGX_STAT_STUB)
ngx_atomic_dec(ngx_stat_reading);
ngx_atomic_fetch_add(ngx_stat_reading, -1);
#endif
ngx_http_close_connection(c);
@ -281,7 +281,7 @@ void ngx_http_init_request(ngx_event_t *rev)
}
#if (NGX_STAT_STUB)
ngx_atomic_dec(ngx_stat_reading);
ngx_atomic_fetch_add(ngx_stat_reading, -1);
#endif
c->data = r;
@ -439,9 +439,9 @@ void ngx_http_init_request(ngx_event_t *rev)
r->log_handler = ngx_http_log_error_handler;
#if (NGX_STAT_STUB)
ngx_atomic_inc(ngx_stat_reading);
ngx_atomic_fetch_add(ngx_stat_reading, 1);
r->stat_reading = 1;
ngx_atomic_inc(ngx_stat_requests);
ngx_atomic_fetch_add(ngx_stat_requests, 1);
#endif
rev->handler(rev);
@ -669,9 +669,9 @@ ngx_http_process_request_line(ngx_event_t *rev)
}
#if (NGX_STAT_STUB)
ngx_atomic_dec(ngx_stat_reading);
ngx_atomic_fetch_add(ngx_stat_reading, -1);
r->stat_reading = 0;
ngx_atomic_inc(ngx_stat_writing);
ngx_atomic_fetch_add(ngx_stat_writing, 1);
r->stat_writing = 1;
#endif
@ -899,9 +899,9 @@ ngx_http_process_request_headers(ngx_event_t *rev)
}
#if (NGX_STAT_STUB)
ngx_atomic_dec(ngx_stat_reading);
ngx_atomic_fetch_add(ngx_stat_reading, -1);
r->stat_reading = 0;
ngx_atomic_inc(ngx_stat_writing);
ngx_atomic_fetch_add(ngx_stat_writing, 1);
r->stat_writing = 1;
#endif
@ -2396,11 +2396,11 @@ ngx_http_close_request(ngx_http_request_t *r, ngx_int_t error)
#if (NGX_STAT_STUB)
if (r->stat_reading) {
ngx_atomic_dec(ngx_stat_reading);
ngx_atomic_fetch_add(ngx_stat_reading, -1);
}
if (r->stat_writing) {
ngx_atomic_dec(ngx_stat_writing);
ngx_atomic_fetch_add(ngx_stat_writing, -1);
}
#endif
@ -2457,7 +2457,7 @@ ngx_http_close_connection(ngx_connection_t *c)
#endif
#if (NGX_STAT_STUB)
ngx_atomic_dec(ngx_stat_active);
ngx_atomic_fetch_add(ngx_stat_active, -1);
#endif
pool = c->pool;

7
src/http/ngx_http_upstream.c
View file

@ -251,13 +251,6 @@ ngx_http_upstream_init(ngx_http_request_t *r)
u->request_bufs = r->request_body->bufs;
}
if (u->conf->method == NGX_CONF_UNSET_UINT) {
u->method = r->method;
} else {
u->method = u->conf->method;
}
if (u->create_request(r) != NGX_OK) {
ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
return;

6
src/http/ngx_http_upstream.h
View file

@ -62,7 +62,9 @@ typedef struct {
size_t temp_file_write_size_conf;
ngx_uint_t next_upstream;
ngx_uint_t method;
ngx_uint_t max_fails;
time_t fail_timeout;
ngx_bufs_t bufs;
@ -156,7 +158,7 @@ struct ngx_http_upstream_s {
ngx_msec_t timeout;
ngx_uint_t method;
ngx_str_t method;
ngx_http_log_handler_pt saved_log_handler;

32
src/http/ngx_http_variables.c
View file

@ -32,6 +32,8 @@ static ngx_http_variable_value_t *
ngx_http_variable_document_root(ngx_http_request_t *r, uintptr_t data);
static ngx_http_variable_value_t *
ngx_http_variable_request_filename(ngx_http_request_t *r, uintptr_t data);
static ngx_http_variable_value_t *
ngx_http_variable_request_method(ngx_http_request_t *r, uintptr_t data);
static ngx_http_variable_value_t *
ngx_http_variable_remote_user(ngx_http_request_t *r, uintptr_t data);
@ -107,8 +109,7 @@ static ngx_http_variable_t ngx_http_core_variables[] = {
{ ngx_string("server_name"), ngx_http_variable_request,
offsetof(ngx_http_request_t, server_name), 0, 0 },
{ ngx_string("request_method"), ngx_http_variable_request,
offsetof(ngx_http_request_t, method_name), 0, 0 },
{ ngx_string("request_method"), ngx_http_variable_request_method, 0, 0, 0 },
{ ngx_string("remote_user"), ngx_http_variable_remote_user, 0, 0, 0 },
@ -640,6 +641,33 @@ ngx_http_variable_request_filename(ngx_http_request_t *r, uintptr_t data)
}
static ngx_http_variable_value_t *
ngx_http_variable_request_method(ngx_http_request_t *r, uintptr_t data)
{
ngx_http_variable_value_t *vv;
if (r->method_name.data == NULL) {
return NGX_HTTP_VAR_NOT_FOUND;
}
vv = ngx_palloc(r->pool, sizeof(ngx_http_variable_value_t));
if (vv == NULL) {
return NULL;
}
vv->value = 0;
if (r->upstream && r->upstream->method.len) {
vv->text = r->upstream->method;
} else {
vv->text = r->method_name;
}
return vv;
}
static ngx_http_variable_value_t *
ngx_http_variable_remote_user(ngx_http_request_t *r, uintptr_t data)
{