Mercurial > hg > nginx-ranges
comparison src/core/ngx_file.c @ 635:e67b227c8dbb default tip
Merge with current.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 25 Apr 2011 04:07:55 +0400 |
parents | 8246d8a2c2be |
children |
comparison
equal
deleted
inserted
replaced
578:f3a9e57d2e17 | 635:e67b227c8dbb |
---|---|
760 } | 760 } |
761 | 761 |
762 size -= n; | 762 size -= n; |
763 } | 763 } |
764 | 764 |
765 if (ngx_set_file_time(to, nfd, cf->time) != NGX_OK) { | 765 if (cf->time != -1) { |
766 ngx_log_error(NGX_LOG_ALERT, cf->log, ngx_errno, | 766 if (ngx_set_file_time(to, nfd, cf->time) != NGX_OK) { |
767 ngx_set_file_time_n " \"%s\" failed", to); | 767 ngx_log_error(NGX_LOG_ALERT, cf->log, ngx_errno, |
768 goto failed; | 768 ngx_set_file_time_n " \"%s\" failed", to); |
769 goto failed; | |
770 } | |
769 } | 771 } |
770 | 772 |
771 rc = NGX_OK; | 773 rc = NGX_OK; |
772 | 774 |
773 failed: | 775 failed: |
821 ngx_int_t rc; | 823 ngx_int_t rc; |
822 ngx_err_t err; | 824 ngx_err_t err; |
823 ngx_str_t file, buf; | 825 ngx_str_t file, buf; |
824 ngx_dir_t dir; | 826 ngx_dir_t dir; |
825 | 827 |
826 buf.len = 0; | 828 ngx_str_null(&buf); |
827 buf.data = NULL; | |
828 | 829 |
829 ngx_log_debug1(NGX_LOG_DEBUG_CORE, ctx->log, 0, | 830 ngx_log_debug1(NGX_LOG_DEBUG_CORE, ctx->log, 0, |
830 "walk tree \"%V\"", tree); | 831 "walk tree \"%V\"", tree); |
831 | 832 |
832 if (ngx_open_dir(tree, &dir) == NGX_ERROR) { | 833 if (ngx_open_dir(tree, &dir) == NGX_ERROR) { |