comparison src/core/ngx_conf_file.c @ 272:29a6403156b0 NGINX_0_5_6

nginx 0.5.6 *) Change: now the ngx_http_index_module ignores all methods except the GET, HEAD, and POST methods. *) Feature: the ngx_http_limit_zone_module. *) Feature: the $binary_remote_addr variable. *) Feature: the "ssl_session_cache" directives of the ngx_http_ssl_module and ngx_imap_ssl_module. *) Feature: the DELETE method supports recursive removal. *) Bugfix: the byte-ranges were transferred incorrectly if the $r->sendfile() was used.
author Igor Sysoev <http://sysoev.ru>
date Tue, 09 Jan 2007 00:00:00 +0300
parents a528ae0fe909
children c5c2b2883984
comparison
equal deleted inserted replaced
271:fcbee7dacf2b 272:29a6403156b0
148 block = 0; 148 block = 0;
149 } 149 }
150 150
151 if (rc == NGX_CONF_FILE_DONE && block) { 151 if (rc == NGX_CONF_FILE_DONE && block) {
152 ngx_log_error(NGX_LOG_EMERG, cf->log, 0, 152 ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
153 "unexpected end of file in %s:%ui, expecting \"}\"", 153 "unexpected end of file in %s:%ui, expecting \"}\"",
154 cf->conf_file->file.name.data, 154 cf->conf_file->file.name.data,
155 cf->conf_file->line); 155 cf->conf_file->line);
156 rc = NGX_ERROR; 156 rc = NGX_ERROR;
157 break; 157 break;
158 } 158 }
159 159
160 if (rc != NGX_OK && rc != NGX_CONF_BLOCK_START) { 160 if (rc != NGX_OK && rc != NGX_CONF_BLOCK_START) {
177 rc = NGX_ERROR; 177 rc = NGX_ERROR;
178 break; 178 break;
179 } 179 }
180 180
181 ngx_log_error(NGX_LOG_EMERG, cf->log, 0, 181 ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
182 "%s in %s:%ui", 182 "%s in %s:%ui",
183 rv, cf->conf_file->file.name.data, 183 rv, cf->conf_file->file.name.data,
184 cf->conf_file->line); 184 cf->conf_file->line);
185 rc = NGX_ERROR; 185 rc = NGX_ERROR;
186 break; 186 break;
187 } 187 }
188 188
189 189