Mercurial > hg > nginx
diff src/core/ngx_conf_file.c @ 487:31ff3e943e16 release-0.1.18
nginx-0.1.18-RELEASE import
*) Workaround: the default values of the devpoll_events and the
devpoll_changes directives changed from 512 to 32 to be compatible
with Solaris 10.
*) Bugfix: the proxy_set_x_var and fastcgi_set_var directives were not
inherited.
*) Bugfix: in the redirect rewrite directive the arguments were
concatenated with URI by the "&" rather than the "?".
*) Bugfix: the lines without trailing ";" in the file being included by
the ngx_http_geo_module were silently ignored.
*) Feature: the ngx_http_stub_status_module.
*) Bugfix: the unknown log format in the access_log directive caused
the segmentation fault.
*) Feature: the new "document_root" parameter of the fastcgi_params
directive.
*) Feature: the fastcgi_redirect_errors directive.
*) Feature: the new "break" modifier of the "rewrite" directive allows
to stop the rewrite/location cycle and sets the current
configuration to the request.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Wed, 09 Feb 2005 14:31:07 +0000 |
parents | 4ebe09b07e30 |
children | 64d9afb209da |
line wrap: on
line diff
--- a/src/core/ngx_conf_file.c +++ b/src/core/ngx_conf_file.c @@ -48,7 +48,7 @@ static int argument_number[] = { NGX_CONF_TAKE7 }; -static int ngx_conf_read_token(ngx_conf_t *cf); +static ngx_int_t ngx_conf_read_token(ngx_conf_t *cf); char *ngx_conf_parse(ngx_conf_t *cf, ngx_str_t *filename) @@ -337,7 +337,7 @@ char *ngx_conf_parse(ngx_conf_t *cf, ngx } -static int ngx_conf_read_token(ngx_conf_t *cf) +static ngx_int_t ngx_conf_read_token(ngx_conf_t *cf) { u_char *start, ch, *src, *dst; int len; @@ -361,7 +361,17 @@ static int ngx_conf_read_token(ngx_conf_ if (b->pos >= b->last) { if (cf->conf_file->file.offset - >= ngx_file_size(&cf->conf_file->file.info)) { + >= ngx_file_size(&cf->conf_file->file.info)) + { + if (cf->args->nelts > 0) { + ngx_log_error(NGX_LOG_EMERG, cf->log, 0, + "unexpected end of file in %s:%d, " + "expecting \";\" or \"}\"", + cf->conf_file->file.name.data, + cf->conf_file->line); + return NGX_ERROR; + } + return NGX_CONF_FILE_DONE; } @@ -418,7 +428,7 @@ static int ngx_conf_read_token(ngx_conf_ } ngx_log_error(NGX_LOG_EMERG, cf->log, 0, - "unexpected '%c' in %s:%d", + "unexpected \"%c\" in %s:%d", ch, cf->conf_file->file.name.data, cf->conf_file->line); @@ -438,7 +448,7 @@ static int ngx_conf_read_token(ngx_conf_ case '{': if (cf->args->nelts == 0) { ngx_log_error(NGX_LOG_EMERG, cf->log, 0, - "unexpected '%c' in %s:%d", + "unexpected \"%c\" in %s:%d", ch, cf->conf_file->file.name.data, cf->conf_file->line); return NGX_ERROR; @@ -453,7 +463,7 @@ static int ngx_conf_read_token(ngx_conf_ case '}': if (cf->args->nelts > 0) { ngx_log_error(NGX_LOG_EMERG, cf->log, 0, - "unexpected '}' in %s:%d", + "unexpected \"}\" in %s:%d", cf->conf_file->file.name.data, cf->conf_file->line); return NGX_ERROR;