Mercurial > hg > nginx

comparison src/http/modules/ngx_http_geo_module.c @ 7087:47b7ffc3339d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed calls to ngx_open_file() in certain places. Pass NGX_FILE_OPEN to ngx_open_file() to fix "The parameter is incorrect" error on win32 when using the ssl_session_ticket_key directive or loading a binary geo base. On UNIX, this change is a no-op.
author Sergey Kandaurov <pluknet@nginx.com>
date Wed, 09 Aug 2017 15:03:27 +0300
parents 577628e6b6a6
children c69c13f10502
comparison
equal deleted inserted replaced
7086:577628e6b6a6 7087:47b7ffc3339d
1398 1398
1399 ngx_memzero(&file, sizeof(ngx_file_t)); 1399 ngx_memzero(&file, sizeof(ngx_file_t));
1400 file.name = *name; 1400 file.name = *name;
1401 file.log = cf->log; 1401 file.log = cf->log;
1402 1402
1403 file.fd = ngx_open_file(name->data, NGX_FILE_RDONLY, 0, 0); 1403 file.fd = ngx_open_file(name->data, NGX_FILE_RDONLY, NGX_FILE_OPEN, 0);
1404 1404
1405 if (file.fd == NGX_INVALID_FILE) { 1405 if (file.fd == NGX_INVALID_FILE) {
1406 err = ngx_errno; 1406 err = ngx_errno;
1407 if (err != NGX_ENOENT) { 1407 if (err != NGX_ENOENT) {
1408 ngx_conf_log_error(NGX_LOG_CRIT, cf, err, 1408 ngx_conf_log_error(NGX_LOG_CRIT, cf, err,