comparison src/core/ngx_conf_file.c @ 130:82d695e3d662 NGINX_0_3_12

nginx 0.3.12 *) Security: if nginx was built with the ngx_http_realip_module and the "satisfy_any on" directive was used, then access and authorization directives did not work. The ngx_http_realip_module was not built and is not built by default. *) Change: the "$time_gmt" variable name was changed to "$time_local". *) Change: the "proxy_header_buffer_size" and "fastcgi_header_buffer_size" directives was renamed to the "proxy_buffer_size" and "fastcgi_buffer_size" directives. *) Feature: the ngx_http_memcached_module. *) Feature: the "proxy_buffering" directive. *) Bugfix: the changes in accept mutex handling when the "rtsig" method was used; bug appeared in 0.3.0. *) Bugfix: if the client sent the "Transfer-Encoding: chunked" header line, then nginx returns the 411 error. *) Bugfix: if the "auth_basic" directive was inherited from the http level, then the realm in the "WWW-Authenticate" header line was without the "Basic realm" text. *) Bugfix: if the "combined" format was explicitly specified in the "access_log" directive, then the empty lines was written to the log; bug appeared in 0.3.8. *) Bugfix: nginx did not run on the sparc platform under any OS except Solaris. *) Bugfix: now it is not necessary to place space between the quoted string and closing bracket in the "if" directive.
author Igor Sysoev <http://sysoev.ru>
date Sat, 26 Nov 2005 00:00:00 +0300
parents e85dca77c46a
children 91372f004adf
comparison
equal deleted inserted replaced
129:a27c77ef3ad8 130:82d695e3d662
75 75
76 /* open configuration file */ 76 /* open configuration file */
77 77
78 fd = ngx_open_file(filename->data, NGX_FILE_RDONLY, NGX_FILE_OPEN); 78 fd = ngx_open_file(filename->data, NGX_FILE_RDONLY, NGX_FILE_OPEN);
79 if (fd == NGX_INVALID_FILE) { 79 if (fd == NGX_INVALID_FILE) {
80 ngx_log_error(NGX_LOG_EMERG, cf->log, ngx_errno, 80 ngx_conf_log_error(NGX_LOG_EMERG, cf, ngx_errno,
81 ngx_open_file_n " \"%s\" failed", filename->data); 81 ngx_open_file_n " \"%s\" failed", filename->data);
82 return NGX_CONF_ERROR; 82 return NGX_CONF_ERROR;
83 } 83 }
84 84
85 prev = cf->conf_file; 85 prev = cf->conf_file;
86 86
449 449
450 if (ch == '{') { 450 if (ch == '{') {
451 return NGX_CONF_BLOCK_START; 451 return NGX_CONF_BLOCK_START;
452 } 452 }
453 453
454 ngx_log_error(NGX_LOG_EMERG, cf->log, 0, 454 if (ch == ')') {
455 "unexpected \"%c\" in %s:%ui", 455 last_space = 1;
456 ch, cf->conf_file->file.name.data, 456 need_space = 0;
457 cf->conf_file->line); 457
458 458 } else {
459 return NGX_ERROR; 459 ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
460 "unexpected \"%c\" in %s:%ui",
461 ch, cf->conf_file->file.name.data,
462 cf->conf_file->line);
463
464 return NGX_ERROR;
465 }
460 } 466 }
461 467
462 if (last_space) { 468 if (last_space) {
463 if (ch == ' ' || ch == '\t' || ch == CR || ch == LF) { 469 if (ch == ' ' || ch == '\t' || ch == CR || ch == LF) {
464 continue; 470 continue;
1165 return "unsupported on this platform"; 1171 return "unsupported on this platform";
1166 } 1172 }
1167 1173
1168 1174
1169 char * 1175 char *
1176 ngx_conf_deprecated(ngx_conf_t *cf, void *post, void *data)
1177 {
1178 ngx_conf_deprecated_t *d = post;
1179
1180 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
1181 "the \"%s\" directive is deprecated, "
1182 "use the \"%s\" directive instead",
1183 d->old_name, d->new_name);
1184
1185 return NGX_CONF_OK;
1186 }
1187
1188
1189 char *
1170 ngx_conf_check_num_bounds(ngx_conf_t *cf, void *post, void *data) 1190 ngx_conf_check_num_bounds(ngx_conf_t *cf, void *post, void *data)
1171 { 1191 {
1172 ngx_conf_num_bounds_t *bounds = post; 1192 ngx_conf_num_bounds_t *bounds = post;
1173 ngx_int_t *np = data; 1193 ngx_int_t *np = data;
1174 1194