Mercurial > hg > nginx

comparison src/event/ngx_event_openssl.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 82f0b8dcca27
comparison
equal deleted inserted replaced
7086:577628e6b6a6 7087:47b7ffc3339d
2904 2904
2905 ngx_memzero(&file, sizeof(ngx_file_t)); 2905 ngx_memzero(&file, sizeof(ngx_file_t));
2906 file.name = path[i]; 2906 file.name = path[i];
2907 file.log = cf->log; 2907 file.log = cf->log;
2908 2908
2909 file.fd = ngx_open_file(file.name.data, NGX_FILE_RDONLY, 0, 0); 2909 file.fd = ngx_open_file(file.name.data, NGX_FILE_RDONLY,
2910 NGX_FILE_OPEN, 0);
2910 2911
2911 if (file.fd == NGX_INVALID_FILE) { 2912 if (file.fd == NGX_INVALID_FILE) {
2912 ngx_conf_log_error(NGX_LOG_EMERG, cf, ngx_errno, 2913 ngx_conf_log_error(NGX_LOG_EMERG, cf, ngx_errno,
2913 ngx_open_file_n " \"%V\" failed", &file.name); 2914 ngx_open_file_n " \"%V\" failed", &file.name);
2914 return NGX_ERROR; 2915 return NGX_ERROR;