Commit fe1cb8c3acb6a7e12c10b4bd70411ebf5b005a7e - nginx

+3

-3

src/core/ngx_file.c less more

18	18
19	19	if (tf->file.fd == NGX_INVALID_FILE) {
20	20	rc = ngx_create_temp_file(&tf->file, tf->path, tf->pool,
21		tf->persistent, tf->mode);
	21	tf->persistent, tf->access);
22	22
23	23	if (rc == NGX_ERROR \|\| rc == NGX_AGAIN) {
24	24	return rc;

36	36
37	37	ngx_int_t
38	38	ngx_create_temp_file(ngx_file_t file, ngx_path_t path, ngx_pool_t *pool,
39		ngx_uint_t persistent, ngx_uint_t mode)
	39	ngx_uint_t persistent, ngx_uint_t access)
40	40	{
41	41	ngx_err_t err;
42	42	ngx_atomic_uint_t n;

71	71	return NGX_ERROR;
72	72	}
73	73
74		file->fd = ngx_open_tempfile(file->name.data, persistent, mode);
	74	file->fd = ngx_open_tempfile(file->name.data, persistent, access);
75	75
76	76	ngx_log_debug1(NGX_LOG_DEBUG_CORE, file->log, 0,
77	77	"temp fd:%d", file->fd);

+2

-2

src/core/ngx_file.h less more

48	48	ngx_pool_t *pool;
49	49	char *warn;
50	50
51		ngx_uint_t mode;
	51	ngx_uint_t access;
52	52
53	53	unsigned log_level:8;
54	54	unsigned persistent:1;

75	75
76	76	ssize_t ngx_write_chain_to_temp_file(ngx_temp_file_t tf, ngx_chain_t chain);
77	77	ngx_int_t ngx_create_temp_file(ngx_file_t file, ngx_path_t path,
78		ngx_pool_t *pool, ngx_uint_t persistent,ngx_uint_t mode);
	78	ngx_pool_t *pool, ngx_uint_t persistent,ngx_uint_t access);
79	79	void ngx_create_hashed_filename(ngx_file_t file, ngx_path_t path);
80	80	ngx_int_t ngx_create_path(ngx_file_t file, ngx_path_t path);
81	81	ngx_err_t ngx_create_full_path(u_char *dir, ngx_uint_t access);

+3

-3

src/http/ngx_http_request_body.c less more

73	73	tf->persistent = r->request_body_in_persistent_file;
74	74
75	75	if (r->request_body_file_group_access) {
76		tf->mode = 0660;
	76	tf->access = 0660;
77	77	}
78	78
79	79	rb->temp_file = tf;
80	80
81	81	if (ngx_create_temp_file(&tf->file, tf->path, tf->pool,
82		tf->persistent, tf->mode)
	82	tf->persistent, tf->access)
83	83	!= NGX_OK)
84	84	{
85	85	return NGX_HTTP_INTERNAL_SERVER_ERROR;

399	399	tf->persistent = r->request_body_in_persistent_file;
400	400
401	401	if (r->request_body_file_group_access) {
402		tf->mode = 0660;
	402	tf->access = 0660;
403	403	}
404	404
405	405	rb->temp_file = tf;

+3

-2

src/os/unix/ngx_files.c less more

111	111
112	112
113	113	ngx_fd_t
114		ngx_open_tempfile(u_char *name, ngx_uint_t persistent, ngx_uint_t mode)
	114	ngx_open_tempfile(u_char *name, ngx_uint_t persistent, ngx_uint_t access)
115	115	{
116	116	ngx_fd_t fd;
117	117
118		fd = open((const char *) name, O_CREAT\|O_EXCL\|O_RDWR, mode ? mode : 0600);
	118	fd = open((const char *) name, O_CREAT\|O_EXCL\|O_RDWR,
	119	access ? access : 0600);
119	120
120	121	if (fd != -1 && !persistent) {
121	122	unlink((const char *) name);

+1

-1

src/os/unix/ngx_files.h less more

37	37
38	38
39	39	ngx_fd_t ngx_open_tempfile(u_char *name, ngx_uint_t persistent,
40		ngx_uint_t mode);
	40	ngx_uint_t access);
41	41	#define ngx_open_tempfile_n "open()"
42	42
43	43

+1

-1

src/os/win32/ngx_files.h less more

47	47	#define ngx_file_append_mode_n "SetFilePointer()"
48	48
49	49
50		#define ngx_open_tempfile(name, persistent, mode) \
	50	#define ngx_open_tempfile(name, persistent, access) \
51	51	CreateFile((const char *) name, \
52	52	GENERIC_READ\|GENERIC_WRITE, \
53	53	FILE_SHARE_READ\|FILE_SHARE_WRITE\|FILE_SHARE_DELETE, \