mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-06 17:02:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed calls to ngx_open_file() in certain places.

Browse Source 
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.
This commit is contained in:
Sergey Kandaurov 2017-08-09 15:03:27 +03:00
parent 32c7bd5102
commit b986b4314b
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/event/ngx_event_openssl.c
View File

@ -2906,7 +2906,8 @@ ngx_ssl_session_ticket_keys(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_array_t *paths)
file.name = path[i]; file.name = path[i];
file.log = cf->log; file.log = cf->log;
file.fd = ngx_open_file(file.name.data, NGX_FILE_RDONLY, 0, 0); file.fd = ngx_open_file(file.name.data, NGX_FILE_RDONLY,
NGX_FILE_OPEN, 0);
if (file.fd == NGX_INVALID_FILE) { if (file.fd == NGX_INVALID_FILE) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, ngx_errno, ngx_conf_log_error(NGX_LOG_EMERG, cf, ngx_errno,

2
src/http/modules/ngx_http_geo_module.c
View File

@ -1400,7 +1400,7 @@ ngx_http_geo_include_binary_base(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx,
file.name = *name; file.name = *name;
file.log = cf->log; file.log = cf->log;
file.fd = ngx_open_file(name->data, NGX_FILE_RDONLY, 0, 0); file.fd = ngx_open_file(name->data, NGX_FILE_RDONLY, NGX_FILE_OPEN, 0);
if (file.fd == NGX_INVALID_FILE) { if (file.fd == NGX_INVALID_FILE) {
err = ngx_errno; err = ngx_errno;

2
src/stream/ngx_stream_geo_module.c
View File

@ -1326,7 +1326,7 @@ ngx_stream_geo_include_binary_base(ngx_conf_t *cf,
file.name = *name; file.name = *name;
file.log = cf->log; file.log = cf->log;
file.fd = ngx_open_file(name->data, NGX_FILE_RDONLY, 0, 0); file.fd = ngx_open_file(name->data, NGX_FILE_RDONLY, NGX_FILE_OPEN, 0);
if (file.fd == NGX_INVALID_FILE) { if (file.fd == NGX_INVALID_FILE) {
err = ngx_errno; err = ngx_errno;