diff options
author | Igor Sysoev <igor@sysoev.ru> | 2004-10-11 15:07:03 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2004-10-11 15:07:03 +0000 |
commit | 924bd79e317e9a137c0d1b9d349185758a628ec4 (patch) | |
tree | f877c8b19e53e7d0a7683e3dd9aeb713146c4a8f /src/core/ngx_cycle.c | |
parent | aef13d7f6660f4f8d2c50c95b8e182e62c115f88 (diff) | |
download | nginx-924bd79e317e9a137c0d1b9d349185758a628ec4.tar.gz nginx-924bd79e317e9a137c0d1b9d349185758a628ec4.zip |
nginx-0.1.1-RELEASE importrelease-0.1.1
*) Feature: the gzip_types directive.
*) Feature: the tcp_nodelay directive.
*) Feature: the send_lowat directive is working not only on OSes that
support kqueue NOTE_LOWAT, but also on OSes that support SO_SNDLOWAT.
*) Feature: the setproctitle() emulation for Linux and Solaris.
*) Bugfix: the "Location" header rewrite bug fixed while the proxying.
*) Bugfix: the ngx_http_chunked_module module may get caught in an
endless loop.
*) Bugfix: the /dev/poll module bugs fixed.
*) Bugfix: the responses were corrupted when the temporary files were
used while the proxying.
*) Bugfix: the unescaped requests were passed to the backend.
*) Bugfix: while the build configuration on Linux 2.4 the
--with-poll_module parameter was required.
Diffstat (limited to 'src/core/ngx_cycle.c')
-rw-r--r-- | src/core/ngx_cycle.c | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c index ed4d60f89..38f4ad505 100644 --- a/src/core/ngx_cycle.c +++ b/src/core/ngx_cycle.c @@ -615,6 +615,9 @@ void ngx_reopen_files(ngx_cycle_t *cycle, ngx_uid_t user) ngx_uint_t i; ngx_list_part_t *part; ngx_open_file_t *file; +#if !(WIN32) + ngx_file_info_t fi; +#endif part = &cycle->open_files.part; file = part->elts; @@ -672,6 +675,35 @@ void ngx_reopen_files(ngx_cycle_t *cycle, ngx_uid_t user) file[i].name.data); } } + + if (ngx_file_info((const char *) file[i].name.data, &fi) == -1) { + ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno, + ngx_file_info_n " \"%s\" failed", + file[i].name.data); + + if (ngx_close_file(fd) == NGX_FILE_ERROR) { + ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno, + ngx_close_file_n " \"%s\" failed", + file[i].name.data); + } + } + + if ((fi.st_mode & (S_IRUSR|S_IWUSR)) != (S_IRUSR|S_IWUSR)) { + + fi.st_mode |= (S_IRUSR|S_IWUSR); + + if (chmod((const char *) file[i].name.data, fi.st_mode) == -1) { + ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno, + "chmod \"%s\" failed", + file[i].name.data); + + if (ngx_close_file(fd) == NGX_FILE_ERROR) { + ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno, + ngx_close_file_n " \"%s\" failed", + file[i].name.data); + } + } + } } if (fcntl(fd, F_SETFD, FD_CLOEXEC) == -1) { |