comparison src/http/modules/ngx_http_geo_module.c @ 3655:ec20f1f93aea

test the second binary geo range base existence
author Igor Sysoev <igor@sysoev.ru>
date Wed, 30 Jun 2010 10:12:46 +0000
parents b56935e34273
children 3d61601f3171
comparison
equal deleted inserted replaced
3654:b56935e34273 3655:ec20f1f93aea
1174 name->data); 1174 name->data);
1175 rc = NGX_ERROR; 1175 rc = NGX_ERROR;
1176 goto done; 1176 goto done;
1177 } 1177 }
1178 1178
1179 if (ctx->binary_include) {
1180 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
1181 "second binary geo range base \"%s\" may not be mixed with \"%s\"",
1182 name->data, ctx->include_name.data);
1183 rc = NGX_ERROR;
1184 goto done;
1185 }
1186
1179 if (ngx_fd_info(file.fd, &fi) == NGX_FILE_ERROR) { 1187 if (ngx_fd_info(file.fd, &fi) == NGX_FILE_ERROR) {
1180 ngx_conf_log_error(NGX_LOG_CRIT, cf, ngx_errno, 1188 ngx_conf_log_error(NGX_LOG_CRIT, cf, ngx_errno,
1181 ngx_fd_info_n " \"%s\" failed", name->data); 1189 ngx_fd_info_n " \"%s\" failed", name->data);
1182 goto failed; 1190 goto failed;
1183 } 1191 }