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.
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 478bb08..9429ea6 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -205,6 +205,13 @@
offsetof(ngx_http_core_loc_conf_t, client_body_timeout),
NULL },
+ { ngx_string("client_body_temp_path"),
+ NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1234,
+ ngx_conf_set_path_slot,
+ NGX_HTTP_LOC_CONF_OFFSET,
+ offsetof(ngx_http_core_loc_conf_t, client_body_temp_path),
+ (void *) ngx_garbage_collector_temp_handler },
+
{ ngx_string("sendfile"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
ngx_conf_set_flag_slot,
@@ -1288,15 +1295,11 @@
ngx_test_null(cscf,
ngx_pcalloc(cf->pool, sizeof(ngx_http_core_srv_conf_t)),
NGX_CONF_ERROR);
-
/*
-
- set by ngx_pcalloc():
-
- conf->client_large_buffers.num = 0;
-
- */
-
+ *
+ * set by ngx_pcalloc():
+ * conf->client_large_buffers.num = 0;
+ */
ngx_init_array(cscf->locations, cf->pool,
5, sizeof(void *), NGX_CONF_ERROR);
@@ -1398,22 +1401,22 @@
ngx_pcalloc(cf->pool, sizeof(ngx_http_core_loc_conf_t)),
NGX_CONF_ERROR);
- /* set by ngx_pcalloc():
-
- lcf->root.len = 0;
- lcf->root.data = NULL;
- lcf->types = NULL;
- lcf->default_type.len = 0;
- lcf->default_type.data = NULL;
- lcf->err_log = NULL;
- lcf->error_pages = NULL;
-
- lcf->regex = NULL;
- lcf->exact_match = 0;
- lcf->auto_redirect = 0;
- lcf->alias = 0;
-
- */
+ /*
+ * set by ngx_pcalloc():
+ *
+ * lcf->root.len = 0;
+ * lcf->root.data = NULL;
+ * lcf->types = NULL;
+ * lcf->default_type.len = 0;
+ * lcf->default_type.data = NULL;
+ * lcf->err_log = NULL;
+ * lcf->error_pages = NULL;
+ * lcf->client_body_path = NULL;
+ * lcf->regex = NULL;
+ * lcf->exact_match = 0;
+ * lcf->auto_redirect = 0;
+ * lcf->alias = 0;
+ */
lcf->client_max_body_size = NGX_CONF_UNSET_SIZE;
lcf->client_body_buffer_size = NGX_CONF_UNSET_SIZE;
@@ -1526,6 +1529,11 @@
ngx_conf_merge_msec_value(conf->lingering_timeout,
prev->lingering_timeout, 5000);
+ ngx_conf_merge_path_value(conf->client_body_temp_path,
+ prev->client_body_temp_path,
+ NGX_HTTP_CLIENT_TEMP_PATH, 0, 0, 0,
+ ngx_garbage_collector_temp_handler, cf);
+
ngx_conf_merge_value(conf->reset_timedout_connection,
prev->reset_timedout_connection, 0);
ngx_conf_merge_value(conf->msie_padding, prev->msie_padding, 1);
@@ -1746,7 +1754,7 @@
if (overwrite == NGX_ERROR) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
- "invalid value \"%V\"", value[i]);
+ "invalid value \"%V\"", &value[i]);
return NGX_CONF_ERROR;
}
