Mercurial > hg > nginx-vendor-current

comparison src/http/modules/ngx_http_fastcgi_module.c @ 178:87699398f955 NGINX_0_3_36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.3.36 *) Feature: the ngx_http_addition_filter_module. *) Feature: the "proxy_pass" and "fastcgi_pass" directives may be used inside the "if" block. *) Feature: the "proxy_ignore_client_abort" and "fastcgi_ignore_client_abort" directives. *) Feature: the "$request_completion" variable. *) Feature: the ngx_http_perl_module supports the $r->request_method and $r->remote_addr. *) Feature: the ngx_http_ssi_module supports the "elif" command. *) Bugfix: the "\/" string in the expression of the "if" command of the ngx_http_ssi_module was treated incorrectly. *) Bugfix: in the regular expressions in the "if" command of the ngx_http_ssi_module. *) Bugfix: if the relative path was specified in the "client_body_temp_path", "proxy_temp_path", "fastcgi_temp_path", and "perl_modules" directives, then the directory was used relatively to a current path but not to a server prefix.
author Igor Sysoev <http://sysoev.ru>
date Wed, 05 Apr 2006 00:00:00 +0400
parents 1b490fc19afa
children 54aabf2b0bc6
comparison
equal deleted inserted replaced
177:4a3ddd758222 178:87699398f955
168 168
169 169
170 static ngx_command_t ngx_http_fastcgi_commands[] = { 170 static ngx_command_t ngx_http_fastcgi_commands[] = {
171 171
172 { ngx_string("fastcgi_pass"), 172 { ngx_string("fastcgi_pass"),
173 NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, 173 NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
174 ngx_http_fastcgi_pass, 174 ngx_http_fastcgi_pass,
175 NGX_HTTP_LOC_CONF_OFFSET, 175 NGX_HTTP_LOC_CONF_OFFSET,
176 0, 176 0,
177 NULL }, 177 NULL },
178 178
179 { ngx_string("fastcgi_index"), 179 { ngx_string("fastcgi_index"),
180 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, 180 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
181 ngx_conf_set_str_slot, 181 ngx_conf_set_str_slot,
182 NGX_HTTP_LOC_CONF_OFFSET, 182 NGX_HTTP_LOC_CONF_OFFSET,
183 offsetof(ngx_http_fastcgi_loc_conf_t, index), 183 offsetof(ngx_http_fastcgi_loc_conf_t, index),
184 NULL },
185
186 { ngx_string("fastcgi_ignore_client_abort"),
187 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
188 ngx_conf_set_flag_slot,
189 NGX_HTTP_LOC_CONF_OFFSET,
190 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.ignore_client_abort),
184 NULL }, 191 NULL },
185 192
186 { ngx_string("fastcgi_connect_timeout"), 193 { ngx_string("fastcgi_connect_timeout"),
187 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, 194 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
188 ngx_conf_set_msec_slot, 195 ngx_conf_set_msec_slot,
1468 * conf->index.len = 0; 1475 * conf->index.len = 0;
1469 * conf->index.data = NULL; 1476 * conf->index.data = NULL;
1470 */ 1477 */
1471 1478
1472 conf->upstream.buffering = NGX_CONF_UNSET; 1479 conf->upstream.buffering = NGX_CONF_UNSET;
1480 conf->upstream.ignore_client_abort = NGX_CONF_UNSET;
1473 1481
1474 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; 1482 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC;
1475 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; 1483 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC;
1476 conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC; 1484 conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC;
1477 1485
1517 ngx_http_script_compile_t sc; 1525 ngx_http_script_compile_t sc;
1518 ngx_http_script_copy_code_t *copy; 1526 ngx_http_script_copy_code_t *copy;
1519 1527
1520 ngx_conf_merge_value(conf->upstream.buffering, 1528 ngx_conf_merge_value(conf->upstream.buffering,
1521 prev->upstream.buffering, 1); 1529 prev->upstream.buffering, 1);
1530
1531 ngx_conf_merge_value(conf->upstream.ignore_client_abort,
1532 prev->upstream.ignore_client_abort, 0);
1522 1533
1523 ngx_conf_merge_msec_value(conf->upstream.connect_timeout, 1534 ngx_conf_merge_msec_value(conf->upstream.connect_timeout,
1524 prev->upstream.connect_timeout, 60000); 1535 prev->upstream.connect_timeout, 60000);
1525 1536
1526 ngx_conf_merge_msec_value(conf->upstream.send_timeout, 1537 ngx_conf_merge_msec_value(conf->upstream.send_timeout,
1668 1679
1669 ngx_conf_merge_str_value(conf->index, prev->index, ""); 1680 ngx_conf_merge_str_value(conf->index, prev->index, "");
1670 1681
1671 if (conf->peers == NULL) { 1682 if (conf->peers == NULL) {
1672 conf->peers = prev->peers; 1683 conf->peers = prev->peers;
1684 conf->upstream.schema = prev->upstream.schema;
1673 } 1685 }
1674 1686
1675 if (conf->params_source == NULL) { 1687 if (conf->params_source == NULL) {
1676 conf->flushes = prev->flushes; 1688 conf->flushes = prev->flushes;
1677 conf->params_len = prev->params_len; 1689 conf->params_len = prev->params_len;