Mercurial > hg > nginx

comparison src/http/ngx_http_upstream.c @ 3248:8c76116820f3 stable-0.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge r3024, r3025, r3028, r3033, r3034, r3035, r3036: allow cross device temporary files atomic copying
author Igor Sysoev <igor@sysoev.ru>
date Mon, 26 Oct 2009 17:32:17 +0000
parents 1f3cd08ebb82
children ef8cfb09a50b
comparison
equal deleted inserted replaced
3247:1f3cd08ebb82 3248:8c76116820f3
2638 ext.access = u->conf->store_access; 2638 ext.access = u->conf->store_access;
2639 ext.path_access = u->conf->store_access; 2639 ext.path_access = u->conf->store_access;
2640 ext.time = -1; 2640 ext.time = -1;
2641 ext.create_path = 1; 2641 ext.create_path = 1;
2642 ext.delete_file = 1; 2642 ext.delete_file = 1;
2643 ext.log_rename_error = 1;
2644 ext.log = r->connection->log; 2643 ext.log = r->connection->log;
2645 2644
2646 if (u->headers_in.last_modified) { 2645 if (u->headers_in.last_modified) {
2647 2646
2648 lm = ngx_http_parse_time(u->headers_in.last_modified->value.data, 2647 lm = ngx_http_parse_time(u->headers_in.last_modified->value.data,
2664 == NULL) 2663 == NULL)
2665 { 2664 {
2666 return; 2665 return;
2667 } 2666 }
2668 } 2667 }
2668
2669 path.len--;
2669 2670
2670 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, 2671 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
2671 "upstream stores \"%s\" to \"%s\"", 2672 "upstream stores \"%s\" to \"%s\"",
2672 tf->file.name.data, path.data); 2673 tf->file.name.data, path.data);
2673 2674