diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-10-26 17:32:17 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-10-26 17:32:17 +0000 |
| commit | efdaec7003e37933e113b009407f2a62df2ec78a (patch) | |
| tree | fbf57f161e23d1254eb47a769ba69d83f9e5a5b7 /src/http/ngx_http_upstream.c | |
| parent | 7571f6c962e5b02abf01b2f1c9f84cb109728d4d (diff) | |
| download | nginx-efdaec7003e37933e113b009407f2a62df2ec78a.tar.gz nginx-efdaec7003e37933e113b009407f2a62df2ec78a.tar.bz2 | |
merge r3024, r3025, r3028, r3033, r3034, r3035, r3036:
allow cross device temporary files atomic copying
Diffstat (limited to 'src/http/ngx_http_upstream.c')
| -rw-r--r-- | src/http/ngx_http_upstream.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index df27a46ef..e5711fc91 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -2640,7 +2640,6 @@ ngx_http_upstream_store(ngx_http_request_t *r, ngx_http_upstream_t *u) ext.time = -1; ext.create_path = 1; ext.delete_file = 1; - ext.log_rename_error = 1; ext.log = r->connection->log; if (u->headers_in.last_modified) { @@ -2667,6 +2666,8 @@ ngx_http_upstream_store(ngx_http_request_t *r, ngx_http_upstream_t *u) } } + path.len--; + ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "upstream stores \"%s\" to \"%s\"", tf->file.name.data, path.data); |