nginx-0.3.3-RELEASE import
*) Change: the "bl" and "af" parameters of the "listen" directive was
renamed to the "backlog" and "accept_filter".
*) Feature: the "rcvbuf" and "sndbuf" parameters of the "listen"
directive.
*) Change: the "$msec" log parameter does not require now the
additional the gettimeofday() system call.
*) Feature: the -t switch now tests the "listen" directives.
*) Bugfix: if the invalid address was specified in the "listen"
directive, then after the -HUP signal nginx left an open socket in
the CLOSED state.
*) Bugfix: the mime type may be incorrectly set to default value for
index file with variable in the name; the bug had appeared in 0.3.0.
*) Feature: the "timer_resolution" directive.
*) Feature: the millisecond "$upstream_response_time" log parameter.
*) Bugfix: a temporary file with client request body now is removed
just after the response header was transferred to a client.
*) Bugfix: OpenSSL 0.9.6 compatibility.
*) Bugfix: the SSL certificate and key file paths could not be relative.
*) Bugfix: the "ssl_prefer_server_ciphers" directive did not work in
the ngx_imap_ssl_module.
*) Bugfix: the "ssl_protocols" directive allowed to specify the single
protocol only.
diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c
index 76e71c7..0c65760 100644
--- a/src/core/ngx_file.c
+++ b/src/core/ngx_file.c
@@ -40,8 +40,8 @@
{
ngx_err_t err;
ngx_atomic_uint_t n;
- ngx_pool_cleanup_file_t *cln;
-
+ ngx_pool_cleanup_t *cln;
+ ngx_pool_cleanup_file_t *clnf;
file->name.len = path->name.len + 1 + path->len + NGX_ATOMIC_T_LEN;
@@ -66,6 +66,11 @@
ngx_create_hashed_filename(file, path);
+ cln = ngx_pool_cleanup_add(pool, sizeof(ngx_pool_cleanup_file_t));
+ if (cln == NULL) {
+ return NGX_ERROR;
+ }
+
#if 1
file->fd = ngx_open_tempfile(file->name.data, persistent);
#else
@@ -76,19 +81,13 @@
"temp fd:%d", file->fd);
if (file->fd != NGX_INVALID_FILE) {
- cln = ngx_palloc(pool, sizeof(ngx_pool_cleanup_file_t));
- if (cln == NULL) {
- return NGX_ERROR;
- }
- cln->fd = file->fd;
- cln->name = file->name.data;
- cln->log = pool->log;
+ cln->handler = ngx_pool_cleanup_file;
+ clnf = cln->data;
- if (ngx_pool_cleanup_add(pool, ngx_pool_cleanup_file, cln) == NULL)
- {
- return NGX_ERROR;
- }
+ clnf->fd = file->fd;
+ clnf->name = file->name.data;
+ clnf->log = pool->log;
return NGX_OK;
}
