Mercurial > hg > nginx-vendor-0-8

comparison src/core/ngx_conf_file.c @ 142:84910468f6de NGINX_0_3_18

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.3.18 *) Feature: the "server_names" directive supports the ".domain.tld" names. *) Feature: the "server_names" directive uses the hash for the "*.domain.tld" names and more effective hash for usual names. *) Change: the "server_names_hash_max_size" and "server_names_hash_bucket_size" directives. *) Change: the "server_names_hash" and "server_names_hash_threshold" directives were canceled. *) Feature: the "valid_referers" directive uses the hash site names. *) Change: now the "valid_referers" directive checks the site names only without the URI part. *) Bugfix: some ".domain.tld" names incorrectly processed by the ngx_http_map_module. *) Bugfix: segmentation fault was occurred if configuration file did not exist; bug appeared in 0.3.12. *) Bugfix: on 64-bit platforms segmentation fault may occurred on start; bug appeared in 0.3.16.
author Igor Sysoev <http://sysoev.ru>
date Mon, 26 Dec 2005 00:00:00 +0300
parents 91372f004adf
children bb61aa162c6b
comparison
equal deleted inserted replaced
141:249e67502bf3 142:84910468f6de
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_conf_log_error(NGX_LOG_EMERG, cf, 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",
82 filename->data);
82 return NGX_CONF_ERROR; 83 return NGX_CONF_ERROR;
83 } 84 }
84 85
85 prev = cf->conf_file; 86 prev = cf->conf_file;
86 87
809 buf = ngx_strerror_r(err, buf, last - buf - 1); 810 buf = ngx_strerror_r(err, buf, last - buf - 1);
810 *buf++ = ')'; 811 *buf++ = ')';
811 *buf = '\0'; 812 *buf = '\0';
812 } 813 }
813 814
815 if (cf->conf_file == NULL) {
816 ngx_log_error(level, cf->log, 0, "%s", errstr);
817 return;
818 }
819
814 ngx_log_error(level, cf->log, 0, "%s in %s:%ui", 820 ngx_log_error(level, cf->log, 0, "%s in %s:%ui",
815 errstr, cf->conf_file->file.name.data, cf->conf_file->line); 821 errstr, cf->conf_file->file.name.data, cf->conf_file->line);
816 } 822 }
817 823
818 824