nginx: src/core/ngx_file.c annotate

annotate src/core/ngx_file.c @ 6755:e2f13011343e stable-1.10

HTTP/2: fixed the "http request count is zero" alert. When the stream is terminated the HEADERS frame can still wait in the output queue. This frame can't be removed and must be sent to the client anyway, since HTTP/2 uses stateful compression for headers. So in order to postpone closing and freeing memory of such stream the special close stream handler is set to the write event. After the HEADERS frame is sent the write event is called and the stream will be finally closed. Some events like receiving a RST_STREAM can trigger the read handler of such stream in closing state and cause unexpected processing that can result in another attempt to finalize the request. To prevent it the read handler is now set to ngx_http_empty_handler. Thanks to Amazon.

author	Valentin Bartenev <vbart@nginx.com>
date	Thu, 16 Jun 2016 20:55:11 +0300
parents	f01ab2dbcfdc
children	8bf484eef9ab

rev	line source
441 da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 326 diff changeset	1
da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 326 diff changeset	2 /*
444 42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright Igor Sysoev <igor@sysoev.ru> parents: 441 diff changeset	3 * Copyright (C) Igor Sysoev
4412 d620f497c50f Copyright updated. Maxim Konovalov <maxim@nginx.com> parents: 3970 diff changeset	4 * Copyright (C) Nginx, Inc.
441 da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 326 diff changeset	5 */
da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 326 diff changeset	6
74 17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	7
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	8 #include <ngx_config.h>
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	9 #include <ngx_core.h>
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	10
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	11
5316 12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	12 static ngx_int_t ngx_test_full_name(ngx_str_t *name);
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	13
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	14
3035 f9d97311c652 ) share temporary number between workers Igor Sysoev <igor@sysoev.ru>* parents: 3034 diff changeset	15 static ngx_atomic_t temp_number = 0;
f9d97311c652 ) share temporary number between workers Igor Sysoev <igor@sysoev.ru>* parents: 3034 diff changeset	16 ngx_atomic_t *ngx_temp_number = &temp_number;
f9d97311c652 ) share temporary number between workers Igor Sysoev <igor@sysoev.ru>* parents: 3034 diff changeset	17 ngx_atomic_int_t ngx_random_number = 123456;
83 a7e45c45a95c nginx-0.0.1-2003-04-28-19:06:39 import Igor Sysoev <igor@sysoev.ru> parents: 75 diff changeset	18
a7e45c45a95c nginx-0.0.1-2003-04-28-19:06:39 import Igor Sysoev <igor@sysoev.ru> parents: 75 diff changeset	19
5316 12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	20 ngx_int_t
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	21 ngx_get_full_name(ngx_pool_t pool, ngx_str_t prefix, ngx_str_t *name)
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	22 {
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	23 size_t len;
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	24 u_char p, n;
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	25 ngx_int_t rc;
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	26
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	27 rc = ngx_test_full_name(name);
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	28
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	29 if (rc == NGX_OK) {
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	30 return rc;
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	31 }
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	32
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	33 len = prefix->len;
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	34
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	35 #if (NGX_WIN32)
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	36
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	37 if (rc == 2) {
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	38 len = rc;
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	39 }
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	40
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	41 #endif
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	42
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	43 n = ngx_pnalloc(pool, len + name->len + 1);
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	44 if (n == NULL) {
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	45 return NGX_ERROR;
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	46 }
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	47
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	48 p = ngx_cpymem(n, prefix->data, len);
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	49 ngx_cpystrn(p, name->data, name->len + 1);
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	50
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	51 name->len += len;
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	52 name->data = n;
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	53
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	54 return NGX_OK;
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	55 }
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	56
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	57
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	58 static ngx_int_t
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	59 ngx_test_full_name(ngx_str_t *name)
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	60 {
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	61 #if (NGX_WIN32)
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	62 u_char c0, c1;
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	63
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	64 c0 = name->data[0];
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	65
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	66 if (name->len < 2) {
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	67 if (c0 == '/') {
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	68 return 2;
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	69 }
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	70
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	71 return NGX_DECLINED;
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	72 }
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	73
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	74 c1 = name->data[1];
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	75
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	76 if (c1 == ':') {
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	77 c0 \|= 0x20;
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	78
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	79 if ((c0 >= 'a' && c0 <= 'z')) {
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	80 return NGX_OK;
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	81 }
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	82
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	83 return NGX_DECLINED;
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	84 }
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	85
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	86 if (c1 == '/') {
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	87 return NGX_OK;
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	88 }
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	89
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	90 if (c0 == '/') {
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	91 return 2;
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	92 }
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	93
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	94 return NGX_DECLINED;
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	95
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	96 #else
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	97
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	98 if (name->data[0] == '/') {
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	99 return NGX_OK;
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	100 }
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	101
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	102 return NGX_DECLINED;
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	103
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	104 #endif
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	105 }
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	106
12dd27b74117 Fixed memory leaks in the root and auth_basic_user_file directives. Valentin Bartenev <vbart@nginx.com> parents: 4966 diff changeset	107
493 975f62e77f02 nginx-0.1.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	108 ssize_t
975f62e77f02 nginx-0.1.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	109 ngx_write_chain_to_temp_file(ngx_temp_file_t tf, ngx_chain_t chain)
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 156 diff changeset	110 {
467 bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	111 ngx_int_t rc;
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 156 diff changeset	112
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 156 diff changeset	113 if (tf->file.fd == NGX_INVALID_FILE) {
5969 3281de8142f5 Core: reverted prefix-based temp files (a9138c35120d). Roman Arutyunyan <arut@nginx.com> parents: 5967 diff changeset	114 rc = ngx_create_temp_file(&tf->file, tf->path, tf->pool,
3281de8142f5 Core: reverted prefix-based temp files (a9138c35120d). Roman Arutyunyan <arut@nginx.com> parents: 5967 diff changeset	115 tf->persistent, tf->clean, tf->access);
208 0b67be7d4489 nginx-0.0.1-2003-12-08-23:48:12 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	116
5957 570677a06dce Unified handling of ngx_create_temp_file() return value. Valentin Bartenev <vbart@nginx.com> parents: 5377 diff changeset	117 if (rc != NGX_OK) {
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 156 diff changeset	118 return rc;
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 156 diff changeset	119 }
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 156 diff changeset	120
667 63a820b0bc6c nginx-0.3.55-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 661 diff changeset	121 if (tf->log_level) {
63a820b0bc6c nginx-0.3.55-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 661 diff changeset	122 ngx_log_error(tf->log_level, tf->file.log, 0, "%s %V",
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	123 tf->warn, &tf->file.name);
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 156 diff changeset	124 }
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 156 diff changeset	125 }
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 156 diff changeset	126
6442 6e10518f95d8 Threads: offloading of temp files writing to thread pools. Maxim Dounin <mdounin@mdounin.ru> parents: 6071 diff changeset	127 #if (NGX_THREADS && NGX_HAVE_PWRITEV)
6e10518f95d8 Threads: offloading of temp files writing to thread pools. Maxim Dounin <mdounin@mdounin.ru> parents: 6071 diff changeset	128
6e10518f95d8 Threads: offloading of temp files writing to thread pools. Maxim Dounin <mdounin@mdounin.ru> parents: 6071 diff changeset	129 if (tf->thread_write) {
6e10518f95d8 Threads: offloading of temp files writing to thread pools. Maxim Dounin <mdounin@mdounin.ru> parents: 6071 diff changeset	130 return ngx_thread_write_chain_to_file(&tf->file, chain, tf->offset,
6e10518f95d8 Threads: offloading of temp files writing to thread pools. Maxim Dounin <mdounin@mdounin.ru> parents: 6071 diff changeset	131 tf->pool);
6e10518f95d8 Threads: offloading of temp files writing to thread pools. Maxim Dounin <mdounin@mdounin.ru> parents: 6071 diff changeset	132 }
6e10518f95d8 Threads: offloading of temp files writing to thread pools. Maxim Dounin <mdounin@mdounin.ru> parents: 6071 diff changeset	133
6e10518f95d8 Threads: offloading of temp files writing to thread pools. Maxim Dounin <mdounin@mdounin.ru> parents: 6071 diff changeset	134 #endif
6e10518f95d8 Threads: offloading of temp files writing to thread pools. Maxim Dounin <mdounin@mdounin.ru> parents: 6071 diff changeset	135
170 c42be4185301 nginx-0.0.1-2003-11-03-01:56:18 import Igor Sysoev <igor@sysoev.ru> parents: 160 diff changeset	136 return ngx_write_chain_to_file(&tf->file, chain, tf->offset, tf->pool);
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 156 diff changeset	137 }
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 156 diff changeset	138
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 156 diff changeset	139
493 975f62e77f02 nginx-0.1.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	140 ngx_int_t
975f62e77f02 nginx-0.1.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	141 ngx_create_temp_file(ngx_file_t file, ngx_path_t path, ngx_pool_t *pool,
1075 4d203f76b757 undo "client_body_in_file_only any" Igor Sysoev <igor@sysoev.ru> parents: 1058 diff changeset	142 ngx_uint_t persistent, ngx_uint_t clean, ngx_uint_t access)
74 17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	143 {
1090 01b48bcb73bf shorten temporary names on 64-bit platforms Igor Sysoev <igor@sysoev.ru> parents: 1075 diff changeset	144 uint32_t n;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	145 ngx_err_t err;
563 9c2f3ed7a247 nginx-0.3.3-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	146 ngx_pool_cleanup_t *cln;
9c2f3ed7a247 nginx-0.3.3-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	147 ngx_pool_cleanup_file_t *clnf;
74 17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	148
5969 3281de8142f5 Core: reverted prefix-based temp files (a9138c35120d). Roman Arutyunyan <arut@nginx.com> parents: 5967 diff changeset	149 file->name.len = path->name.len + 1 + path->len + 10;
74 17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	150
2049 2a92804f4109 ) back out r2040 Igor Sysoev <igor@sysoev.ru>* parents: 1909 diff changeset	151 file->name.data = ngx_pnalloc(pool, file->name.len + 1);
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	152 if (file->name.data == NULL) {
467 bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	153 return NGX_ERROR;
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	154 }
74 17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	155
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	156 #if 0
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	157 for (i = 0; i < file->name.len; i++) {
6474 2cd019520210 Style. Ruslan Ermilov <ru@nginx.com> parents: 6468 diff changeset	158 file->name.data[i] = 'X';
74 17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	159 }
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	160 #endif
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	161
5969 3281de8142f5 Core: reverted prefix-based temp files (a9138c35120d). Roman Arutyunyan <arut@nginx.com> parents: 5967 diff changeset	162 ngx_memcpy(file->name.data, path->name.data, path->name.len);
74 17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	163
1090 01b48bcb73bf shorten temporary names on 64-bit platforms Igor Sysoev <igor@sysoev.ru> parents: 1075 diff changeset	164 n = (uint32_t) ngx_next_temp_number(0);
83 a7e45c45a95c nginx-0.0.1-2003-04-28-19:06:39 import Igor Sysoev <igor@sysoev.ru> parents: 75 diff changeset	165
1747 442a791354d8 create the only cleanup Igor Sysoev <igor@sysoev.ru> parents: 1704 diff changeset	166 cln = ngx_pool_cleanup_add(pool, sizeof(ngx_pool_cleanup_file_t));
442a791354d8 create the only cleanup Igor Sysoev <igor@sysoev.ru> parents: 1704 diff changeset	167 if (cln == NULL) {
442a791354d8 create the only cleanup Igor Sysoev <igor@sysoev.ru> parents: 1704 diff changeset	168 return NGX_ERROR;
442a791354d8 create the only cleanup Igor Sysoev <igor@sysoev.ru> parents: 1704 diff changeset	169 }
442a791354d8 create the only cleanup Igor Sysoev <igor@sysoev.ru> parents: 1704 diff changeset	170
74 17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	171 for ( ;; ) {
5969 3281de8142f5 Core: reverted prefix-based temp files (a9138c35120d). Roman Arutyunyan <arut@nginx.com> parents: 5967 diff changeset	172 (void) ngx_sprintf(file->name.data + path->name.len + 1 + path->len,
3281de8142f5 Core: reverted prefix-based temp files (a9138c35120d). Roman Arutyunyan <arut@nginx.com> parents: 5967 diff changeset	173 "%010uD%Z", n);
74 17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	174
5969 3281de8142f5 Core: reverted prefix-based temp files (a9138c35120d). Roman Arutyunyan <arut@nginx.com> parents: 5967 diff changeset	175 ngx_create_hashed_filename(path, file->name.data, file->name.len);
1748 91d381e4e691 ngx_create_hashed_filename() does not need ngx_file_t Igor Sysoev <igor@sysoev.ru> parents: 1747 diff changeset	176
91d381e4e691 ngx_create_hashed_filename() does not need ngx_file_t Igor Sysoev <igor@sysoev.ru> parents: 1747 diff changeset	177 ngx_log_debug1(NGX_LOG_DEBUG_CORE, file->log, 0,
91d381e4e691 ngx_create_hashed_filename() does not need ngx_file_t Igor Sysoev <igor@sysoev.ru> parents: 1747 diff changeset	178 "hashed path: %s", file->name.data);
74 17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	179
1046 bb139aba3199 rename mode to access Igor Sysoev <igor@sysoev.ru> parents: 977 diff changeset	180 file->fd = ngx_open_tempfile(file->name.data, persistent, access);
74 17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	181
257 70e1c7d2b83d nginx-0.0.2-2004-02-11-20:08:49 import Igor Sysoev <igor@sysoev.ru> parents: 208 diff changeset	182 ngx_log_debug1(NGX_LOG_DEBUG_CORE, file->log, 0,
70e1c7d2b83d nginx-0.0.2-2004-02-11-20:08:49 import Igor Sysoev <igor@sysoev.ru> parents: 208 diff changeset	183 "temp fd:%d", file->fd);
75 869b10be682f nginx-0.0.1-2003-04-14-21:04:58 import Igor Sysoev <igor@sysoev.ru> parents: 74 diff changeset	184
74 17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	185 if (file->fd != NGX_INVALID_FILE) {
563 9c2f3ed7a247 nginx-0.3.3-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	186
1075 4d203f76b757 undo "client_body_in_file_only any" Igor Sysoev <igor@sysoev.ru> parents: 1058 diff changeset	187 cln->handler = clean ? ngx_pool_delete_file : ngx_pool_cleanup_file;
563 9c2f3ed7a247 nginx-0.3.3-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	188 clnf = cln->data;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	189
563 9c2f3ed7a247 nginx-0.3.3-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	190 clnf->fd = file->fd;
9c2f3ed7a247 nginx-0.3.3-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	191 clnf->name = file->name.data;
9c2f3ed7a247 nginx-0.3.3-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	192 clnf->log = pool->log;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	193
74 17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	194 return NGX_OK;
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	195 }
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	196
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	197 err = ngx_errno;
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	198
6468 a5897d360977 Win32: additional error code NGX_EEXIST_FILE (ticket #910). Maxim Dounin <mdounin@mdounin.ru> parents: 6442 diff changeset	199 if (err == NGX_EEXIST_FILE) {
1090 01b48bcb73bf shorten temporary names on 64-bit platforms Igor Sysoev <igor@sysoev.ru> parents: 1075 diff changeset	200 n = (uint32_t) ngx_next_temp_number(1);
74 17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	201 continue;
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	202 }
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	203
5969 3281de8142f5 Core: reverted prefix-based temp files (a9138c35120d). Roman Arutyunyan <arut@nginx.com> parents: 5967 diff changeset	204 if ((path->level[0] == 0) \|\| (err != NGX_ENOPATH)) {
74 17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	205 ngx_log_error(NGX_LOG_CRIT, file->log, err,
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	206 ngx_open_tempfile_n " \"%s\" failed",
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	207 file->name.data);
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	208 return NGX_ERROR;
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	209 }
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	210
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	211 if (ngx_create_path(file, path) == NGX_ERROR) {
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	212 return NGX_ERROR;
93 738fe44c70d5 nginx-0.0.1-2003-05-21-17:28:21 import Igor Sysoev <igor@sysoev.ru> parents: 92 diff changeset	213 }
74 17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	214 }
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	215 }
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	216
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	217
493 975f62e77f02 nginx-0.1.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	218 void
1748 91d381e4e691 ngx_create_hashed_filename() does not need ngx_file_t Igor Sysoev <igor@sysoev.ru> parents: 1747 diff changeset	219 ngx_create_hashed_filename(ngx_path_t path, u_char file, size_t len)
74 17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	220 {
1748 91d381e4e691 ngx_create_hashed_filename() does not need ngx_file_t Igor Sysoev <igor@sysoev.ru> parents: 1747 diff changeset	221 size_t i, level;
91d381e4e691 ngx_create_hashed_filename() does not need ngx_file_t Igor Sysoev <igor@sysoev.ru> parents: 1747 diff changeset	222 ngx_uint_t n;
74 17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	223
1748 91d381e4e691 ngx_create_hashed_filename() does not need ngx_file_t Igor Sysoev <igor@sysoev.ru> parents: 1747 diff changeset	224 i = path->name.len + 1;
74 17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	225
1748 91d381e4e691 ngx_create_hashed_filename() does not need ngx_file_t Igor Sysoev <igor@sysoev.ru> parents: 1747 diff changeset	226 file[path->name.len + path->len] = '/';
74 17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	227
1748 91d381e4e691 ngx_create_hashed_filename() does not need ngx_file_t Igor Sysoev <igor@sysoev.ru> parents: 1747 diff changeset	228 for (n = 0; n < 3; n++) {
91d381e4e691 ngx_create_hashed_filename() does not need ngx_file_t Igor Sysoev <igor@sysoev.ru> parents: 1747 diff changeset	229 level = path->level[n];
74 17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	230
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	231 if (level == 0) {
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	232 break;
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	233 }
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	234
1748 91d381e4e691 ngx_create_hashed_filename() does not need ngx_file_t Igor Sysoev <igor@sysoev.ru> parents: 1747 diff changeset	235 len -= level;
91d381e4e691 ngx_create_hashed_filename() does not need ngx_file_t Igor Sysoev <igor@sysoev.ru> parents: 1747 diff changeset	236 file[i - 1] = '/';
91d381e4e691 ngx_create_hashed_filename() does not need ngx_file_t Igor Sysoev <igor@sysoev.ru> parents: 1747 diff changeset	237 ngx_memcpy(&file[i], &file[len], level);
91d381e4e691 ngx_create_hashed_filename() does not need ngx_file_t Igor Sysoev <igor@sysoev.ru> parents: 1747 diff changeset	238 i += level + 1;
74 17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	239 }
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	240 }
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	241
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	242
493 975f62e77f02 nginx-0.1.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	243 ngx_int_t
975f62e77f02 nginx-0.1.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	244 ngx_create_path(ngx_file_t file, ngx_path_t path)
74 17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	245 {
517 dadfa78d2270 nginx-0.1.33-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	246 size_t pos;
dadfa78d2270 nginx-0.1.33-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	247 ngx_err_t err;
dadfa78d2270 nginx-0.1.33-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	248 ngx_uint_t i;
74 17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	249
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	250 pos = path->name.len;
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	251
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	252 for (i = 0; i < 3; i++) {
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	253 if (path->level[i] == 0) {
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	254 break;
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	255 }
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	256
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	257 pos += path->level[i] + 1;
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	258
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	259 file->name.data[pos] = '\0';
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	260
257 70e1c7d2b83d nginx-0.0.2-2004-02-11-20:08:49 import Igor Sysoev <igor@sysoev.ru> parents: 208 diff changeset	261 ngx_log_debug1(NGX_LOG_DEBUG_CORE, file->log, 0,
70e1c7d2b83d nginx-0.0.2-2004-02-11-20:08:49 import Igor Sysoev <igor@sysoev.ru> parents: 208 diff changeset	262 "temp file: \"%s\"", file->name.data);
74 17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	263
669 562806624c4a nginx-0.3.56-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 667 diff changeset	264 if (ngx_create_dir(file->name.data, 0700) == NGX_FILE_ERROR) {
74 17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	265 err = ngx_errno;
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	266 if (err != NGX_EEXIST) {
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	267 ngx_log_error(NGX_LOG_CRIT, file->log, err,
186 c1f3a3c7c5db nginx-0.0.1-2003-11-17-00:49:42 import Igor Sysoev <igor@sysoev.ru> parents: 175 diff changeset	268 ngx_create_dir_n " \"%s\" failed",
c1f3a3c7c5db nginx-0.0.1-2003-11-17-00:49:42 import Igor Sysoev <igor@sysoev.ru> parents: 175 diff changeset	269 file->name.data);
74 17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	270 return NGX_ERROR;
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	271 }
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	272 }
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	273
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	274 file->name.data[pos] = '/';
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	275 }
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	276
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	277 return NGX_OK;
17ab1af8c3dd nginx-0.0.1-2003-04-11-20:01:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	278 }
83 a7e45c45a95c nginx-0.0.1-2003-04-28-19:06:39 import Igor Sysoev <igor@sysoev.ru> parents: 75 diff changeset	279
a7e45c45a95c nginx-0.0.1-2003-04-28-19:06:39 import Igor Sysoev <igor@sysoev.ru> parents: 75 diff changeset	280
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	281 ngx_err_t
669 562806624c4a nginx-0.3.56-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 667 diff changeset	282 ngx_create_full_path(u_char *dir, ngx_uint_t access)
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	283 {
e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	284 u_char *p, ch;
e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	285 ngx_err_t err;
e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	286
3202 121fae8c673c ignore EACCES errors for top level directories in ngx_create_full_path() Igor Sysoev <igor@sysoev.ru> parents: 3201 diff changeset	287 err = 0;
121fae8c673c ignore EACCES errors for top level directories in ngx_create_full_path() Igor Sysoev <igor@sysoev.ru> parents: 3201 diff changeset	288
3201 5fae6f9085e1 do not create Win32 drive letter in ngx_create_full_path() Igor Sysoev <igor@sysoev.ru> parents: 3035 diff changeset	289 #if (NGX_WIN32)
5fae6f9085e1 do not create Win32 drive letter in ngx_create_full_path() Igor Sysoev <igor@sysoev.ru> parents: 3035 diff changeset	290 p = dir + 3;
5fae6f9085e1 do not create Win32 drive letter in ngx_create_full_path() Igor Sysoev <igor@sysoev.ru> parents: 3035 diff changeset	291 #else
5fae6f9085e1 do not create Win32 drive letter in ngx_create_full_path() Igor Sysoev <igor@sysoev.ru> parents: 3035 diff changeset	292 p = dir + 1;
5fae6f9085e1 do not create Win32 drive letter in ngx_create_full_path() Igor Sysoev <igor@sysoev.ru> parents: 3035 diff changeset	293 #endif
5fae6f9085e1 do not create Win32 drive letter in ngx_create_full_path() Igor Sysoev <igor@sysoev.ru> parents: 3035 diff changeset	294
5fae6f9085e1 do not create Win32 drive letter in ngx_create_full_path() Igor Sysoev <igor@sysoev.ru> parents: 3035 diff changeset	295 for ( /* void / ; p; p++) {
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	296 ch = *p;
e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	297
e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	298 if (ch != '/') {
e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	299 continue;
e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	300 }
e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	301
e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	302 *p = '\0';
e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	303
669 562806624c4a nginx-0.3.56-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 667 diff changeset	304 if (ngx_create_dir(dir, access) == NGX_FILE_ERROR) {
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	305 err = ngx_errno;
3202 121fae8c673c ignore EACCES errors for top level directories in ngx_create_full_path() Igor Sysoev <igor@sysoev.ru> parents: 3201 diff changeset	306
121fae8c673c ignore EACCES errors for top level directories in ngx_create_full_path() Igor Sysoev <igor@sysoev.ru> parents: 3201 diff changeset	307 switch (err) {
121fae8c673c ignore EACCES errors for top level directories in ngx_create_full_path() Igor Sysoev <igor@sysoev.ru> parents: 3201 diff changeset	308 case NGX_EEXIST:
121fae8c673c ignore EACCES errors for top level directories in ngx_create_full_path() Igor Sysoev <igor@sysoev.ru> parents: 3201 diff changeset	309 err = 0;
121fae8c673c ignore EACCES errors for top level directories in ngx_create_full_path() Igor Sysoev <igor@sysoev.ru> parents: 3201 diff changeset	310 case NGX_EACCES:
121fae8c673c ignore EACCES errors for top level directories in ngx_create_full_path() Igor Sysoev <igor@sysoev.ru> parents: 3201 diff changeset	311 break;
121fae8c673c ignore EACCES errors for top level directories in ngx_create_full_path() Igor Sysoev <igor@sysoev.ru> parents: 3201 diff changeset	312
121fae8c673c ignore EACCES errors for top level directories in ngx_create_full_path() Igor Sysoev <igor@sysoev.ru> parents: 3201 diff changeset	313 default:
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	314 return err;
e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	315 }
e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	316 }
e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	317
e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	318 *p = '/';
e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	319 }
e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	320
3202 121fae8c673c ignore EACCES errors for top level directories in ngx_create_full_path() Igor Sysoev <igor@sysoev.ru> parents: 3201 diff changeset	321 return err;
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	322 }
e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	323
e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	324
495 fc9909c369b2 nginx-0.1.22-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 493 diff changeset	325 ngx_atomic_uint_t
493 975f62e77f02 nginx-0.1.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	326 ngx_next_temp_number(ngx_uint_t collision)
83 a7e45c45a95c nginx-0.0.1-2003-04-28-19:06:39 import Igor Sysoev <igor@sysoev.ru> parents: 75 diff changeset	327 {
3035 f9d97311c652 ) share temporary number between workers Igor Sysoev <igor@sysoev.ru>* parents: 3034 diff changeset	328 ngx_atomic_uint_t n, add;
f9d97311c652 ) share temporary number between workers Igor Sysoev <igor@sysoev.ru>* parents: 3034 diff changeset	329
f9d97311c652 ) share temporary number between workers Igor Sysoev <igor@sysoev.ru>* parents: 3034 diff changeset	330 add = collision ? ngx_random_number : 1;
83 a7e45c45a95c nginx-0.0.1-2003-04-28-19:06:39 import Igor Sysoev <igor@sysoev.ru> parents: 75 diff changeset	331
3035 f9d97311c652 ) share temporary number between workers Igor Sysoev <igor@sysoev.ru>* parents: 3034 diff changeset	332 n = ngx_atomic_fetch_add(ngx_temp_number, add);
f9d97311c652 ) share temporary number between workers Igor Sysoev <igor@sysoev.ru>* parents: 3034 diff changeset	333
f9d97311c652 ) share temporary number between workers Igor Sysoev <igor@sysoev.ru>* parents: 3034 diff changeset	334 return n + add;
83 a7e45c45a95c nginx-0.0.1-2003-04-28-19:06:39 import Igor Sysoev <igor@sysoev.ru> parents: 75 diff changeset	335 }
155 46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 100 diff changeset	336
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 100 diff changeset	337
493 975f62e77f02 nginx-0.1.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	338 char *
975f62e77f02 nginx-0.1.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	339 ngx_conf_set_path_slot(ngx_conf_t cf, ngx_command_t cmd, void *conf)
155 46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 100 diff changeset	340 {
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 100 diff changeset	341 char *p = conf;
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 100 diff changeset	342
467 bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	343 ssize_t level;
629 65bf042c0b4f nginx-0.3.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	344 ngx_str_t *value;
290 87e73f067470 nginx-0.0.2-2004-03-16-10:10:12 import Igor Sysoev <igor@sysoev.ru> parents: 257 diff changeset	345 ngx_uint_t i, n;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	346 ngx_path_t path, *slot;
155 46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 100 diff changeset	347
467 bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	348 slot = (ngx_path_t **) (p + cmd->offset);
155 46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 100 diff changeset	349
467 bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	350 if (*slot) {
155 46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 100 diff changeset	351 return "is duplicate";
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 100 diff changeset	352 }
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 100 diff changeset	353
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	354 path = ngx_pcalloc(cf->pool, sizeof(ngx_path_t));
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	355 if (path == NULL) {
467 bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	356 return NGX_CONF_ERROR;
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	357 }
190 02a715e85df1 nginx-0.0.1-2003-11-19-00:34:08 import Igor Sysoev <igor@sysoev.ru> parents: 186 diff changeset	358
467 bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	359 value = cf->args->elts;
155 46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 100 diff changeset	360
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 100 diff changeset	361 path->name = value[1];
629 65bf042c0b4f nginx-0.3.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	362
661 9079ee4735ae nginx-0.3.52-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	363 if (path->name.data[path->name.len - 1] == '/') {
9079ee4735ae nginx-0.3.52-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	364 path->name.len--;
9079ee4735ae nginx-0.3.52-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	365 }
9079ee4735ae nginx-0.3.52-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	366
5330 314c3d7cc3a5 Backed out f1a91825730a and 7094bd12c1ff. Maxim Dounin <mdounin@mdounin.ru> parents: 5317 diff changeset	367 if (ngx_conf_full_name(cf->cycle, &path->name, 0) != NGX_OK) {
6069 e37ec0a33901 Core: fixed error handling on ngx_conf_full_name() failure. Sergey Kandaurov <pluknet@nginx.com> parents: 5969 diff changeset	368 return NGX_CONF_ERROR;
629 65bf042c0b4f nginx-0.3.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	369 }
65bf042c0b4f nginx-0.3.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	370
467 bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	371 path->conf_file = cf->conf_file->file.name.data;
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	372 path->line = cf->conf_file->line;
155 46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 100 diff changeset	373
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 100 diff changeset	374 for (i = 0, n = 2; n < cf->args->nelts; i++, n++) {
194 2357fa41738a nginx-0.0.1-2003-11-21-09:30:49 import Igor Sysoev <igor@sysoev.ru> parents: 190 diff changeset	375 level = ngx_atoi(value[n].data, value[n].len);
2357fa41738a nginx-0.0.1-2003-11-21-09:30:49 import Igor Sysoev <igor@sysoev.ru> parents: 190 diff changeset	376 if (level == NGX_ERROR \|\| level == 0) {
155 46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 100 diff changeset	377 return "invalid value";
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 100 diff changeset	378 }
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 100 diff changeset	379
195 8dee38ea9117 nginx-0.0.1-2003-11-25-23:44:56 import Igor Sysoev <igor@sysoev.ru> parents: 194 diff changeset	380 path->level[i] = level;
8dee38ea9117 nginx-0.0.1-2003-11-25-23:44:56 import Igor Sysoev <igor@sysoev.ru> parents: 194 diff changeset	381 path->len += level + 1;
155 46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 100 diff changeset	382 }
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 100 diff changeset	383
6071 7bdd34cd2711 Core: limited levels of subdirectory hierarchy used for temp files. Sergey Kandaurov <pluknet@nginx.com> parents: 6070 diff changeset	384 if (path->len > 10 + i) {
7bdd34cd2711 Core: limited levels of subdirectory hierarchy used for temp files. Sergey Kandaurov <pluknet@nginx.com> parents: 6070 diff changeset	385 return "invalid value";
7bdd34cd2711 Core: limited levels of subdirectory hierarchy used for temp files. Sergey Kandaurov <pluknet@nginx.com> parents: 6070 diff changeset	386 }
7bdd34cd2711 Core: limited levels of subdirectory hierarchy used for temp files. Sergey Kandaurov <pluknet@nginx.com> parents: 6070 diff changeset	387
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	388 *slot = path;
467 bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	389
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	390 if (ngx_add_path(cf, slot) == NGX_ERROR) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	391 return NGX_CONF_ERROR;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	392 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	393
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	394 return NGX_CONF_OK;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	395 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	396
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	397
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	398 char *
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	399 ngx_conf_merge_path_value(ngx_conf_t cf, ngx_path_t path, ngx_path_t prev,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	400 ngx_path_init_t *init)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	401 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	402 if (*path) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	403 return NGX_CONF_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	404 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	405
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	406 if (prev) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	407 *path = prev;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	408 return NGX_CONF_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	409 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	410
5375 7d8770196436 Use ngx_pcalloc() in ngx_conf_merge_path_value(). Valentin Bartenev <vbart@nginx.com> parents: 5330 diff changeset	411 *path = ngx_pcalloc(cf->pool, sizeof(ngx_path_t));
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	412 if (*path == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	413 return NGX_CONF_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	414 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	415
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	416 (*path)->name = init->name;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	417
5330 314c3d7cc3a5 Backed out f1a91825730a and 7094bd12c1ff. Maxim Dounin <mdounin@mdounin.ru> parents: 5317 diff changeset	418 if (ngx_conf_full_name(cf->cycle, &(*path)->name, 0) != NGX_OK) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	419 return NGX_CONF_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	420 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	421
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	422 (*path)->level[0] = init->level[0];
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	423 (*path)->level[1] = init->level[1];
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	424 (*path)->level[2] = init->level[2];
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	425
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	426 (*path)->len = init->level[0] + (init->level[0] ? 1 : 0)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	427 + init->level[1] + (init->level[1] ? 1 : 0)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	428 + init->level[2] + (init->level[2] ? 1 : 0);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	429
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	430 if (ngx_add_path(cf, path) != NGX_OK) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	431 return NGX_CONF_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	432 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	433
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	434 return NGX_CONF_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	435 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	436
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	437
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	438 char *
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	439 ngx_conf_set_access_slot(ngx_conf_t cf, ngx_command_t cmd, void *conf)
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	440 {
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	441 char *confp = conf;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	442
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	443 u_char *p;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	444 ngx_str_t *value;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	445 ngx_uint_t i, right, shift, *access;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	446
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	447 access = (ngx_uint_t *) (confp + cmd->offset);
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	448
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	449 if (*access != NGX_CONF_UNSET_UINT) {
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	450 return "is duplicate";
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	451 }
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	452
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	453 value = cf->args->elts;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	454
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	455 *access = 0600;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	456
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	457 for (i = 1; i < cf->args->nelts; i++) {
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	458
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	459 p = value[i].data;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	460
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	461 if (ngx_strncmp(p, "user:", sizeof("user:") - 1) == 0) {
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	462 shift = 6;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	463 p += sizeof("user:") - 1;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	464
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	465 } else if (ngx_strncmp(p, "group:", sizeof("group:") - 1) == 0) {
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	466 shift = 3;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	467 p += sizeof("group:") - 1;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	468
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	469 } else if (ngx_strncmp(p, "all:", sizeof("all:") - 1) == 0) {
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	470 shift = 0;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	471 p += sizeof("all:") - 1;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	472
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	473 } else {
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	474 goto invalid;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	475 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	476
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	477 if (ngx_strcmp(p, "rw") == 0) {
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	478 right = 6;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	479
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	480 } else if (ngx_strcmp(p, "r") == 0) {
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	481 right = 4;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	482
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	483 } else {
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	484 goto invalid;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	485 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	486
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	487 *access \|= right << shift;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	488 }
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	489
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	490 return NGX_CONF_OK;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	491
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	492 invalid:
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	493
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	494 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid value \"%V\"", &value[i]);
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	495
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	496 return NGX_CONF_ERROR;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	497 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	498
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1091 diff changeset	499
493 975f62e77f02 nginx-0.1.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	500 ngx_int_t
975f62e77f02 nginx-0.1.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	501 ngx_add_path(ngx_conf_t cf, ngx_path_t *slot)
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	502 {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	503 ngx_uint_t i, n;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	504 ngx_path_t path, *p;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	505
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	506 path = *slot;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	507
4870 8a9b7b4e9f2d Correct plural form for "path" in the whole source base. Andrey Belov <defan@nginx.com> parents: 4572 diff changeset	508 p = cf->cycle->paths.elts;
8a9b7b4e9f2d Correct plural form for "path" in the whole source base. Andrey Belov <defan@nginx.com> parents: 4572 diff changeset	509 for (i = 0; i < cf->cycle->paths.nelts; i++) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	510 if (p[i]->name.len == path->name.len
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	511 && ngx_strcmp(p[i]->name.data, path->name.data) == 0)
467 bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	512 {
5377 cec155f07c84 Improved check for duplicate path names in ngx_add_path(). Valentin Bartenev <vbart@nginx.com> parents: 5376 diff changeset	513 if (p[i]->data != path->data) {
cec155f07c84 Improved check for duplicate path names in ngx_add_path(). Valentin Bartenev <vbart@nginx.com> parents: 5376 diff changeset	514 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
cec155f07c84 Improved check for duplicate path names in ngx_add_path(). Valentin Bartenev <vbart@nginx.com> parents: 5376 diff changeset	515 "the same path name \"%V\" "
cec155f07c84 Improved check for duplicate path names in ngx_add_path(). Valentin Bartenev <vbart@nginx.com> parents: 5376 diff changeset	516 "used in %s:%ui and",
cec155f07c84 Improved check for duplicate path names in ngx_add_path(). Valentin Bartenev <vbart@nginx.com> parents: 5376 diff changeset	517 &p[i]->name, p[i]->conf_file, p[i]->line);
cec155f07c84 Improved check for duplicate path names in ngx_add_path(). Valentin Bartenev <vbart@nginx.com> parents: 5376 diff changeset	518 return NGX_ERROR;
cec155f07c84 Improved check for duplicate path names in ngx_add_path(). Valentin Bartenev <vbart@nginx.com> parents: 5376 diff changeset	519 }
cec155f07c84 Improved check for duplicate path names in ngx_add_path(). Valentin Bartenev <vbart@nginx.com> parents: 5376 diff changeset	520
467 bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	521 for (n = 0; n < 3; n++) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	522 if (p[i]->level[n] != path->level[n]) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	523 if (path->conf_file == NULL) {
481 fd661d14a7fa nginx-0.1.15-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	524 if (p[i]->conf_file == NULL) {
fd661d14a7fa nginx-0.1.15-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	525 ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
fd661d14a7fa nginx-0.1.15-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	526 "the default path name \"%V\" has "
fd661d14a7fa nginx-0.1.15-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	527 "the same name as another default path, "
fd661d14a7fa nginx-0.1.15-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	528 "but the different levels, you need to "
fd661d14a7fa nginx-0.1.15-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	529 "redefine one of them in http section",
fd661d14a7fa nginx-0.1.15-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	530 &p[i]->name);
fd661d14a7fa nginx-0.1.15-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	531 return NGX_ERROR;
fd661d14a7fa nginx-0.1.15-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	532 }
fd661d14a7fa nginx-0.1.15-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	533
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	534 ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	535 "the path name \"%V\" in %s:%ui has "
481 fd661d14a7fa nginx-0.1.15-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	536 "the same name as default path, but "
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	537 "the different levels, you need to "
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	538 "define default path in http section",
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	539 &p[i]->name, p[i]->conf_file, p[i]->line);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	540 return NGX_ERROR;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	541 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	542
467 bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	543 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	544 "the same path name \"%V\" in %s:%ui "
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	545 "has the different levels than",
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	546 &p[i]->name, p[i]->conf_file, p[i]->line);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	547 return NGX_ERROR;
467 bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	548 }
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	549
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	550 if (p[i]->level[n] == 0) {
467 bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	551 break;
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	552 }
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	553 }
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	554
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	555 *slot = p[i];
467 bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	556
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	557 return NGX_OK;
467 bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	558 }
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	559 }
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	560
4870 8a9b7b4e9f2d Correct plural form for "path" in the whole source base. Andrey Belov <defan@nginx.com> parents: 4572 diff changeset	561 p = ngx_array_push(&cf->cycle->paths);
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	562 if (p == NULL) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	563 return NGX_ERROR;
467 bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	564 }
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	565
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	566 *p = path;
190 02a715e85df1 nginx-0.0.1-2003-11-19-00:34:08 import Igor Sysoev <igor@sysoev.ru> parents: 186 diff changeset	567
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	568 return NGX_OK;
155 46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 100 diff changeset	569 }
467 bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	570
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	571
493 975f62e77f02 nginx-0.1.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	572 ngx_int_t
4870 8a9b7b4e9f2d Correct plural form for "path" in the whole source base. Andrey Belov <defan@nginx.com> parents: 4572 diff changeset	573 ngx_create_paths(ngx_cycle_t *cycle, ngx_uid_t user)
467 bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	574 {
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	575 ngx_err_t err;
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	576 ngx_uint_t i;
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	577 ngx_path_t **path;
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	578
4870 8a9b7b4e9f2d Correct plural form for "path" in the whole source base. Andrey Belov <defan@nginx.com> parents: 4572 diff changeset	579 path = cycle->paths.elts;
8a9b7b4e9f2d Correct plural form for "path" in the whole source base. Andrey Belov <defan@nginx.com> parents: 4572 diff changeset	580 for (i = 0; i < cycle->paths.nelts; i++) {
467 bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	581
669 562806624c4a nginx-0.3.56-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 667 diff changeset	582 if (ngx_create_dir(path[i]->name.data, 0700) == NGX_FILE_ERROR) {
467 bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	583 err = ngx_errno;
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	584 if (err != NGX_EEXIST) {
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	585 ngx_log_error(NGX_LOG_EMERG, cycle->log, err,
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	586 ngx_create_dir_n " \"%s\" failed",
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	587 path[i]->name.data);
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	588 return NGX_ERROR;
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	589 }
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	590 }
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	591
517 dadfa78d2270 nginx-0.1.33-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	592 if (user == (ngx_uid_t) NGX_CONF_UNSET_UINT) {
467 bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	593 continue;
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	594 }
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	595
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	596 #if !(NGX_WIN32)
1704 e584e946e198 move condition declarations inside blocks where they are used Igor Sysoev <igor@sysoev.ru> parents: 1695 diff changeset	597 {
e584e946e198 move condition declarations inside blocks where they are used Igor Sysoev <igor@sysoev.ru> parents: 1695 diff changeset	598 ngx_file_info_t fi;
467 bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	599
2782 4bd7825fab80 uniform ngx_file_info() interface with ngx_fd_info() Igor Sysoev <igor@sysoev.ru> parents: 2616 diff changeset	600 if (ngx_file_info((const char *) path[i]->name.data, &fi)
4bd7825fab80 uniform ngx_file_info() interface with ngx_fd_info() Igor Sysoev <igor@sysoev.ru> parents: 2616 diff changeset	601 == NGX_FILE_ERROR)
4bd7825fab80 uniform ngx_file_info() interface with ngx_fd_info() Igor Sysoev <igor@sysoev.ru> parents: 2616 diff changeset	602 {
467 bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	603 ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	604 ngx_file_info_n " \"%s\" failed", path[i]->name.data);
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	605 return NGX_ERROR;
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	606 }
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	607
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	608 if (fi.st_uid != user) {
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	609 if (chown((const char *) path[i]->name.data, user, -1) == -1) {
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	610 ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	611 "chown(\"%s\", %d) failed",
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	612 path[i]->name.data, user);
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	613 return NGX_ERROR;
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	614 }
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	615 }
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	616
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	617 if ((fi.st_mode & (S_IRUSR\|S_IWUSR\|S_IXUSR))
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	618 != (S_IRUSR\|S_IWUSR\|S_IXUSR))
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	619 {
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	620 fi.st_mode \|= (S_IRUSR\|S_IWUSR\|S_IXUSR);
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	621
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	622 if (chmod((const char *) path[i]->name.data, fi.st_mode) == -1) {
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	623 ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	624 "chmod() \"%s\" failed", path[i]->name.data);
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	625 return NGX_ERROR;
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	626 }
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	627 }
1704 e584e946e198 move condition declarations inside blocks where they are used Igor Sysoev <igor@sysoev.ru> parents: 1695 diff changeset	628 }
467 bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	629 #endif
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	630 }
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	631
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	632 return NGX_OK;
bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	633 }
956 8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	634
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	635
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	636 ngx_int_t
1826 8d50173ccba2 transform ngx_create_path_and_rename_file() to ngx_ext_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1750 diff changeset	637 ngx_ext_rename_file(ngx_str_t src, ngx_str_t to, ngx_ext_rename_file_t *ext)
1695 8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	638 {
3024 8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	639 u_char *name;
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	640 ngx_err_t err;
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	641 ngx_copy_file_t cf;
1695 8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	642
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	643 #if !(NGX_WIN32)
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	644
2394 dbe746851b31 use ngx_ext_rename_file() for single file MOVE Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	645 if (ext->access) {
dbe746851b31 use ngx_ext_rename_file() for single file MOVE Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	646 if (ngx_change_file_access(src->data, ext->access) == NGX_FILE_ERROR) {
dbe746851b31 use ngx_ext_rename_file() for single file MOVE Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	647 ngx_log_error(NGX_LOG_CRIT, ext->log, ngx_errno,
dbe746851b31 use ngx_ext_rename_file() for single file MOVE Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	648 ngx_change_file_access_n " \"%s\" failed", src->data);
dbe746851b31 use ngx_ext_rename_file() for single file MOVE Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	649 err = 0;
dbe746851b31 use ngx_ext_rename_file() for single file MOVE Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	650 goto failed;
dbe746851b31 use ngx_ext_rename_file() for single file MOVE Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	651 }
1695 8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	652 }
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	653
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	654 #endif
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	655
1826 8d50173ccba2 transform ngx_create_path_and_rename_file() to ngx_ext_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1750 diff changeset	656 if (ext->time != -1) {
8d50173ccba2 transform ngx_create_path_and_rename_file() to ngx_ext_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1750 diff changeset	657 if (ngx_set_file_time(src->data, ext->fd, ext->time) != NGX_OK) {
8d50173ccba2 transform ngx_create_path_and_rename_file() to ngx_ext_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1750 diff changeset	658 ngx_log_error(NGX_LOG_CRIT, ext->log, ngx_errno,
8d50173ccba2 transform ngx_create_path_and_rename_file() to ngx_ext_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1750 diff changeset	659 ngx_set_file_time_n " \"%s\" failed", src->data);
8d50173ccba2 transform ngx_create_path_and_rename_file() to ngx_ext_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1750 diff changeset	660 err = 0;
8d50173ccba2 transform ngx_create_path_and_rename_file() to ngx_ext_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1750 diff changeset	661 goto failed;
8d50173ccba2 transform ngx_create_path_and_rename_file() to ngx_ext_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1750 diff changeset	662 }
8d50173ccba2 transform ngx_create_path_and_rename_file() to ngx_ext_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1750 diff changeset	663 }
8d50173ccba2 transform ngx_create_path_and_rename_file() to ngx_ext_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1750 diff changeset	664
1695 8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	665 if (ngx_rename_file(src->data, to->data) != NGX_FILE_ERROR) {
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	666 return NGX_OK;
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	667 }
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	668
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	669 err = ngx_errno;
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	670
3023 7d5501988fe3 NGX_ENOPATH Igor Sysoev <igor@sysoev.ru> parents: 3018 diff changeset	671 if (err == NGX_ENOPATH) {
7d5501988fe3 NGX_ENOPATH Igor Sysoev <igor@sysoev.ru> parents: 3018 diff changeset	672
1826 8d50173ccba2 transform ngx_create_path_and_rename_file() to ngx_ext_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1750 diff changeset	673 if (!ext->create_path) {
1695 8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	674 goto failed;
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	675 }
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	676
2394 dbe746851b31 use ngx_ext_rename_file() for single file MOVE Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	677 err = ngx_create_full_path(to->data, ngx_dir_access(ext->path_access));
1695 8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	678
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	679 if (err) {
1826 8d50173ccba2 transform ngx_create_path_and_rename_file() to ngx_ext_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1750 diff changeset	680 ngx_log_error(NGX_LOG_CRIT, ext->log, err,
1695 8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	681 ngx_create_dir_n " \"%s\" failed", to->data);
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	682 err = 0;
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	683 goto failed;
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	684 }
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	685
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	686 if (ngx_rename_file(src->data, to->data) != NGX_FILE_ERROR) {
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	687 return NGX_OK;
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	688 }
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	689
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	690 err = ngx_errno;
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	691 }
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	692
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	693 #if (NGX_WIN32)
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	694
6468 a5897d360977 Win32: additional error code NGX_EEXIST_FILE (ticket #910). Maxim Dounin <mdounin@mdounin.ru> parents: 6442 diff changeset	695 if (err == NGX_EEXIST \|\| err == NGX_EEXIST_FILE) {
3382 6be1f25bae90 fix Win32 error messages when an temporary file replaces an existent file: Igor Sysoev <igor@sysoev.ru> parents: 3202 diff changeset	696 err = ngx_win32_rename_file(src, to, ext->log);
3387 a02b6d2e3bfd fix Win32 error message when an temporary file replaces an existent file: Igor Sysoev <igor@sysoev.ru> parents: 3382 diff changeset	697
a02b6d2e3bfd fix Win32 error message when an temporary file replaces an existent file: Igor Sysoev <igor@sysoev.ru> parents: 3382 diff changeset	698 if (err == 0) {
a02b6d2e3bfd fix Win32 error message when an temporary file replaces an existent file: Igor Sysoev <igor@sysoev.ru> parents: 3382 diff changeset	699 return NGX_OK;
a02b6d2e3bfd fix Win32 error message when an temporary file replaces an existent file: Igor Sysoev <igor@sysoev.ru> parents: 3382 diff changeset	700 }
1695 8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	701 }
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	702
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	703 #endif
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	704
3024 8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	705 if (err == NGX_EXDEV) {
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	706
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	707 cf.size = -1;
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	708 cf.buf_size = 0;
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	709 cf.access = ext->access;
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	710 cf.time = ext->time;
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	711 cf.log = ext->log;
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	712
3032 524ba56ba9f7 fix copy destination name length, introduced in r3025 Igor Sysoev <igor@sysoev.ru> parents: 3027 diff changeset	713 name = ngx_alloc(to->len + 1 + 10 + 1, ext->log);
3024 8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	714 if (name == NULL) {
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	715 return NGX_ERROR;
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	716 }
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	717
3032 524ba56ba9f7 fix copy destination name length, introduced in r3025 Igor Sysoev <igor@sysoev.ru> parents: 3027 diff changeset	718 (void) ngx_sprintf(name, "%*s.%010uD%Z", to->len, to->data,
3024 8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	719 (uint32_t) ngx_next_temp_number(0));
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	720
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	721 if (ngx_copy_file(src->data, name, &cf) == NGX_OK) {
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	722
3033 db3e5c4c7413 fix copy failure logging and stale files removal, introduced in r3025 Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	723 if (ngx_rename_file(name, to->data) != NGX_FILE_ERROR) {
3024 8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	724 ngx_free(name);
3033 db3e5c4c7413 fix copy failure logging and stale files removal, introduced in r3025 Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	725
db3e5c4c7413 fix copy failure logging and stale files removal, introduced in r3025 Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	726 if (ngx_delete_file(src->data) == NGX_FILE_ERROR) {
db3e5c4c7413 fix copy failure logging and stale files removal, introduced in r3025 Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	727 ngx_log_error(NGX_LOG_CRIT, ext->log, ngx_errno,
db3e5c4c7413 fix copy failure logging and stale files removal, introduced in r3025 Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	728 ngx_delete_file_n " \"%s\" failed",
db3e5c4c7413 fix copy failure logging and stale files removal, introduced in r3025 Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	729 src->data);
db3e5c4c7413 fix copy failure logging and stale files removal, introduced in r3025 Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	730 return NGX_ERROR;
db3e5c4c7413 fix copy failure logging and stale files removal, introduced in r3025 Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	731 }
db3e5c4c7413 fix copy failure logging and stale files removal, introduced in r3025 Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	732
db3e5c4c7413 fix copy failure logging and stale files removal, introduced in r3025 Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	733 return NGX_OK;
3024 8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	734 }
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	735
3033 db3e5c4c7413 fix copy failure logging and stale files removal, introduced in r3025 Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	736 ngx_log_error(NGX_LOG_CRIT, ext->log, ngx_errno,
db3e5c4c7413 fix copy failure logging and stale files removal, introduced in r3025 Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	737 ngx_rename_file_n " \"%s\" to \"%s\" failed",
db3e5c4c7413 fix copy failure logging and stale files removal, introduced in r3025 Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	738 name, to->data);
3024 8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	739
3033 db3e5c4c7413 fix copy failure logging and stale files removal, introduced in r3025 Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	740 if (ngx_delete_file(name) == NGX_FILE_ERROR) {
3024 8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	741 ngx_log_error(NGX_LOG_CRIT, ext->log, ngx_errno,
3033 db3e5c4c7413 fix copy failure logging and stale files removal, introduced in r3025 Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	742 ngx_delete_file_n " \"%s\" failed", name);
3024 8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	743
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	744 }
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	745 }
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	746
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	747 ngx_free(name);
3033 db3e5c4c7413 fix copy failure logging and stale files removal, introduced in r3025 Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	748
db3e5c4c7413 fix copy failure logging and stale files removal, introduced in r3025 Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	749 err = 0;
3024 8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	750 }
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	751
1695 8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	752 failed:
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	753
1909 cbd321d1e1b3 C++ compatibility Igor Sysoev <igor@sysoev.ru> parents: 1826 diff changeset	754 if (ext->delete_file) {
1695 8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	755 if (ngx_delete_file(src->data) == NGX_FILE_ERROR) {
1826 8d50173ccba2 transform ngx_create_path_and_rename_file() to ngx_ext_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1750 diff changeset	756 ngx_log_error(NGX_LOG_CRIT, ext->log, ngx_errno,
1695 8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	757 ngx_delete_file_n " \"%s\" failed", src->data);
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	758 }
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	759 }
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	760
3024 8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	761 if (err) {
1826 8d50173ccba2 transform ngx_create_path_and_rename_file() to ngx_ext_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1750 diff changeset	762 ngx_log_error(NGX_LOG_CRIT, ext->log, err,
1695 8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	763 ngx_rename_file_n " \"%s\" to \"%s\" failed",
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	764 src->data, to->data);
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	765 }
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	766
3024 8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	767 return NGX_ERROR;
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	768 }
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	769
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	770
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	771 ngx_int_t
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	772 ngx_copy_file(u_char from, u_char to, ngx_copy_file_t *cf)
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	773 {
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	774 char *buf;
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	775 off_t size;
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	776 size_t len;
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	777 ssize_t n;
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	778 ngx_fd_t fd, nfd;
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	779 ngx_int_t rc;
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	780 ngx_file_info_t fi;
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	781
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	782 rc = NGX_ERROR;
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	783 buf = NULL;
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	784 nfd = NGX_INVALID_FILE;
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	785
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	786 fd = ngx_open_file(from, NGX_FILE_RDONLY, NGX_FILE_OPEN, 0);
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	787
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	788 if (fd == NGX_INVALID_FILE) {
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	789 ngx_log_error(NGX_LOG_CRIT, cf->log, ngx_errno,
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	790 ngx_open_file_n " \"%s\" failed", from);
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	791 goto failed;
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	792 }
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	793
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	794 if (cf->size != -1) {
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	795 size = cf->size;
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	796
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	797 } else {
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	798 if (ngx_fd_info(fd, &fi) == NGX_FILE_ERROR) {
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	799 ngx_log_error(NGX_LOG_ALERT, cf->log, ngx_errno,
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	800 ngx_fd_info_n " \"%s\" failed", from);
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	801
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	802 goto failed;
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	803 }
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	804
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	805 size = ngx_file_size(&fi);
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	806 }
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	807
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	808 len = cf->buf_size ? cf->buf_size : 65536;
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	809
3027 3e1b653fd22f fix building on 64-bit platforms, introduced in r3025 Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	810 if ((off_t) len > size) {
3024 8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	811 len = (size_t) size;
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	812 }
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	813
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	814 buf = ngx_alloc(len, cf->log);
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	815 if (buf == NULL) {
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	816 goto failed;
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	817 }
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	818
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	819 nfd = ngx_open_file(to, NGX_FILE_WRONLY, NGX_FILE_CREATE_OR_OPEN,
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	820 cf->access);
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	821
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	822 if (nfd == NGX_INVALID_FILE) {
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	823 ngx_log_error(NGX_LOG_CRIT, cf->log, ngx_errno,
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	824 ngx_open_file_n " \"%s\" failed", to);
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	825 goto failed;
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	826 }
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	827
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	828 while (size > 0) {
2394 dbe746851b31 use ngx_ext_rename_file() for single file MOVE Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	829
3027 3e1b653fd22f fix building on 64-bit platforms, introduced in r3025 Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	830 if ((off_t) len > size) {
3024 8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	831 len = (size_t) size;
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	832 }
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	833
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	834 n = ngx_read_fd(fd, buf, len);
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	835
4966 c821975c9068 Fixed handling of ngx_write_fd() and ngx_read_fd() errors. Valentin Bartenev <vbart@nginx.com> parents: 4870 diff changeset	836 if (n == -1) {
3024 8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	837 ngx_log_error(NGX_LOG_ALERT, cf->log, ngx_errno,
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	838 ngx_read_fd_n " \"%s\" failed", from);
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	839 goto failed;
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	840 }
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	841
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	842 if ((size_t) n != len) {
4966 c821975c9068 Fixed handling of ngx_write_fd() and ngx_read_fd() errors. Valentin Bartenev <vbart@nginx.com> parents: 4870 diff changeset	843 ngx_log_error(NGX_LOG_ALERT, cf->log, 0,
6480 f01ab2dbcfdc Fixed logging. Sergey Kandaurov <pluknet@nginx.com> parents: 6474 diff changeset	844 ngx_read_fd_n " has read only %z of %O from %s",
3024 8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	845 n, size, from);
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	846 goto failed;
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	847 }
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	848
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	849 n = ngx_write_fd(nfd, buf, len);
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	850
4966 c821975c9068 Fixed handling of ngx_write_fd() and ngx_read_fd() errors. Valentin Bartenev <vbart@nginx.com> parents: 4870 diff changeset	851 if (n == -1) {
3024 8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	852 ngx_log_error(NGX_LOG_ALERT, cf->log, ngx_errno,
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	853 ngx_write_fd_n " \"%s\" failed", to);
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	854 goto failed;
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	855 }
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	856
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	857 if ((size_t) n != len) {
4966 c821975c9068 Fixed handling of ngx_write_fd() and ngx_read_fd() errors. Valentin Bartenev <vbart@nginx.com> parents: 4870 diff changeset	858 ngx_log_error(NGX_LOG_ALERT, cf->log, 0,
6480 f01ab2dbcfdc Fixed logging. Sergey Kandaurov <pluknet@nginx.com> parents: 6474 diff changeset	859 ngx_write_fd_n " has written only %z of %O to %s",
3024 8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	860 n, size, to);
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	861 goto failed;
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	862 }
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	863
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	864 size -= n;
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	865 }
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	866
3481 35e258519a83 do not set file time in ngx_copy_file() if the time is -1, Igor Sysoev <igor@sysoev.ru> parents: 3387 diff changeset	867 if (cf->time != -1) {
35e258519a83 do not set file time in ngx_copy_file() if the time is -1, Igor Sysoev <igor@sysoev.ru> parents: 3387 diff changeset	868 if (ngx_set_file_time(to, nfd, cf->time) != NGX_OK) {
35e258519a83 do not set file time in ngx_copy_file() if the time is -1, Igor Sysoev <igor@sysoev.ru> parents: 3387 diff changeset	869 ngx_log_error(NGX_LOG_ALERT, cf->log, ngx_errno,
35e258519a83 do not set file time in ngx_copy_file() if the time is -1, Igor Sysoev <igor@sysoev.ru> parents: 3387 diff changeset	870 ngx_set_file_time_n " \"%s\" failed", to);
35e258519a83 do not set file time in ngx_copy_file() if the time is -1, Igor Sysoev <igor@sysoev.ru> parents: 3387 diff changeset	871 goto failed;
35e258519a83 do not set file time in ngx_copy_file() if the time is -1, Igor Sysoev <igor@sysoev.ru> parents: 3387 diff changeset	872 }
3024 8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	873 }
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	874
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	875 rc = NGX_OK;
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	876
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	877 failed:
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	878
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	879 if (nfd != NGX_INVALID_FILE) {
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	880 if (ngx_close_file(nfd) == NGX_FILE_ERROR) {
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	881 ngx_log_error(NGX_LOG_ALERT, cf->log, ngx_errno,
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	882 ngx_close_file_n " \"%s\" failed", to);
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	883 }
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	884 }
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	885
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	886 if (fd != NGX_INVALID_FILE) {
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	887 if (ngx_close_file(fd) == NGX_FILE_ERROR) {
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	888 ngx_log_error(NGX_LOG_ALERT, cf->log, ngx_errno,
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	889 ngx_close_file_n " \"%s\" failed", from);
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	890 }
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	891 }
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	892
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	893 if (buf) {
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	894 ngx_free(buf);
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	895 }
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	896
8101d9101ed8 allow cross device temporary files atomic copying: Igor Sysoev <igor@sysoev.ru> parents: 3023 diff changeset	897 return rc;
1695 8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	898 }
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	899
8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	900
1750 e16813ff8618 comment ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 1748 diff changeset	901 /*
e16813ff8618 comment ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 1748 diff changeset	902 * ctx->init_handler() - see ctx->alloc
e16813ff8618 comment ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 1748 diff changeset	903 * ctx->file_handler() - file handler
e16813ff8618 comment ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 1748 diff changeset	904 * ctx->pre_tree_handler() - handler is called before entering directory
e16813ff8618 comment ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 1748 diff changeset	905 * ctx->post_tree_handler() - handler is called after leaving directory
e16813ff8618 comment ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 1748 diff changeset	906 * ctx->spec_handler() - special (socket, FIFO, etc.) file handler
e16813ff8618 comment ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 1748 diff changeset	907 *
e16813ff8618 comment ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 1748 diff changeset	908 * ctx->data - some data structure, it may be the same on all levels, or
e16813ff8618 comment ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 1748 diff changeset	909 * reallocated if ctx->alloc is nonzero
e16813ff8618 comment ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 1748 diff changeset	910 *
e16813ff8618 comment ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 1748 diff changeset	911 * ctx->alloc - a size of data structure that is allocated at every level
4572 67653855682e Fixed spelling in multiline C comments. Ruslan Ermilov <ru@nginx.com> parents: 4412 diff changeset	912 * and is initialized by ctx->init_handler()
1750 e16813ff8618 comment ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 1748 diff changeset	913 *
e16813ff8618 comment ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 1748 diff changeset	914 * ctx->log - a log
e16813ff8618 comment ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 1748 diff changeset	915 *
e16813ff8618 comment ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 1748 diff changeset	916 * on fatal (memory) error handler must return NGX_ABORT to stop walking tree
e16813ff8618 comment ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 1748 diff changeset	917 */
e16813ff8618 comment ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 1748 diff changeset	918
1695 8c4532a48b0a ngx_create_path_and_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	919 ngx_int_t
956 8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	920 ngx_walk_tree(ngx_tree_ctx_t ctx, ngx_str_t tree)
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	921 {
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	922 void data, prev;
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	923 u_char p, name;
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	924 size_t len;
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	925 ngx_int_t rc;
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	926 ngx_err_t err;
977 b9836e87dd4d style fix: remove trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 956 diff changeset	927 ngx_str_t file, buf;
956 8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	928 ngx_dir_t dir;
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	929
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3481 diff changeset	930 ngx_str_null(&buf);
956 8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	931
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	932 ngx_log_debug1(NGX_LOG_DEBUG_CORE, ctx->log, 0,
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	933 "walk tree \"%V\"", tree);
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	934
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	935 if (ngx_open_dir(tree, &dir) == NGX_ERROR) {
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	936 ngx_log_error(NGX_LOG_CRIT, ctx->log, ngx_errno,
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	937 ngx_open_dir_n " \"%s\" failed", tree->data);
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	938 return NGX_ERROR;
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	939 }
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	940
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	941 prev = ctx->data;
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	942
1058 01f818c6f7de add size, access, and mtime to ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 1046 diff changeset	943 if (ctx->alloc) {
01f818c6f7de add size, access, and mtime to ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 1046 diff changeset	944 data = ngx_alloc(ctx->alloc, ctx->log);
956 8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	945 if (data == NULL) {
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	946 goto failed;
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	947 }
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	948
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	949 if (ctx->init_handler(data, prev) == NGX_ABORT) {
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	950 goto failed;
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	951 }
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	952
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	953 ctx->data = data;
1319 345d2095a6d5 fix potential double free(), Igor Sysoev <igor@sysoev.ru> parents: 1295 diff changeset	954
345d2095a6d5 fix potential double free(), Igor Sysoev <igor@sysoev.ru> parents: 1295 diff changeset	955 } else {
345d2095a6d5 fix potential double free(), Igor Sysoev <igor@sysoev.ru> parents: 1295 diff changeset	956 data = NULL;
956 8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	957 }
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	958
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	959 for ( ;; ) {
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	960
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	961 ngx_set_errno(0);
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	962
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	963 if (ngx_read_dir(&dir) == NGX_ERROR) {
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	964 err = ngx_errno;
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	965
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	966 if (err == NGX_ENOMOREFILES) {
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	967 rc = NGX_OK;
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	968
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	969 } else {
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	970 ngx_log_error(NGX_LOG_CRIT, ctx->log, err,
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	971 ngx_read_dir_n " \"%s\" failed", tree->data);
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	972 rc = NGX_ERROR;
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	973 }
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	974
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	975 goto done;
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	976 }
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	977
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	978 len = ngx_de_namelen(&dir);
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	979 name = ngx_de_name(&dir);
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	980
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	981 ngx_log_debug2(NGX_LOG_DEBUG_CORE, ctx->log, 0,
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	982 "tree name %uz:\"%s\"", len, name);
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	983
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	984 if (len == 1 && name[0] == '.') {
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	985 continue;
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	986 }
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	987
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	988 if (len == 2 && name[0] == '.' && name[1] == '.') {
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	989 continue;
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	990 }
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	991
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	992 file.len = tree->len + 1 + len;
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	993
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	994 if (file.len + NGX_DIR_MASK_LEN > buf.len) {
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	995
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	996 if (buf.len) {
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	997 ngx_free(buf.data);
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	998 }
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	999
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1000 buf.len = tree->len + 1 + len + NGX_DIR_MASK_LEN;
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1001
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1002 buf.data = ngx_alloc(buf.len + 1, ctx->log);
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1003 if (buf.data == NULL) {
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1004 goto failed;
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1005 }
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1006 }
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1007
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1008 p = ngx_cpymem(buf.data, tree->data, tree->len);
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1009 *p++ = '/';
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1010 ngx_memcpy(p, name, len + 1);
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1011
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1012 file.data = buf.data;
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1013
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1014 ngx_log_debug1(NGX_LOG_DEBUG_CORE, ctx->log, 0,
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1015 "tree path \"%s\"", file.data);
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1016
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1017 if (!dir.valid_info) {
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1018 if (ngx_de_info(file.data, &dir) == NGX_FILE_ERROR) {
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1019 ngx_log_error(NGX_LOG_CRIT, ctx->log, ngx_errno,
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1020 ngx_de_info_n " \"%s\" failed", file.data);
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1021 continue;
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1022 }
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1023 }
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1024
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1025 if (ngx_de_is_file(&dir)) {
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1026
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1027 ngx_log_debug1(NGX_LOG_DEBUG_CORE, ctx->log, 0,
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1028 "tree file \"%s\"", file.data);
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1029
1058 01f818c6f7de add size, access, and mtime to ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 1046 diff changeset	1030 ctx->size = ngx_de_size(&dir);
3970 2d05952a324d elimination of reading cache files by cache loader Igor Sysoev <igor@sysoev.ru> parents: 3516 diff changeset	1031 ctx->fs_size = ngx_de_fs_size(&dir);
1058 01f818c6f7de add size, access, and mtime to ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 1046 diff changeset	1032 ctx->access = ngx_de_access(&dir);
01f818c6f7de add size, access, and mtime to ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 1046 diff changeset	1033 ctx->mtime = ngx_de_mtime(&dir);
01f818c6f7de add size, access, and mtime to ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 1046 diff changeset	1034
956 8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1035 if (ctx->file_handler(ctx, &file) == NGX_ABORT) {
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1036 goto failed;
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1037 }
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1038
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1039 } else if (ngx_de_is_dir(&dir)) {
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1040
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1041 ngx_log_debug1(NGX_LOG_DEBUG_CORE, ctx->log, 0,
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1042 "tree enter dir \"%s\"", file.data);
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1043
1058 01f818c6f7de add size, access, and mtime to ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 1046 diff changeset	1044 ctx->access = ngx_de_access(&dir);
01f818c6f7de add size, access, and mtime to ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 1046 diff changeset	1045 ctx->mtime = ngx_de_mtime(&dir);
01f818c6f7de add size, access, and mtime to ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 1046 diff changeset	1046
5967 863d9de1e62b Core: supported directory skipping in ngx_walk_tree(). Roman Arutyunyan <arut@nginx.com> parents: 5958 diff changeset	1047 rc = ctx->pre_tree_handler(ctx, &file);
863d9de1e62b Core: supported directory skipping in ngx_walk_tree(). Roman Arutyunyan <arut@nginx.com> parents: 5958 diff changeset	1048
863d9de1e62b Core: supported directory skipping in ngx_walk_tree(). Roman Arutyunyan <arut@nginx.com> parents: 5958 diff changeset	1049 if (rc == NGX_ABORT) {
956 8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1050 goto failed;
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1051 }
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1052
5967 863d9de1e62b Core: supported directory skipping in ngx_walk_tree(). Roman Arutyunyan <arut@nginx.com> parents: 5958 diff changeset	1053 if (rc == NGX_DECLINED) {
863d9de1e62b Core: supported directory skipping in ngx_walk_tree(). Roman Arutyunyan <arut@nginx.com> parents: 5958 diff changeset	1054 ngx_log_debug1(NGX_LOG_DEBUG_CORE, ctx->log, 0,
863d9de1e62b Core: supported directory skipping in ngx_walk_tree(). Roman Arutyunyan <arut@nginx.com> parents: 5958 diff changeset	1055 "tree skip dir \"%s\"", file.data);
863d9de1e62b Core: supported directory skipping in ngx_walk_tree(). Roman Arutyunyan <arut@nginx.com> parents: 5958 diff changeset	1056 continue;
863d9de1e62b Core: supported directory skipping in ngx_walk_tree(). Roman Arutyunyan <arut@nginx.com> parents: 5958 diff changeset	1057 }
863d9de1e62b Core: supported directory skipping in ngx_walk_tree(). Roman Arutyunyan <arut@nginx.com> parents: 5958 diff changeset	1058
956 8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1059 if (ngx_walk_tree(ctx, &file) == NGX_ABORT) {
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1060 goto failed;
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1061 }
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1062
1058 01f818c6f7de add size, access, and mtime to ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 1046 diff changeset	1063 ctx->access = ngx_de_access(&dir);
01f818c6f7de add size, access, and mtime to ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 1046 diff changeset	1064 ctx->mtime = ngx_de_mtime(&dir);
01f818c6f7de add size, access, and mtime to ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 1046 diff changeset	1065
956 8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1066 if (ctx->post_tree_handler(ctx, &file) == NGX_ABORT) {
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1067 goto failed;
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1068 }
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1069
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1070 } else {
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1071
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1072 ngx_log_debug1(NGX_LOG_DEBUG_CORE, ctx->log, 0,
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1073 "tree special \"%s\"", file.data);
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1074
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1075 if (ctx->spec_handler(ctx, &file) == NGX_ABORT) {
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1076 goto failed;
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1077 }
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1078 }
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1079 }
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1080
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1081 failed:
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1082
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1083 rc = NGX_ABORT;
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1084
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1085 done:
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1086
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1087 if (buf.len) {
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1088 ngx_free(buf.data);
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1089 }
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1090
1319 345d2095a6d5 fix potential double free(), Igor Sysoev <igor@sysoev.ru> parents: 1295 diff changeset	1091 if (data) {
345d2095a6d5 fix potential double free(), Igor Sysoev <igor@sysoev.ru> parents: 1295 diff changeset	1092 ngx_free(data);
956 8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1093 ctx->data = prev;
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1094 }
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1095
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1096 if (ngx_close_dir(&dir) == NGX_ERROR) {
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1097 ngx_log_error(NGX_LOG_CRIT, ctx->log, ngx_errno,
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1098 ngx_close_dir_n " \"%s\" failed", tree->data);
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1099 }
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1100
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1101 return rc;
8c3d62474df1 ngx_walk_tree() Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	1102 }

Mercurial > hg > nginx

annotate src/core/ngx_file.c @ 6755:e2f13011343e stable-1.10