comparison src/core/ngx_conf_file.h @ 28:7ca9bdc82b3f NGINX_0_1_14

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 46833bd150cb
children 0d75d65c642f
comparison
equal deleted inserted replaced
27:66901c2556fd 28:7ca9bdc82b3f
237 if (conf == NGX_CONF_UNSET_SIZE) { \ 237 if (conf == NGX_CONF_UNSET_SIZE) { \
238 conf = (prev == NGX_CONF_UNSET_SIZE) ? default : prev; \ 238 conf = (prev == NGX_CONF_UNSET_SIZE) ? default : prev; \
239 } 239 }
240 240
241 #define ngx_conf_merge_str_value(conf, prev, default) \ 241 #define ngx_conf_merge_str_value(conf, prev, default) \
242 if (conf.len == 0) { \ 242 if (conf.data == NULL) { \
243 if (prev.len) { \ 243 if (prev.data) { \
244 conf.len = prev.len; \ 244 conf.len = prev.len; \
245 conf.data = prev.data; \ 245 conf.data = prev.data; \
246 } else { \ 246 } else { \
247 conf.len = sizeof(default) - 1; \ 247 conf.len = sizeof(default) - 1; \
248 conf.data = (u_char *) default; \ 248 conf.data = (u_char *) default; \