Mercurial > hg > nginx-vendor-current

comparison src/http/ngx_http_core_module.c @ 28:7ca9bdc82b3f NGINX_0_1_14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.1.14 *) 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; bug 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.
author Igor Sysoev <http://sysoev.ru>
date Tue, 18 Jan 2005 00:00:00 +0300
parents 45fe5b98a9de
children e1ada20fc595
comparison
equal deleted inserted replaced
27:66901c2556fd 28:7ca9bdc82b3f
203 ngx_conf_set_msec_slot, 203 ngx_conf_set_msec_slot,
204 NGX_HTTP_LOC_CONF_OFFSET, 204 NGX_HTTP_LOC_CONF_OFFSET,
205 offsetof(ngx_http_core_loc_conf_t, client_body_timeout), 205 offsetof(ngx_http_core_loc_conf_t, client_body_timeout),
206 NULL }, 206 NULL },
207 207
208 { ngx_string("client_body_temp_path"),
209 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1234,
210 ngx_conf_set_path_slot,
211 NGX_HTTP_LOC_CONF_OFFSET,
212 offsetof(ngx_http_core_loc_conf_t, client_body_temp_path),
213 (void *) ngx_garbage_collector_temp_handler },
214
208 { ngx_string("sendfile"), 215 { ngx_string("sendfile"),
209 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, 216 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
210 ngx_conf_set_flag_slot, 217 ngx_conf_set_flag_slot,
211 NGX_HTTP_LOC_CONF_OFFSET, 218 NGX_HTTP_LOC_CONF_OFFSET,
212 offsetof(ngx_http_core_loc_conf_t, sendfile), 219 offsetof(ngx_http_core_loc_conf_t, sendfile),
1286 ngx_http_core_srv_conf_t *cscf; 1293 ngx_http_core_srv_conf_t *cscf;
1287 1294
1288 ngx_test_null(cscf, 1295 ngx_test_null(cscf,
1289 ngx_pcalloc(cf->pool, sizeof(ngx_http_core_srv_conf_t)), 1296 ngx_pcalloc(cf->pool, sizeof(ngx_http_core_srv_conf_t)),
1290 NGX_CONF_ERROR); 1297 NGX_CONF_ERROR);
1291
1292 /* 1298 /*
1293 1299 *
1294 set by ngx_pcalloc(): 1300 * set by ngx_pcalloc():
1295 1301 * conf->client_large_buffers.num = 0;
1296 conf->client_large_buffers.num = 0; 1302 */
1297
1298 */
1299
1300 1303
1301 ngx_init_array(cscf->locations, cf->pool, 1304 ngx_init_array(cscf->locations, cf->pool,
1302 5, sizeof(void *), NGX_CONF_ERROR); 1305 5, sizeof(void *), NGX_CONF_ERROR);
1303 ngx_init_array(cscf->listen, cf->pool, 5, sizeof(ngx_http_listen_t), 1306 ngx_init_array(cscf->listen, cf->pool, 5, sizeof(ngx_http_listen_t),
1304 NGX_CONF_ERROR); 1307 NGX_CONF_ERROR);
1396 1399
1397 ngx_test_null(lcf, 1400 ngx_test_null(lcf,
1398 ngx_pcalloc(cf->pool, sizeof(ngx_http_core_loc_conf_t)), 1401 ngx_pcalloc(cf->pool, sizeof(ngx_http_core_loc_conf_t)),
1399 NGX_CONF_ERROR); 1402 NGX_CONF_ERROR);
1400 1403
1401 /* set by ngx_pcalloc(): 1404 /*
1402 1405 * set by ngx_pcalloc():
1403 lcf->root.len = 0; 1406 *
1404 lcf->root.data = NULL; 1407 * lcf->root.len = 0;
1405 lcf->types = NULL; 1408 * lcf->root.data = NULL;
1406 lcf->default_type.len = 0; 1409 * lcf->types = NULL;
1407 lcf->default_type.data = NULL; 1410 * lcf->default_type.len = 0;
1408 lcf->err_log = NULL; 1411 * lcf->default_type.data = NULL;
1409 lcf->error_pages = NULL; 1412 * lcf->err_log = NULL;
1410 1413 * lcf->error_pages = NULL;
1411 lcf->regex = NULL; 1414 * lcf->client_body_path = NULL;
1412 lcf->exact_match = 0; 1415 * lcf->regex = NULL;
1413 lcf->auto_redirect = 0; 1416 * lcf->exact_match = 0;
1414 lcf->alias = 0; 1417 * lcf->auto_redirect = 0;
1415 1418 * lcf->alias = 0;
1416 */ 1419 */
1417 1420
1418 lcf->client_max_body_size = NGX_CONF_UNSET_SIZE; 1421 lcf->client_max_body_size = NGX_CONF_UNSET_SIZE;
1419 lcf->client_body_buffer_size = NGX_CONF_UNSET_SIZE; 1422 lcf->client_body_buffer_size = NGX_CONF_UNSET_SIZE;
1420 lcf->client_body_timeout = NGX_CONF_UNSET_MSEC; 1423 lcf->client_body_timeout = NGX_CONF_UNSET_MSEC;
1421 lcf->sendfile = NGX_CONF_UNSET; 1424 lcf->sendfile = NGX_CONF_UNSET;
1524 ngx_conf_merge_msec_value(conf->lingering_time, 1527 ngx_conf_merge_msec_value(conf->lingering_time,
1525 prev->lingering_time, 30000); 1528 prev->lingering_time, 30000);
1526 ngx_conf_merge_msec_value(conf->lingering_timeout, 1529 ngx_conf_merge_msec_value(conf->lingering_timeout,
1527 prev->lingering_timeout, 5000); 1530 prev->lingering_timeout, 5000);
1528 1531
1532 ngx_conf_merge_path_value(conf->client_body_temp_path,
1533 prev->client_body_temp_path,
1534 NGX_HTTP_CLIENT_TEMP_PATH, 0, 0, 0,
1535 ngx_garbage_collector_temp_handler, cf);
1536
1529 ngx_conf_merge_value(conf->reset_timedout_connection, 1537 ngx_conf_merge_value(conf->reset_timedout_connection,
1530 prev->reset_timedout_connection, 0); 1538 prev->reset_timedout_connection, 0);
1531 ngx_conf_merge_value(conf->msie_padding, prev->msie_padding, 1); 1539 ngx_conf_merge_value(conf->msie_padding, prev->msie_padding, 1);
1532 1540
1533 if (conf->open_files == NULL) { 1541 if (conf->open_files == NULL) {
1744 1752
1745 overwrite = ngx_atoi(&value[i].data[1], value[i].len - 1); 1753 overwrite = ngx_atoi(&value[i].data[1], value[i].len - 1);
1746 1754
1747 if (overwrite == NGX_ERROR) { 1755 if (overwrite == NGX_ERROR) {
1748 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 1756 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
1749 "invalid value \"%V\"", value[i]); 1757 "invalid value \"%V\"", &value[i]);
1750 return NGX_CONF_ERROR; 1758 return NGX_CONF_ERROR;
1751 } 1759 }
1752 1760
1753 n = 2; 1761 n = 2;
1754 1762